summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2011-08-02 15:09:50 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-08 13:41:21 +0100
commit5e4a6bd7e2b58c0932000fd7ac123141622d5f02 (patch)
treefea8ece516961ae6f4708b5fc8d85d711aa4c1ce
parentb0f12a16123d758f5cff8ad0a662d38a5aed1ddc (diff)
downloadpoky-5e4a6bd7e2b58c0932000fd7ac123141622d5f02.tar.gz
linux-yocto: allow configuration of arbitrary branches
When building an external tree or bootstrapping a BSP the external branch may not have been checked out. The tools now ensure that the tree is ready for configuration, so we no longer need to force the checkout of the external branch. This change is coupled with some kern tools tweaks as follows: 40d9bab updateme: allow the location of board descriptions based on defines 59859ca createme: use branch name when creating meta data 91b4275 configme: determine meta branch based on directories, not branch naming f5a915c kgit-meta: make branch creation and renaming more robust (From OE-Core rev: 02c82bf5255b09bb27a0a4509861a3d2bd84b09f) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-yocto.bbclass16
-rw-r--r--meta/recipes-kernel/kern-tools/kern-tools-native_git.bb2
2 files changed, 5 insertions, 13 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 5e7003bd4e..f31ff61c61 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -28,7 +28,8 @@ do_patch() {
28 addon_features="$addon_features --feature $feat" 28 addon_features="$addon_features --feature $feat"
29 done 29 done
30 fi 30 fi
31 updateme --branch ${kbranch} ${addon_features} ${ARCH} ${KMACHINE} ${WORKDIR} 31 updateme --branch ${kbranch} -DKDESC=${KMACHINE}:${LINUX_KERNEL_TYPE} \
32 ${addon_features} ${ARCH} ${KMACHINE} ${WORKDIR}
32 if [ $? -ne 0 ]; then 33 if [ $? -ne 0 ]; then
33 echo "ERROR. Could not update ${kbranch}" 34 echo "ERROR. Could not update ${kbranch}"
34 exit 1 35 exit 1
@@ -86,17 +87,8 @@ addtask kernel_checkout before do_patch after do_unpack
86do_kernel_configme() { 87do_kernel_configme() {
87 echo "[INFO] doing kernel configme" 88 echo "[INFO] doing kernel configme"
88 89
89 kbranch=${KBRANCH} 90 cd ${S}
90 if [ -n "${YOCTO_KERNEL_EXTERNAL_BRANCH}" ]; then 91 configme --reconfig --output ${B} ${KBRANCH} ${KMACHINE}
91 # switch from a generic to a specific branch
92 kbranch=${YOCTO_KERNEL_EXTERNAL_BRANCH}
93 cd ${S}
94 git checkout ${kbranch}
95 else
96 cd ${S}
97 fi
98
99 configme --reconfig --output ${B} ${kbranch} ${MACHINE}
100 if [ $? -ne 0 ]; then 92 if [ $? -ne 0 ]; then
101 echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}" 93 echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
102 exit 1 94 exit 1
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 1fbb1f7183..5659252a9e 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 = "f5a915c277a37ba5949b4c0778356189e7dd9ec0" 7SRCREV = "40d9bab24bde4c2f94a0cece153663aa93e0f9a4"
8PR = r10 8PR = r10
9PV = "0.1+git${SRCPV}" 9PV = "0.1+git${SRCPV}"
10 10