From a7ce81df2f6e513a7e364c443759733c778b5c1f Mon Sep 17 00:00:00 2001 From: "Brian A. Lloyd" Date: Mon, 21 Jan 2013 15:14:22 -0600 Subject: yocto-bsp: qualify user files with machine name The bblayer abstraction makes it where multiple layers can be configured and used at the same time. Some layers make changes to support a specific machine, and should not have any affect when other machines are in use. For linux-yocto, all bsps are created with a user-config.cfg and user-config.cfg and user-patches.scc. This means that those files will be pulled from the first location found, which might correspond to files customized for a different machine. Instead of using the names user-config.cfg and user-patches.scc, I propose a machine specific name be used such as {{=machine}}user-patches.scc and {{=machine}}user-config.cfg. This would necessitate that all references changed to these new names, which would affect the yocto-bsp and yocto-kernel scripts. With this change, it would be possible to have multiple machine BSPs searched at the same time and to select which to build against by using a command like MACHINE=qmeux86 bitbake core-image-sato to override the default. Note many of the standard BSPs do not seem to suffer this problem as they do not use the common files user-config.cfg and user-patches.scc that the yocto-* scripts depend upon. Additions by Tom Zanussi: - renamed user-config.cfg to {{=machine}}-user-config.cfg everywhere - renamed user-patches.scc to {{=machine}}-user-patches.scc everywhere - added the user-config/patches SRC_URI items to the qemu -rt kernel recipes Fixes [YOCTO #3731] (From meta-yocto rev: b148d800773f3c2e6edeb4f05850b0291a8bb7d5) Signed-off-by: Brian A. Lloyd Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- .../target/arch/common/recipes-bsp/formfactor/formfactor_0.0.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor_0.0.bbappend') diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor_0.0.bbappend b/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor_0.0.bbappend index 54da0ffd3e..a1e29f1eb7 100644 --- a/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor_0.0.bbappend +++ b/scripts/lib/bsp/substrate/target/arch/common/recipes-bsp/formfactor/formfactor_0.0.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_{{=machine}} := "${THISDIR}/${PN}:" PRINC = "1" -- cgit v1.2.3-54-g00ecf