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.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I77f9f250ae7b53c0759bcd829790b20db299761f
diff --git a/recipes-phosphor/logging/ibm-logging_git.bb b/recipes-phosphor/logging/ibm-logging_git.bb
index 89f8e35..791ae98 100644
--- a/recipes-phosphor/logging/ibm-logging_git.bb
+++ b/recipes-phosphor/logging/ibm-logging_git.bb
@@ -6,7 +6,7 @@
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 @@
DEPENDS += " \
${PYTHON_PN}-pyyaml-native \
autoconf-archive-native \
- ibm-dbus-interfaces \
+ phosphor-dbus-interfaces \
nlohmann-json \
phosphor-logging \
sdbusplus \
diff --git a/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
index 3176561..39437c1 100644
--- a/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
+++ b/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend
@@ -14,9 +14,9 @@
"
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"