Clean up stale obmc-phosphor-utils references
There were a number of places that inherited this class but did not
use it. A number of classes that did use it did not inherit it.
This was possible because the class was pulled in by the distro
configuration but that has been removed here as well.
Tested: Built and verified a witherspoon image
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Change-Id: I73511cdcc609875b4fe016967c1b84c5200fb703
diff --git a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/leds/centriq2400-rep-led-manager-config-native.bb b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/leds/centriq2400-rep-led-manager-config-native.bb
index 24cf272..7d0e777 100644
--- a/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/leds/centriq2400-rep-led-manager-config-native.bb
+++ b/meta-openbmc-machines/meta-arm/meta-qualcomm/meta-centriq2400-rep/recipes-phosphor/leds/centriq2400-rep-led-manager-config-native.bb
@@ -2,7 +2,6 @@
PR = "r1"
inherit native
-inherit obmc-phosphor-utils
inherit obmc-phosphor-license
PROVIDES += "virtual/phosphor-led-manager-config-native"
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd_%.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd_%.bbappend
index e576d8e..e42259e 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd_%.bbappend
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd_%.bbappend
@@ -1,3 +1,5 @@
+inherit obmc-phosphor-utils
+
SRC_URI += "${@df_enabled(d, 'openpower-ubi-fs', 'file://software.conf')}"
install_tmpfile() {
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem.bb
index 6211efa..118c1c2 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem.bb
@@ -5,7 +5,6 @@
inherit autotools pkgconfig
inherit obmc-phosphor-license
inherit obmc-phosphor-ipmiprovider-symlink
-inherit obmc-phosphor-utils
inherit pythonnative
require ${PN}.inc
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control-config-example-native.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control-config-example-native.bb
index 842d53e..72b82a0 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control-config-example-native.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control-config-example-native.bb
@@ -2,7 +2,6 @@
PR = "r1"
inherit native
-inherit obmc-phosphor-utils
require openpower-occ-control.inc
inherit openpower-occ-control
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb
index 887b741..e851ee1 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb
@@ -2,7 +2,6 @@
PR = "r1"
inherit native
-inherit obmc-phosphor-utils
inherit obmc-phosphor-license
inherit openpower-occ-control
inherit mrw-xml
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
index 73fd759..905d5c6 100644
--- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb
@@ -3,6 +3,7 @@
inherit packagegroup
inherit obmc-phosphor-license
+inherit obmc-phosphor-utils
PROVIDES = "${PACKAGES}"
PACKAGES = " \
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config-native.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config-native.bb
index 0a4d561..d633fd9 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config-native.bb
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config-native.bb
@@ -2,7 +2,6 @@
PR = "r1"
inherit native
-inherit obmc-phosphor-utils
inherit obmc-phosphor-license
PROVIDES += "virtual/phosphor-led-manager-config-native"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/leds/romulus-led-manager-config-native.bb b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/leds/romulus-led-manager-config-native.bb
index fefa84d..3c7adaa 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/leds/romulus-led-manager-config-native.bb
+++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/leds/romulus-led-manager-config-native.bb
@@ -2,7 +2,6 @@
PR = "r1"
inherit native
-inherit obmc-phosphor-utils
inherit obmc-phosphor-license
PROVIDES += "virtual/phosphor-led-manager-config-native"
diff --git a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/leds/barreleye-led-manager-config-native.bb b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/leds/barreleye-led-manager-config-native.bb
index 37b0fe2..daf5d18 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/leds/barreleye-led-manager-config-native.bb
+++ b/meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/leds/barreleye-led-manager-config-native.bb
@@ -2,7 +2,6 @@
PR = "r1"
inherit native
-inherit obmc-phosphor-utils
inherit obmc-phosphor-license
PROVIDES += "virtual/phosphor-led-manager-config-native"
diff --git a/meta-phosphor/classes/obmc-phosphor-ipmiprovider-symlink.bbclass b/meta-phosphor/classes/obmc-phosphor-ipmiprovider-symlink.bbclass
index 02f7ce0..7a86496 100644
--- a/meta-phosphor/classes/obmc-phosphor-ipmiprovider-symlink.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-ipmiprovider-symlink.bbclass
@@ -1,5 +1,7 @@
# Common code for recipes that create IPMI provider libraries
+inherit obmc-phosphor-utils
+
LIBDIR = "${D}/${libdir}/ipmid-providers/"
HOSTIPMI_LIBDIR = "${D}/${libdir}/host-ipmid/"
NETIPMI_LIBDIR = "${D}/${libdir}/net-ipmid/"
diff --git a/meta-phosphor/classes/phosphor-mapper.bbclass b/meta-phosphor/classes/phosphor-mapper.bbclass
index 71d26ec..2910763 100644
--- a/meta-phosphor/classes/phosphor-mapper.bbclass
+++ b/meta-phosphor/classes/phosphor-mapper.bbclass
@@ -25,6 +25,7 @@
# PHOSPHOR_MAPPER_INTERFACE_BLACKLIST_append = " foo.bar.baz"
inherit phosphor-mapperdir
+inherit obmc-phosphor-utils
python phosphor_mapper_do_postinst() {
def process_var(d, var, dir):
diff --git a/meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend b/meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend
index 172c9a5..4b48dc7 100644
--- a/meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend
+++ b/meta-phosphor/common/recipes-core/base-files/base-files_%.bbappend
@@ -1,5 +1,3 @@
-inherit obmc-phosphor-utils
-
FILESEXTRAPATHS_prepend_df-obmc-ubi-fs := "${THISDIR}/${PN}:"
RDEPENDS_${PN}_append_df-obmc-ubi-fs = " preinit-mounts"
diff --git a/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc b/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc
index 9797811..271f325 100644
--- a/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc
+++ b/meta-phosphor/common/recipes-kernel/linux/linux-obmc.inc
@@ -6,8 +6,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-inherit obmc-phosphor-utils
-
KSRC ?= "git://github.com/openbmc/linux;protocol=git;branch=${KBRANCH}"
SRC_URI = "${KSRC}"
SRC_URI += "file://phosphor-gpio-keys.scc"
diff --git a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-example-native.bb b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-example-native.bb
index 139b775..4b546d0 100644
--- a/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-example-native.bb
+++ b/meta-phosphor/common/recipes-phosphor/leds/phosphor-led-manager-config-example-native.bb
@@ -2,7 +2,6 @@
PR = "r1"
inherit native
-inherit obmc-phosphor-utils
require phosphor-led-manager.inc
PROVIDES += "virtual/phosphor-led-manager-config-native"
diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index 41eb7a3..11cfe34 100644
--- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -2,7 +2,6 @@
PR = "r1"
inherit packagegroup
-inherit obmc-phosphor-utils
inherit obmc-phosphor-license
PROVIDES = "${PACKAGES}"
diff --git a/meta-phosphor/conf/distro/include/phosphor-base.inc b/meta-phosphor/conf/distro/include/phosphor-base.inc
index 267aab6..d318da7 100644
--- a/meta-phosphor/conf/distro/include/phosphor-base.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-base.inc
@@ -57,8 +57,6 @@
# TODO: openbmc/openbmc#12345 - Upgrade to pygobject-3.
PREFERRED_VERSION_python-pygobject = "2.%"
-INHERIT_append = " obmc-phosphor-utils"
-
include conf/distro/include/openbmc-phosphor/${MACHINE}.inc
# TODO: openbmc/openbmc#1407 - Remove with RHEL6 support deprecation.