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 11:54:47 +0100 |
| commit | ae754be8b43677604a853ec6f62b2490a91d8836 (patch) | |
| tree | a98a224a624a6048f71cc6453d489ad72551d998 | |
| parent | 32c56cd6a5756f21d19d8a32239b783a7854aed3 (diff) | |
| download | openembedded-core-ae754be8b43677604a853ec6f62b2490a91d8836.tar.gz openembedded-core-ae754be8b43677604a853ec6f62b2490a91d8836.tar.bz2 openembedded-core-ae754be8b43677604a853ec6f62b2490a91d8836.zip | |
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.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
| -rw-r--r-- | meta/classes/kernel-yocto.bbclass | 7 | ||||
| -rw-r--r-- | meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 |
2 files changed, 6 insertions, 3 deletions
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}" diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index cc711790a1..820765e8a2 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8 DEPENDS = "git-native guilt-native" -SRCREV = "92b965b02e3ac32badde3ee71a1e7d3a85cedeb8" +SRCREV = "c5896a60acc61f8966cfee3bb241ff564610cea4" PR = r10 PV = "0.1+git${SRCPV}" |