treewide: more obmc-host-ctl cleanups
obmc-host-ctl is defined as a MACHINE, DISTRO, and IMAGE feature.
The IMAGE feature pulls in a virtual provider only if the COMBINED
feature (MACHINE + DISTRO) is enabled. This is only done on openpower
machines. There are a lot of other places where machines are half-way
disabling this feature and/or changing variables which have zero effect
anyhow. Clean up almost all references to `obmc-host-ctl`.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I090d782bb6a34dc4e3c43df97e8ccf6e1812fed5
diff --git a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
index 55773fc..f4cdcd1 100644
--- a/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
+++ b/meta-facebook/meta-tiogapass/conf/machine/tiogapass.conf
@@ -12,5 +12,4 @@
require conf/machine/include/ast2500.inc
require conf/machine/include/obmc-bsp-common.inc
-PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= ""
FLASH_SIZE = "32768"
diff --git a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf
index 4a52054..667357e 100644
--- a/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf
+++ b/meta-facebook/meta-yosemitev2/conf/machine/yosemitev2.conf
@@ -12,6 +12,5 @@
require conf/machine/include/ast2500.inc
require conf/machine/include/obmc-bsp-common.inc
-PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= ""
FLASH_SIZE = "32768"
OBMC_HOST_INSTANCES = "1 2 3 4"
diff --git a/meta-fii/meta-mori/conf/machine/mori.conf b/meta-fii/meta-mori/conf/machine/mori.conf
index 9205790..25ce57c 100644
--- a/meta-fii/meta-mori/conf/machine/mori.conf
+++ b/meta-fii/meta-mori/conf/machine/mori.conf
@@ -35,7 +35,6 @@
IMAGE_FEATURES:remove = "obmc-flash-mgmt"
IMAGE_FEATURES:remove = "obmc-fru-ipmi"
IMAGE_FEATURES:remove = "obmc-health-monitor"
-IMAGE_FEATURES:remove = "obmc-host-ctl"
IMAGE_FEATURES:remove = "obmc-host-ipmi"
IMAGE_FEATURES:remove = "obmc-ikvm"
IMAGE_FEATURES:remove = "obmc-inventory"
diff --git a/meta-hpe/conf/machine/include/hpe.inc b/meta-hpe/conf/machine/include/hpe.inc
index 281d2d5..120d2f0 100644
--- a/meta-hpe/conf/machine/include/hpe.inc
+++ b/meta-hpe/conf/machine/include/hpe.inc
@@ -16,7 +16,6 @@
PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-hpe-apps"
PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-hpe-apps"
PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-hpe-apps"
-PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= ""
#PREFERRED_PROVIDER_virtual/phosphor-ipmi-fru-hostfw-config ?= "hostboot-inventory-config-native"
IMAGE_CLASSES:append = " hpe-rootfs-postcommands"
diff --git a/meta-qualcomm/conf/machine/qcom-dc-scm-v1.conf b/meta-qualcomm/conf/machine/qcom-dc-scm-v1.conf
index 93e2512..0143b57 100644
--- a/meta-qualcomm/conf/machine/qcom-dc-scm-v1.conf
+++ b/meta-qualcomm/conf/machine/qcom-dc-scm-v1.conf
@@ -21,7 +21,6 @@
obmc-host-state-mgmt \
"
-PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= ""
PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-ssif"
FEATURE_PACKAGES_obmc-system-mgmt = ""
diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf
index 803ecf6..12388f0 100644
--- a/meta-quanta/meta-gbs/conf/machine/gbs.conf
+++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf
@@ -36,7 +36,6 @@
IMAGE_FEATURES:remove = "obmc-flash-mgmt"
IMAGE_FEATURES:remove = "obmc-fru-ipmi"
IMAGE_FEATURES:remove = "obmc-health-monitor"
-IMAGE_FEATURES:remove = "obmc-host-ctl"
IMAGE_FEATURES:remove = "obmc-host-ipmi"
IMAGE_FEATURES:remove = "obmc-host-state-mgmt"
IMAGE_FEATURES:remove = "obmc-ikvm"
diff --git a/meta-quanta/meta-gsj/conf/machine/gsj.conf b/meta-quanta/meta-gsj/conf/machine/gsj.conf
index 90f6927..7844bee 100644
--- a/meta-quanta/meta-gsj/conf/machine/gsj.conf
+++ b/meta-quanta/meta-gsj/conf/machine/gsj.conf
@@ -31,7 +31,6 @@
IMAGE_FEATURES:remove = "obmc-flash-mgmt"
IMAGE_FEATURES:remove = "obmc-fru-ipmi"
IMAGE_FEATURES:remove = "obmc-health-monitor"
-IMAGE_FEATURES:remove = "obmc-host-ctl"
IMAGE_FEATURES:remove = "obmc-host-ipmi"
IMAGE_FEATURES:remove = "obmc-host-state-mgmt"
IMAGE_FEATURES:remove = "obmc-ikvm"
diff --git a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
index dc36d9b..373e828 100644
--- a/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
+++ b/meta-quanta/meta-q71l/conf/machine/quanta-q71l.conf
@@ -20,7 +20,6 @@
# obmc-phosphor-chassis-mgmt \
# obmc-phosphor-flash-mgmt \
# obmc-host-ipmi \
-# obmc-host-ctl \
# obmc-host-state-mgmt \
# obmc-chassis-state-mgmt \
# obmc-bmc-state-mgmt \