From 97cb3124ec958650895ebae907eb946517c2e1ef Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 24 Jan 2011 11:54:32 -0500 Subject: linux-yocto: allow multiple BSPs per branch By default the linux-yocto recipes operate on the current branch and use it as a trigger to locate the description of a board. This model works well when using the git repo outside of a build system since the commands can be simply invoked and will do something useful. However, it does mean that you can't have two BSPs that differ only by configuration, building out of a single branch in the repository. This means that you must have many branches for very similar BSPs. This model is still preferred, but having the choice of branching strategies is better. With this change we can have multiple BSPs using a single branch with the preferred description being hinted from the build system by passing the $machine value to updateme/configme. Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes/kernel-yocto.bbclass') diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 32d2e20a71..8479b395cd 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -74,7 +74,7 @@ do_patch() { if [ -n "${KERNEL_FEATURES}" ]; then addon_features="--features ${KERNEL_FEATURES}" fi - updateme ${addon_features} ${ARCH} ${WORKDIR} + updateme ${addon_features} ${ARCH} ${MACHINE} ${WORKDIR} if [ $? -ne 0 ]; then echo "ERROR. Could not update ${kbranch}" exit 1 @@ -126,7 +126,7 @@ do_kernel_configme() { echo "[INFO] doing kernel configme" cd ${S} - configme --reconfig --output ${B} + configme --reconfig --output ${B} ${KBRANCH} ${MACHINE} if [ $? -ne 0 ]; then echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" exit 1 -- cgit v1.2.3-54-g00ecf