diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
commit | bb6a14e2f317abf60677c6ad8de9c33d5760bf36 (patch) | |
tree | 00457d3677e86437cec25fd7dab6c4513a53b1a4 /meta-openpower/recipes-phosphor | |
parent | defdca82c107f46e980c84bffb1b2c1263522fa0 (diff) | |
parent | cf6fd27dbd8e2d1b507f8c3752b85801b2c6ef57 (diff) | |
download | openbmc-bb6a14e2f317abf60677c6ad8de9c33d5760bf36.tar.xz |
Merge tag '0.63' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openpower/recipes-phosphor')
8 files changed, 34 insertions, 20 deletions
diff --git a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb index 86005732b..8cd50970c 100644 --- a/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb +++ b/meta-openpower/recipes-phosphor/flash/openpower-software-manager_git.bb @@ -37,6 +37,7 @@ PACKAGECONFIG[mmc_layout] = "-Ddevice-type=mmc" PACKAGECONFIG[virtual_pnor] = "-Dvpnor=enabled, -Dvpnor=disabled" EXTRA_OEMESON += " \ + -Dtests=disabled \ -Dmsl="v2.0.10 v2.2" \ " @@ -59,7 +60,7 @@ S = "${WORKDIR}/git" SRC_URI += "git://github.com/openbmc/openpower-pnor-code-mgmt" -SRCREV = "067876aa2af9629161c4f367750828aec5e0cd63" +SRCREV = "fdc91fa011c28b857220e30320fba65e69907f20" DBUS_SERVICE_${PN} += "org.open_power.Software.Host.Updater.service" diff --git a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb index 12ebbea49..546031bbf 100644 --- a/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb +++ b/meta-openpower/recipes-phosphor/host/op-proc-control_git.bb @@ -7,19 +7,20 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" S = "${WORKDIR}/git" -inherit autotools obmc-phosphor-utils pkgconfig +inherit meson obmc-phosphor-utils pkgconfig inherit systemd SRC_URI += "git://github.com/openbmc/openpower-proc-control" -SRCREV = "1b607c35462ae5e2c00406a646aeedbbd26d4631" +SRCREV = "f8c14bcfd507e0224fe258d38bdef8d32ebfbf48" DEPENDS += " \ - autoconf-archive-native \ phosphor-logging \ phosphor-dbus-interfaces \ libgpiod \ " +EXTRA_OEMESON += "-Dtests=disabled" + # For libpdbg, provided by the pdbg package DEPENDS += "pdbg" diff --git a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc index 1210b55db..b9ec99ec8 100644 --- a/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc +++ b/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-host-ipmi-oem" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" SRC_URI += "git://github.com/openbmc/openpower-host-ipmi-oem" -SRCREV = "248255d2afd411ca05e2596fcb214b8968a08743" +SRCREV = "98af91d62e307a360f1f89df6a275baa88aa05f4" 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 6202c3621..3c3c5325e 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,16 +6,20 @@ 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 +PR = "r1" +PV = "0.1+git${SRCPV}" + +SRC_URI = "git://github.com/openbmc/openpower-hw-diags" +SRCREV = "324234b4b560ce1d136d96a6950daeb1da1469a5" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/openbmc/openpower-hw-diags" -SRCREV = "5c5db65a37d953cb9393f257aab90a0a209d4861" +inherit meson systemd SYSTEMD_SERVICE_${PN} = "attn_handler.service" 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..715c04964 --- /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 = "47ca5c2e7a172e39d104551ff2ed8db4eea51217" + 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" + diff --git a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc index cd31b488c..77257cf90 100644 --- a/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc +++ b/meta-openpower/recipes-phosphor/occ/openpower-occ-control.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-occ-control" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-occ-control" -SRCREV = "4c1079e71ae3ecbce8a9ddc33ee4e7d623d66568" +SRCREV = "eeb95bade422e598aba91c9cbbb870bba38d5ae3" diff --git a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc index 0d0d53ba7..d8499cffe 100644 --- a/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc +++ b/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/openpower-vpd-parser" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/openpower-vpd-parser" -SRCREV = "33c61c2d634c116d9b31b0a3d7c69860e9dbcaab" +SRCREV = "b0f3749d793ff1e11310ca5b729274afbbd85241" |