From 146f7af0ee6a560eb9289d61e8be65f5d3413d4f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 14 May 2019 10:34:18 -0400 Subject: meta-ibm: romulus: fans: switch to non-native meta-phosphor recently enabled target class config recipes. Those are preferable to native class config recipes because native recipes cannot be overridden based on MACHINE, so switch to target class config recipes. Switching to target class recipes consists of temporarily setting PHOSPHOR_FAN_CONFIG_USE_NATIVE_SYSROOT to 0, overriding the phosphor distro default of 1. After all OpenBMC BSP layers have moved to target class config recipes PHOSPHOR_FAN_CONFIG_USE_NATIVE_SYSROOT can be removed from meta-phosphor and any BSP layers. Any references to -native recipes are replaced with their target class counterparts. Any -native bbappends are re-worked to apply to their target class counterparts. Finally, use BPN instead of PN when setting FILESEXTRAPATHS, to avoid unfortunate directory hierarchies if these bbappends are copy/pasted and then used to bbappend a native recipe. Since this patch moves to target class recipes, this is a noop; however, this avoids unfortunate directory hierarchies with native bbappends such as: meta-base/recipes-foo/bar/baz-native.bb meta-base/recipes-foo/bar/baz/a-file meta-append/recipes-foo/bar/baz-native.bbappend meta-append/recipes-foo/bar/baz-native/b-file Using "${THISDIR}/${BPN}:" enables a more sensible hierarchy: meta-base/recipes-foo/bar/baz-native.bb meta-base/recipes-foo/bar/baz/a-file meta-append/recipes-foo/bar/baz-native.bbappend meta-append/recipes-foo/bar/baz/b-file This behavior occurs because By default FILESPATH is set in base.bbclass (in OE-Core) to look for files in ${BP}, ${BPN} and files (and a number of subdirectories of those based on ${FILESOVERRIDES}). (From meta-ibm rev: 589ee00a5ec7bc97c7d5c079cf66b3dbd3ac2b4f) Change-Id: I1a593373f1b4bc82c554a9330cdd75f04f21d1d8 Signed-off-by: Brad Bishop --- meta-ibm/meta-romulus/conf/machine/romulus.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'meta-ibm/meta-romulus/conf/machine/romulus.conf') diff --git a/meta-ibm/meta-romulus/conf/machine/romulus.conf b/meta-ibm/meta-romulus/conf/machine/romulus.conf index 4b580a220..2c3c62158 100644 --- a/meta-ibm/meta-romulus/conf/machine/romulus.conf +++ b/meta-ibm/meta-romulus/conf/machine/romulus.conf @@ -1,6 +1,7 @@ KMACHINE = "aspeed" KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" +PHOSPHOR_FAN_CONFIG_USE_NATIVE_SYSROOT = "0" UBOOT_MACHINE = "ast_g5_ncsi_config" PREFERRED_PROVIDER_virtual/p9-vcs-workaround = '' -- cgit v1.2.3