diff options
-rw-r--r-- | meta/classes/kernel-yocto.bbclass | 16 | ||||
-rw-r--r-- | meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 |
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 | |||
86 | do_kernel_configme() { | 87 | do_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 | ||
5 | DEPENDS = "git-native guilt-native" | 5 | DEPENDS = "git-native guilt-native" |
6 | 6 | ||
7 | SRCREV = "f5a915c277a37ba5949b4c0778356189e7dd9ec0" | 7 | SRCREV = "40d9bab24bde4c2f94a0cece153663aa93e0f9a4" |
8 | PR = r10 | 8 | PR = r10 |
9 | PV = "0.1+git${SRCPV}" | 9 | PV = "0.1+git${SRCPV}" |
10 | 10 | ||