From cb01b982d034ad422436d30e6fd0fed983257162 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Thu, 13 Oct 2022 09:13:44 -0500 Subject: treewide: remove obmc-op-control-host for non-openpower machines The code for obmc-op-control-host is only useful for OpenPower machines, but somehow it is being included in many other machines. Remove it from all of them except meta-openpower. Signed-off-by: Patrick Williams Change-Id: I4e7c7365eb320c3fb9ea7a57aca2ed0b1832e85e --- meta-amd/meta-ethanolx/conf/machine/ethanolx.conf | 1 - meta-intel-openbmc/conf/machine/include/intel.inc | 2 -- meta-inventec/conf/machine/include/inventec.inc | 2 -- meta-supermicro/conf/machine/include/supermicro.inc | 2 -- 4 files changed, 7 deletions(-) diff --git a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf index 67fc64c8fe..bc62aece05 100644 --- a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf +++ b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf @@ -36,7 +36,6 @@ PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-amd-apps" -PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native = "ethanolx-led-manager-config-native" OVERRIDES .= ":amd" diff --git a/meta-intel-openbmc/conf/machine/include/intel.inc b/meta-intel-openbmc/conf/machine/include/intel.inc index 4374a8c437..7118771074 100644 --- a/meta-intel-openbmc/conf/machine/include/intel.inc +++ b/meta-intel-openbmc/conf/machine/include/intel.inc @@ -3,7 +3,6 @@ MACHINE_FEATURES += "\ 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 \ @@ -15,7 +14,6 @@ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-intel-apps" PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-intel-apps" -PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" diff --git a/meta-inventec/conf/machine/include/inventec.inc b/meta-inventec/conf/machine/include/inventec.inc index 9b6206cdd6..7b57f54886 100644 --- a/meta-inventec/conf/machine/include/inventec.inc +++ b/meta-inventec/conf/machine/include/inventec.inc @@ -3,7 +3,6 @@ MACHINE_FEATURES += "\ 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 \ @@ -18,7 +17,6 @@ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inventec-apps" PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inventec-apps" -PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" diff --git a/meta-supermicro/conf/machine/include/supermicro.inc b/meta-supermicro/conf/machine/include/supermicro.inc index d663f445a5..dc68db6cea 100644 --- a/meta-supermicro/conf/machine/include/supermicro.inc +++ b/meta-supermicro/conf/machine/include/supermicro.inc @@ -3,7 +3,6 @@ MACHINE_FEATURES += "\ obmc-chassis-state-mgmt \ obmc-host-state-mgmt \ obmc-host-ipmi \ - obmc-host-ctl \ obmc-phosphor-chassis-mgmt \ obmc-phosphor-fan-mgmt \ obmc-phosphor-flash-mgmt \ @@ -15,7 +14,6 @@ PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-supermicro-apps" PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-supermicro-apps" -PREFERRED_PROVIDER_virtual/obmc-host-ctl ?= "obmc-op-control-host" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" -- cgit v1.2.3