From 1e54b756e9e4d70d45c2674e3ae0148aeec7d71d Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 8 Apr 2011 00:01:35 -0400 Subject: linux-yocto: safely process unbranched repositories The BSP bootstrap and -dev use cases can be applied against unbranched or repos without meta data. To allow the proper and safe processing of those repositories, slight modifications to the tools are required to pass the branch on the command line (rather than detecting it always) and to only checkout branches that exist. (From OE-Core rev: ae754be8b43677604a853ec6f62b2490a91d8836) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/classes/kernel-yocto.bbclass | 7 +++++-- 1 file changed, 5 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 78a13099ee..ffc0b4c6ee 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -25,7 +25,7 @@ do_patch() { addon_features="$addon_features --feature $feat" done fi - updateme ${addon_features} ${ARCH} ${MACHINE} ${WORKDIR} + updateme --branch ${kbranch} ${addon_features} ${ARCH} ${MACHINE} ${WORKDIR} if [ $? -ne 0 ]; then echo "ERROR. Could not update ${kbranch}" exit 1 @@ -87,9 +87,12 @@ do_kernel_configme() { if [ -n "${YOCTO_KERNEL_EXTERNAL_BRANCH}" ]; then # switch from a generic to a specific branch kbranch=${YOCTO_KERNEL_EXTERNAL_BRANCH} + cd ${S} + git checkout ${kbranch} + else + cd ${S} fi - cd ${S} configme --reconfig --output ${B} ${kbranch} ${MACHINE} if [ $? -ne 0 ]; then echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" -- cgit v1.2.3-54-g00ecf