From 92804a7d47ef891341c406996e3cc105ab430ff1 Mon Sep 17 00:00:00 2001 From: Zane Shelley Date: Fri, 4 Jun 2021 17:18:22 -0500 Subject: recipe preparation for openpower PEL parser modules The PEL parser for openpower-hw-diags requires some data files built by openpower-libhei. There will eventually be another recipe for that will use the same SRC_URI and SRCREV as openpower-libhei. So that information has been moved to the openpower-libhei-rev.inc file. Then, the recipes for both of these projects have been cleaned for readability. Signed-off-by: Zane Shelley Change-Id: Ib2141e53480d4b8a9afc767427e87bcefe02afc1 --- .../logging/openpower-hw-diags_git.bb | 13 ++++++++----- .../recipes-phosphor/logging/openpower-libhei-rev.inc | 6 ++++++ .../recipes-phosphor/logging/openpower-libhei_git.bb | 19 +++++++++++-------- 3 files changed, 25 insertions(+), 13 deletions(-) create mode 100644 meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc (limited to 'meta-openpower/recipes-phosphor/logging') diff --git a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb index a31a584b9..ed042eda2 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -1,4 +1,3 @@ -HOMEPAGE = "https://github.com/openbmc/openpower-hw-diags" SUMMARY = "Hardware Diagnostics for POWER Systems" DESCRIPTION = \ @@ -7,17 +6,21 @@ DESCRIPTION = \ POWER Systems have the ability to diagnose the root cause of the failure \ and perform any service action needed to avoid repeated system failures." -PV = "0.1+git${SRCPV}" +HOMEPAGE = "https://github.com/openbmc/openpower-hw-diags" + LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -inherit meson systemd - -S = "${WORKDIR}/git" +PR = "r1" +PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags" SRCREV = "6bc43c9b896724c27317ac50a88e5ddaa2882484" +S = "${WORKDIR}/git" + +inherit meson systemd + SYSTEMD_SERVICE_${PN} = "attn_handler.service" DEPENDS = "boost libgpiod pdbg phosphor-logging sdbusplus openpower-libhei \ diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc new file mode 100644 index 000000000..6dbc41574 --- /dev/null +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc @@ -0,0 +1,6 @@ +PR = "r1" +PV = "0.1+git${SRCPV}" + +SRC_URI = "git://github.com/openbmc/openpower-libhei" +SRCREV = "0a905012d0e90ea32ca651883413cd84b56804d1" + diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb index 59ed91c25..183e2ed5c 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb @@ -1,17 +1,20 @@ -inherit meson +SUMMARY = "Hardware Error Isolator for POWER Systems" + +DESCRIPTION = \ + "The library provides a set of tools to isolate hardware attentions driven \ + by POWER Systems chip (processor chips, memory chips, etc.)." + +HOMEPAGE = "https://github.com/openbmc/openpower-libhei" -SUMMARY = "Hardware Error Isolator Library" -DESCRIPTION = "Hardware Error Isolator Library (libhei)" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI = "git://github.com/openbmc/openpower-libhei" - -PV = "0.1+git${SRCPV}" -SRCREV = "0a905012d0e90ea32ca651883413cd84b56804d1" +include openpower-libhei-rev.inc S = "${WORKDIR}/git" +inherit meson inherit perlnative -DEPENDS += "libxml2-native libxml-simple-perl-native libjson-perl-native" +DEPENDS = "libxml2-native libxml-simple-perl-native libjson-perl-native" + -- cgit v1.2.3