diff options
| author | Matt Spinler <spinler@us.ibm.com> | 2020-06-17 00:15:43 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-06-22 16:58:46 +0300 |
| commit | de04acf20b4c8cf440f5940d2951e9f355615d6c (patch) | |
| tree | 1070ff5a310e216ec5df6381cb4c7d29f549b3a2 | |
| parent | dc66fac6c76759d627f6e4f6f940a09d95614576 (diff) | |
| download | openbmc-de04acf20b4c8cf440f5940d2951e9f355615d6c.tar.xz | |
ibm: Don't use ibm-dbus-ifaces in ibm-logging
The IBM D-Bus interfaces moved into phosphor-dbus-interfaces.
Also temporarily remove ibm-logging from every image so that
ibm-dbus-interfaces won't be pulled in and CI can work.
(From meta-ibm rev: bd17cae1d3a44f5fc82c4e037a91c97e092fcf57)
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: Ic8bf9106592c7e7d161d928708554a91d5bb407e
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
| -rw-r--r-- | meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb | 4 | ||||
| -rw-r--r-- | meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb index 89f8e35dd..791ae9880 100644 --- a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/openbmc/ibm-logging" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI += "git://github.com/openbmc/ibm-logging" -SRCREV = "29c2ec6dd67df321662c906711ec95a4635b372f" +SRCREV = "aeaa374a6fa097b2359acfc4d694ed3ebe8eecaa" inherit autotools inherit pkgconfig @@ -18,7 +18,7 @@ inherit phosphor-dbus-yaml DEPENDS += " \ ${PYTHON_PN}-pyyaml-native \ autoconf-archive-native \ - ibm-dbus-interfaces \ + phosphor-dbus-interfaces \ nlohmann-json \ phosphor-logging \ sdbusplus \ diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 317656116..39437c1c0 100644 --- a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -14,9 +14,9 @@ POWER_SERVICE_PACKAGES_RAINIER = " \ " EXTRA_IBM_LOGGING_PKGS = "" -EXTRA_IBM_LOGGING_PKGS_witherspoon = "ibm-logging" +# EXTRA_IBM_LOGGING_PKGS_witherspoon = "ibm-logging" EXTRA_IBM_LOGGING_PKGS_witherspoon-tacoma = "" -EXTRA_IBM_LOGGING_PKGS_mihawk = "ibm-logging" +# EXTRA_IBM_LOGGING_PKGS_mihawk = "ibm-logging" RDEPENDS_${PN}-inventory_append_ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence" RDEPENDS_${PN}-inventory_append_rainier = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence" |