summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/kernel-yocto.bbclass16
1 files changed, 4 insertions, 12 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