From 6f7466418cc95a27f07ae932fa6fdd56e9c7f90d Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 6 Aug 2021 07:40:55 -0500 Subject: meta-facebook: prep for new override syntax Ran `scripts/contrib/convert-overrides.py` from upstream Yocto and fixed up a few by hand that were missed. Tested: Built bletchley and tiogapass. Signed-off-by: Patrick Williams Change-Id: I0489ba007132901697e4ef1a29b03a3591b3ee3b --- meta-facebook/conf/machine/include/facebook-withhost.inc | 2 +- meta-facebook/conf/machine/include/facebook.inc | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'meta-facebook/conf/machine') diff --git a/meta-facebook/conf/machine/include/facebook-withhost.inc b/meta-facebook/conf/machine/include/facebook-withhost.inc index ebe79d1a4..dba7444aa 100644 --- a/meta-facebook/conf/machine/include/facebook-withhost.inc +++ b/meta-facebook/conf/machine/include/facebook-withhost.inc @@ -10,6 +10,6 @@ OBMC_MACHINE_FEATURES += "\ VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control" VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control" -PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" +PREFERRED_PROVIDER:virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" OVERRIDES .= ":fb-withhost" diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index 2993dc438..33e95aff5 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -6,12 +6,12 @@ OBMC_MACHINE_FEATURES += "\ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" -PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-fb-apps" -PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-fb-apps" -PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-fb-apps" -PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" -PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps" +PREFERRED_PROVIDER:virtual/obmc-chassis-mgmt = "packagegroup-fb-apps" +PREFERRED_PROVIDER:virtual/obmc-fan-mgmt = "packagegroup-fb-apps" +PREFERRED_PROVIDER:virtual/obmc-flash-mgmt = "packagegroup-fb-apps" +PREFERRED_PROVIDER:virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" +PREFERRED_PROVIDER:virtual/obmc-system-mgmt = "packagegroup-fb-apps" -IMAGE_FEATURES_remove = "obmc-ikvm" +IMAGE_FEATURES:remove = "obmc-ikvm" OVERRIDES .= ":facebook" -- cgit v1.2.3