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

7 files changed, 3 insertions, 8 deletions

diff --git a/meta-phosphor/classes/obmc-phosphor-ipmiprovider-symlink.bbclass b/meta-phosphor/classes/obmc-phosphor-ipmiprovider-symlink.bbclass
index 02f7ce0c8..7a8649661 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 71d26ec37..291076386 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 172c9a5e1..4b48dc78b 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 97978115f..271f32508 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 @@ KCONFIG_MODE="--alldefconfig"
 
 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 139b775e7..4b546d05f 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 @@ SUMMARY = "Phosphor LED Group Management with example data"
 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 41eb7a3f7..11cfe3442 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 @@ SUMMARY = "OpenBMC - Applications"
 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 267aab6c1..d318da74f 100644
--- a/meta-phosphor/conf/distro/include/phosphor-base.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-base.inc
@@ -57,8 +57,6 @@ DISTRO_EXTRA_RDEPENDS_remove_qemuarm = "packagegroup-core-device-devel"
 # 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.