diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2011-04-08 00:01:35 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-05 12:26:47 +0100 |
| commit | 1e54b756e9e4d70d45c2674e3ae0148aeec7d71d (patch) | |
| tree | 3ba09759140465761b1c757a3086961ef7ee19e2 /meta/classes | |
| parent | 1fc39646575e423a32c5594fe26dd5980b28ebff (diff) | |
| download | ast2050-yocto-poky-1e54b756e9e4d70d45c2674e3ae0148aeec7d71d.zip ast2050-yocto-poky-1e54b756e9e4d70d45c2674e3ae0148aeec7d71d.tar.gz | |
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 <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/kernel-yocto.bbclass | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 78a1309..ffc0b4c 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}" |
