commit d2176ef9704d968858f031e89ace9d1b876d3bf5
author Patrick Williams <patrick@stwcx.xyz> Fri Jun 26 15:34:42 2020 -0500
committer Patrick Williams <patrick@stwcx.xyz> Fri Jun 26 15:34:44 2020 -0500
tree d4f6ac15235a8086ce701bfdabb9949b7a7345da
parent d081081dda4ffadd4426ffc15797437418dfc7c0

dbus-interfaces: remove unused packages

phosphor-dbus-interfaces contains all of the com.ibm and org.open_power
interfaces now.  Remove those dependencies from the CI scripts so that
any repository still referencing them fails until modified to point at
the correct dependency.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: If306d060984bef14902976e29c6415194d9af940

build-unit-test-docker.sh

diff --git a/build-unit-test-docker.sh b/build-unit-test-docker.sh
index fcfce11..d10857f 100755
--- a/build-unit-test-docker.sh
+++ b/build-unit-test-docker.sh
@@ -57,7 +57,6 @@
   openbmc/gpioplus
   openbmc/phosphor-logging
   openbmc/phosphor-dbus-interfaces
-  openbmc/openpower-dbus-interfaces
   open-power/pdbg
   openbmc/pldm
 )
@@ -427,22 +426,11 @@
 make -j$(nproc) && \
 make install
 
-FROM openbmc-base as openbmc-openpower-dbus-interfaces
-COPY --from=openbmc-sdbusplus ${PREFIX} ${PREFIX}
-COPY --from=openbmc-phosphor-dbus-interfaces ${PREFIX} ${PREFIX}
-RUN curl -L https://github.com/openbmc/openpower-dbus-interfaces/archive/${PKG_REV['openbmc/openpower-dbus-interfaces']}.tar.gz | tar -xz && \
-cd openpower-dbus-interfaces-* && \
-./bootstrap.sh && \
-./configure ${CONFIGURE_FLAGS[@]} && \
-make -j$(nproc) && \
-make install
-
 FROM openbmc-base as openbmc-phosphor-logging
 COPY --from=openbmc-cereal ${PREFIX} ${PREFIX}
 COPY --from=openbmc-sdbusplus ${PREFIX} ${PREFIX}
 COPY --from=openbmc-sdeventplus ${PREFIX} ${PREFIX}
 COPY --from=openbmc-phosphor-dbus-interfaces ${PREFIX} ${PREFIX}
-COPY --from=openbmc-openpower-dbus-interfaces ${PREFIX} ${PREFIX}
 COPY --from=openbmc-fifo_map ${PREFIX} ${PREFIX}
 RUN curl -L https://github.com/openbmc/phosphor-logging/archive/${PKG_REV['openbmc/phosphor-logging']}.tar.gz | tar -xz && \
 cd phosphor-logging-* && \

scripts/unit-test.py

diff --git a/scripts/unit-test.py b/scripts/unit-test.py
index 0d25a28..bf848e4 100755
--- a/scripts/unit-test.py
+++ b/scripts/unit-test.py
@@ -1051,8 +1051,6 @@
         'AC_PATH_PROG': {'sdbus++': 'sdbusplus'},
         'PKG_CHECK_MODULES': {
             'phosphor-dbus-interfaces': 'phosphor-dbus-interfaces',
-            'openpower-dbus-interfaces': 'openpower-dbus-interfaces',
-            'ibm-dbus-interfaces': 'ibm-dbus-interfaces',
             'libipmid': 'phosphor-host-ipmid',
             'libipmid-host': 'phosphor-host-ipmid',
             'sdbusplus': 'sdbusplus',