summaryrefslogtreecommitdiff
path: root/meta-openbmc-machines/meta-openpower
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2018-03-10 00:51:57 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2018-03-23 07:15:12 +0300
commit02f9a52c6c99ba70b8ab930f821979ab2c23a554 (patch)
tree2d777ab8adb65202f4545b89a453221d79237752 /meta-openbmc-machines/meta-openpower
parentd3839348be84c133838f509c032b40dd51dfc110 (diff)
downloadopenbmc-02f9a52c6c99ba70b8ab930f821979ab2c23a554.tar.xz
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
Diffstat (limited to 'meta-openbmc-machines/meta-openpower')
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-core/systemd/systemd_%.bbappend2
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/ipmi/openpower-ipmi-oem.bb1
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control-config-example-native.bb1
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/occ/openpower-occ-control-config-mrw-native.bb1
-rw-r--r--meta-openbmc-machines/meta-openpower/common/recipes-phosphor/packagegroups/packagegroup-op-apps.bb1
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-palmetto/recipes-phosphor/leds/palmetto-led-manager-config-native.bb1
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ibm/meta-romulus/recipes-phosphor/leds/romulus-led-manager-config-native.bb1
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-rackspace/meta-barreleye/recipes-phosphor/leds/barreleye-led-manager-config-native.bb1
8 files changed, 3 insertions, 6 deletions
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 e576d8e6c..e42259e5f 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 6211efa71..118c1c2b0 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 @@ PR = "r1"
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 842d53ec0..72b82a0b3 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 @@ SUMMARY = "OpenPower OCC Control with example occ sensor IDs"
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 887b74163..e851ee1b3 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 @@ SUMMARY = "OpenPower OCC Control with MRW generated sensor IDs"
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 73fd759a8..905d5c664 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 @@ PR = "r1"
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 0a4d56197..d633fd980 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 @@ SUMMARY = "Phosphor LED Group Management for Palmetto"
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 fefa84d3e..3c7adaaac 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 @@ SUMMARY = "Phosphor LED Group Management for Romulus"
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 37b0fe212..daf5d1822 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 @@ SUMMARY = "Phosphor LED Group Management for Barreleye"
PR = "r1"
inherit native
-inherit obmc-phosphor-utils
inherit obmc-phosphor-license
PROVIDES += "virtual/phosphor-led-manager-config-native"