diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2021-08-06 15:40:55 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2021-08-07 00:08:56 +0300 |
| commit | 6f7466418cc95a27f07ae932fa6fdd56e9c7f90d (patch) | |
| tree | 5e7fcef77fd6406ba611311dfd5587d9bab5705c /meta-facebook/conf | |
| parent | e5b39f63e81a697edd5d5958665c7f55b71cd133 (diff) | |
| download | openbmc-6f7466418cc95a27f07ae932fa6fdd56e9c7f90d.tar.xz | |
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 <patrick@stwcx.xyz>
Change-Id: I0489ba007132901697e4ef1a29b03a3591b3ee3b
Diffstat (limited to 'meta-facebook/conf')
| -rw-r--r-- | meta-facebook/conf/layer.conf | 4 | ||||
| -rw-r--r-- | meta-facebook/conf/machine/include/facebook-withhost.inc | 2 | ||||
| -rw-r--r-- | meta-facebook/conf/machine/include/facebook.inc | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf index c0ca08f37..a22a085f9 100644 --- a/meta-facebook/conf/layer.conf +++ b/meta-facebook/conf/layer.conf @@ -6,5 +6,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "facebook-layer" -BBFILE_PATTERN_facebook-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_facebook-layer := "gatesgarth hardknott" +BBFILE_PATTERN:facebook-layer := "^${LAYERDIR}/" +LAYERSERIES_COMPAT:facebook-layer := "gatesgarth hardknott" 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" |