summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-04-08 00:01:35 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-05 12:26:47 +0100
commit1e54b756e9e4d70d45c2674e3ae0148aeec7d71d (patch)
tree3ba09759140465761b1c757a3086961ef7ee19e2 /meta
parent1fc39646575e423a32c5594fe26dd5980b28ebff (diff)
downloadpoky-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')
-rw-r--r--meta/classes/kernel-yocto.bbclass7
-rw-r--r--meta/recipes-kernel/kern-tools/kern-tools-native_git.bb2
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() {
25 addon_features="$addon_features --feature $feat" 25 addon_features="$addon_features --feature $feat"
26 done 26 done
27 fi 27 fi
28 updateme ${addon_features} ${ARCH} ${MACHINE} ${WORKDIR} 28 updateme --branch ${kbranch} ${addon_features} ${ARCH} ${MACHINE} ${WORKDIR}
29 if [ $? -ne 0 ]; then 29 if [ $? -ne 0 ]; then
30 echo "ERROR. Could not update ${kbranch}" 30 echo "ERROR. Could not update ${kbranch}"
31 exit 1 31 exit 1
@@ -87,9 +87,12 @@ do_kernel_configme() {
87 if [ -n "${YOCTO_KERNEL_EXTERNAL_BRANCH}" ]; then 87 if [ -n "${YOCTO_KERNEL_EXTERNAL_BRANCH}" ]; then
88 # switch from a generic to a specific branch 88 # switch from a generic to a specific branch
89 kbranch=${YOCTO_KERNEL_EXTERNAL_BRANCH} 89 kbranch=${YOCTO_KERNEL_EXTERNAL_BRANCH}
90 cd ${S}
91 git checkout ${kbranch}
92 else
93 cd ${S}
90 fi 94 fi
91 95
92 cd ${S}
93 configme --reconfig --output ${B} ${kbranch} ${MACHINE} 96 configme --reconfig --output ${B} ${kbranch} ${MACHINE}
94 if [ $? -ne 0 ]; then 97 if [ $? -ne 0 ]; then
95 echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" 98 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
4 4
5DEPENDS = "git-native guilt-native" 5DEPENDS = "git-native guilt-native"
6 6
7SRCREV = "92b965b02e3ac32badde3ee71a1e7d3a85cedeb8" 7SRCREV = "c5896a60acc61f8966cfee3bb241ff564610cea4"
8PR = r10 8PR = r10
9PV = "0.1+git${SRCPV}" 9PV = "0.1+git${SRCPV}"
10 10