From 728c9e5e5a10bbd020b30955e3260ee939c0dedf Mon Sep 17 00:00:00 2001 From: John Wang Date: Fri, 17 May 2019 08:49:38 +0800 Subject: 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 Change-Id: Iffacaf8131ec83362ec453a51818f6901f1f80e5 Signed-off-by: Brad Bishop --- meta-inspur/conf/layer.conf | 8 +++----- meta-inspur/conf/machine/include/inspur.inc | 21 --------------------- 2 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 meta-inspur/conf/machine/include/inspur.inc (limited to 'meta-inspur/conf') diff --git a/meta-inspur/conf/layer.conf b/meta-inspur/conf/layer.conf index 16f6f2a7b..3ba10679e 100644 --- a/meta-inspur/conf/layer.conf +++ b/meta-inspur/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}/")}' - diff --git a/meta-inspur/conf/machine/include/inspur.inc b/meta-inspur/conf/machine/include/inspur.inc deleted file mode 100644 index d90a01ad2..000000000 --- a/meta-inspur/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" -- cgit v1.2.3