diff options
author | jmbills <jason.m.bills@intel.com> | 2022-01-18 21:55:05 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-18 21:55:05 +0300 |
commit | 7cf0c1cd0ce835d1833509b7b911e8a97380278b (patch) | |
tree | 0b45c3beaa9874facc4ed1a2395a31e42be0135d /meta-openpower/recipes-phosphor/logging | |
parent | 4dac5fcd49b5e2de1074f1363775ec0f19041072 (diff) | |
parent | 1fc0d70f658da30091bcd49f9bf29aecd6b99ba7 (diff) | |
download | openbmc-7cf0c1cd0ce835d1833509b7b911e8a97380278b.tar.xz |
Merge pull request #76 from Intel-BMC/update1-0.86
Update
Diffstat (limited to 'meta-openpower/recipes-phosphor/logging')
4 files changed, 21 insertions, 6 deletions
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 4602fba57..9bbba105e 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-hw-diags_git.bb @@ -15,11 +15,11 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-hw-diags" -SRCREV = "96d5486c3ca5c5037e6f74bd3a1d196d91b80829" +SRCREV = "04f010abb7946c18d6bb68c714ca6a4417845d8d" S = "${WORKDIR}/git" -inherit meson systemd +inherit pkgconfig meson systemd SYSTEMD_SERVICE:${PN} = "attn_handler.service" @@ -30,6 +30,6 @@ DEPENDS = "boost libgpiod pdbg phosphor-logging sdbusplus openpower-libhei \ RDEPENDS:${PN} += "openpower-libhei" # Conditionally pull in PHAL APIs, if available. -PACKAGECONFIG ??= "${@bb.utils.filter('OBMC_MACHINE_FEATURES', 'phal', d)}" -PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, pdata" +PACKAGECONFIG ??= "${@bb.utils.filter('MACHINE_FEATURES', 'phal', d)}" +PACKAGECONFIG[phal] = "-Dphal=enabled, -Dphal=disabled, ipl pdata" diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc index 1d3d2e1c1..e2239125c 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei-rev.inc @@ -2,5 +2,5 @@ PR = "r1" PV = "0.1+git${SRCPV}" SRC_URI = "git://github.com/openbmc/openpower-libhei" -SRCREV = "91f1d3d2aaddc0ea1097f3b29dfb37df920f1719" +SRCREV = "c0d0f36139346a28e79cdfd77905d8fa8fdefc71" diff --git a/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb b/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb index 183e2ed5c..d45d95f3c 100644 --- a/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb +++ b/meta-openpower/recipes-phosphor/logging/openpower-libhei_git.bb @@ -13,7 +13,7 @@ include openpower-libhei-rev.inc S = "${WORKDIR}/git" -inherit meson +inherit pkgconfig meson inherit perlnative DEPENDS = "libxml2-native libxml-simple-perl-native libjson-perl-native" diff --git a/meta-openpower/recipes-phosphor/logging/python3-sbe-log-parsers_git.bb b/meta-openpower/recipes-phosphor/logging/python3-sbe-log-parsers_git.bb new file mode 100644 index 000000000..588f750df --- /dev/null +++ b/meta-openpower/recipes-phosphor/logging/python3-sbe-log-parsers_git.bb @@ -0,0 +1,15 @@ +SUMMARY = "SBE log python parsers" +DESCRIPTION = "Used by peltool to parse SBE UserData sections and SRC details" +HOMEPAGE = "https://github.ibm.com/open-power/sbe" + +PR = "r1" +PV = "1.0+git${SRCPV}" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE_PROLOG;md5=d8e5f403c98fd80dcea90b9cc8cd083c" + +S = "${WORKDIR}/git" +SRC_URI += "git://git@github.com/open-power/sbe;branch="master-p10";protocol=ssh" +SRCREV = "f8ee8cfad2cf2a53e78789633ddffc192f5a197e" + +inherit setuptools3 |