diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2021-08-10 05:46:55 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2021-08-11 00:56:33 +0300 |
| commit | 49f18cb5b99fbba0af8be1b1b194968f277257fe (patch) | |
| tree | fdde98c1bfc330738618ca00e5ae7f5104e049d1 /meta-facebook/conf | |
| parent | 12fc939cde971ea2094201e48fe095c41138f4aa (diff) | |
| download | openbmc-49f18cb5b99fbba0af8be1b1b194968f277257fe.tar.xz | |
meta-facebook: more prep for new override syntax
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I21120d6215c25be49afd60d6e807b68f2798423a
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 | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf index a22a085f9..895d48fc1 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 honister" diff --git a/meta-facebook/conf/machine/include/facebook-withhost.inc b/meta-facebook/conf/machine/include/facebook-withhost.inc index dba7444aa..ebe79d1a4 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 33e95aff5..d18a66bf5 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -6,11 +6,11 @@ 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" |