commit 295f5c5f6fbec43e8d5727e9a50dcba58e951cbd
author John Wang <wangzqbj@inspur.com> Fri May 17 08:49:38 2019 +0800
committer John Wang <wangzqbj@inspur.com> Fri May 31 15:24:45 2019 +0800
tree b7ea2b0b93fc69f811bf2c8dc2057d486c80a2d8
parent 92714432cefa85eec0d76da5ef6a40b884869d6e

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

conf/layer.conf

diff --git a/conf/layer.conf b/conf/layer.conf
index 16f6f2a..3ba1067 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -2,13 +2,11 @@
 BBPATH .= ":${LAYERDIR}"
 
 # We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \
-            ${LAYERDIR}/meta-common/recipes-*/*/*.bbappend"
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "inspur-layer"
-BBFILE_PATTERN_inspur-layer = ""
-LAYERVERSION_inspur-layer = "1"
+BBFILE_PATTERN_inspur-layer = "^${LAYERDIR}/"
 LAYERSERIES_COMPAT_inspur-layer = "thud warrior"
 
 INSPURBASE = '${@os.path.normpath("${LAYERDIR}/")}'
-

conf/machine/include/inspur.inc

diff --git a/conf/machine/include/inspur.inc b/conf/machine/include/inspur.inc
deleted file mode 100644
index d90a01a..0000000
--- a/conf/machine/include/inspur.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-OBMC_MACHINE_FEATURES += "\
-        obmc-phosphor-fan-mgmt \
-        obmc-phosphor-chassis-mgmt \
-        obmc-phosphor-flash-mgmt \
-        obmc-host-ipmi \
-        obmc-host-ctl \
-        obmc-host-state-mgmt \
-        obmc-chassis-state-mgmt \
-        obmc-bmc-state-mgmt \
-        "
-
-VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config"
-
-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-ctl ?= "obmc-op-control-host"
-PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}"
-PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs"
-#PREFERRED_PROVIDER_virtual/obmc-gpio-monitor ?= "phosphor-gpio-monitor"