diff options
author | John Wang <wangzqbj@inspur.com> | 2019-05-17 03:49:38 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-06-05 15:58:45 +0300 |
commit | 728c9e5e5a10bbd020b30955e3260ee939c0dedf (patch) | |
tree | 239b9a95b320a58344b9f35da4e40889e1716dc6 /meta-inspur/meta-on5263m5/conf | |
parent | bab20941c451d79aa6bdd3cbad89edb45e7cc18c (diff) | |
download | openbmc-728c9e5e5a10bbd020b30955e3260ee939c0dedf.tar.xz |
meta-inspur: Move recipes under meta-common
Since meta-common is an x86 platform related meta,
it would cause ambiguity if other platform related
machines are created. In order to avoid ambiguity,
recipses under meta-common are moved to meta-on5263m5,
the meta-common folder is deleted.
Tested:
export TEMPLATECONF=meta-inspur/meta-on5263m5/conf
source openbmc-env
bitbake obmc-phosphor-image
Build successfully
(From meta-inspur rev: 295f5c5f6fbec43e8d5727e9a50dcba58e951cbd)
Signed-off-by: John Wang <wangzqbj@inspur.com>
Change-Id: Iffacaf8131ec83362ec453a51818f6901f1f80e5
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-inspur/meta-on5263m5/conf')
-rw-r--r-- | meta-inspur/meta-on5263m5/conf/layer.conf | 4 | ||||
-rw-r--r-- | meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/meta-inspur/meta-on5263m5/conf/layer.conf b/meta-inspur/meta-on5263m5/conf/layer.conf index b2ef63d20..b49d300bf 100644 --- a/meta-inspur/meta-on5263m5/conf/layer.conf +++ b/meta-inspur/meta-on5263m5/conf/layer.conf @@ -6,7 +6,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "on5263m5-layer" -BBFILE_PATTERN_on5263m5-layer = "" -BBFILE_PRIORITY_on5263m5-layer = "5" +BBFILE_PATTERN_on5263m5-layer = "^${LAYERDIR}/" LAYERSERIES_COMPAT_on5263m5-layer = "thud warrior" - diff --git a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf index ba8ce1067..1c217913e 100644 --- a/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf +++ b/meta-inspur/meta-on5263m5/conf/machine/on5263m5.conf @@ -3,10 +3,14 @@ KERNEL_DEVICETREE = "${KMACHINE}-bmc-inspur-${MACHINE}.dtb" require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc -require conf/machine/include/inspur.inc + +PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-inspur-apps" +PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-inspur-apps" +PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-inspur-apps" +PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-inspur-apps" +PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs" UBOOT_MACHINE = "ast_g5_phy_config" FLASH_SIZE = "32768" -VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" |