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
Signed-off-by: John Wang <wangzqbj@inspur.com>
Change-Id: I43789bd65bbe48c067bdeec3b70e0ccf7a69fc28
diff --git a/meta-on5263m5/conf/layer.conf b/meta-on5263m5/conf/layer.conf
index b2ef63d..b49d300 100644
--- a/meta-on5263m5/conf/layer.conf
+++ b/meta-on5263m5/conf/layer.conf
@@ -6,7 +6,5 @@
${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-on5263m5/conf/machine/on5263m5.conf b/meta-on5263m5/conf/machine/on5263m5.conf
index ba8ce10..1c21791 100644
--- a/meta-on5263m5/conf/machine/on5263m5.conf
+++ b/meta-on5263m5/conf/machine/on5263m5.conf
@@ -3,10 +3,14 @@
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"