commit d42a0c459c077802dfc3b35676f0fdfa10d9615d
author Vernon Mauery <vernon.mauery@linux.intel.com> Tue Sep 27 09:45:38 2022 -0700
committer Vernon Mauery <vernon.mauery@linux.intel.com> Tue Sep 27 09:59:00 2022 -0700
tree 7da3b97f60c70fdacc86f3d8f6086ac375df4c4e
parent 4aee3fc93b840dacab1c23a3b66d257ec9fa60ea

remove intel-dbus in favor of phosphor-dbus

The intel-dbus-interfaces has been merged into
phosphor-dbus-interfaces, so we can remove it from the external
dependencies.

Tested: ran openbmc-build-scripts locally.

Change-Id: I3ca53128bd6aa9b04403335807bf36b28daaf9e0
Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6412635..a0f56ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,8 +55,6 @@
     link_directories (${CMAKE_BINARY_DIR}/sdbusplus-src/.libs)
     include_directories (SYSTEM ${CMAKE_BINARY_DIR}/phosphor-logging-src)
     link_directories (${CMAKE_BINARY_DIR}/phosphor-logging-src/.libs)
-    include_directories (SYSTEM ${CMAKE_BINARY_DIR}/intel-dbus-interfaces-src)
-    link_directories (${CMAKE_BINARY_DIR}/intel-dbus-interfaces-src/.libs)
     include_directories (SYSTEM ${CMAKE_BINARY_DIR}/phosphor-ipmi-host/include)
     include_directories (SYSTEM ${CMAKE_BINARY_DIR}/ipmid/user_channel)
     include_directories (SYSTEM ${CMAKE_BINARY_DIR}) # link_directories  (${CMAK
@@ -118,7 +116,6 @@
 target_link_libraries (zinteloemcmds ipmid)
 target_link_libraries (zinteloemcmds sdbusplus)
 target_link_libraries (zinteloemcmds phosphor_logging)
-target_link_libraries (zinteloemcmds intel_dbus)
 target_link_libraries (zinteloemcmds -luserlayer)
 target_link_libraries (zinteloemcmds -lchannellayer)
 target_link_libraries (zinteloemcmds ${OPENSSL_CRYPTO_LIBRARY})

CMakeLists.txt.in

diff --git a/CMakeLists.txt.in b/CMakeLists.txt.in
index 366f144..37a605c 100644
--- a/CMakeLists.txt.in
+++ b/CMakeLists.txt.in
@@ -8,26 +8,6 @@
 # requires apt install autoconf-archive and autoconf
 
 externalproject_add (
-    intel-dbus-interfaces PREFIX ${CMAKE_BINARY_DIR}/intel-dbus-interfaces
-    GIT_REPOSITORY https://github.com/openbmc/intel-dbus-interfaces GIT_TAG
-    b5f2dd444c5d3808d005452417e4ae2ea28624ff SOURCE_DIR
-    ${CMAKE_BINARY_DIR}/intel-dbus-interfaces-src BINARY_DIR
-    ${CMAKE_BINARY_DIR}/intel-dbus-interfaces-build CONFIGURE_COMMAND cd
-    ${CMAKE_BINARY_DIR}/intel-dbus-interfaces-src && export
-    PYTHONPATH=${CMAKE_BINARY_DIR}/prefix/lib/python2.7/site-packages:$ENV{PYTHONPATH}
-    && export PATH=${CMAKE_BINARY_DIR}/prefix/bin:$ENV{PATH} && export
-    PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/prefix/lib/pkgconfig && ./bootstrap.sh
-    && ./configure --prefix=${CMAKE_BINARY_DIR}/prefix
-    CPPFLAGS=-I${CMAKE_BINARY_DIR}/prefix/include/ BUILD_COMMAND cd
-    ${CMAKE_BINARY_DIR}/intel-dbus-interfaces-src && export
-    PYTHONPATH=${CMAKE_BINARY_DIR}/prefix/lib/python2.7/site-packages:$ENV{PYTHONPATH}
-    && export PATH=${CMAKE_BINARY_DIR}/prefix/bin:$ENV{PATH} && export
-    PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/prefix/lib/pkgconfig && make -j
-    verbose=1 INSTALL_COMMAND cd ${CMAKE_BINARY_DIR}/intel-dbus-interfaces-src
-    && make install LOG_DOWNLOAD ON
-)
-
-externalproject_add (
     host-ipmid PREFIX ${CMAKE_BINARY_DIR}/phosphor-host-ipmid GIT_REPOSITORY
     https://github.com/openbmc/phosphor-host-ipmid SOURCE_DIR
     ${CMAKE_BINARY_DIR}/phosphor-ipmi-host-src BINARY_DIR