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() {
                         addon_features="$addon_features --feature $feat"
                 done
         fi
-        updateme --branch ${kbranch} ${addon_features} ${ARCH} ${KMACHINE} ${WORKDIR}
+        updateme --branch ${kbranch} -DKDESC=${KMACHINE}:${LINUX_KERNEL_TYPE} \
+                         ${addon_features} ${ARCH} ${KMACHINE} ${WORKDIR}
         if [ $? -ne 0 ]; then
                 echo "ERROR. Could not update ${kbranch}"
                 exit 1
@@ -86,17 +87,8 @@ addtask kernel_checkout before do_patch after do_unpack
 do_kernel_configme() {
         echo "[INFO] doing kernel configme"
 
-        kbranch=${KBRANCH}
-        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
-
-        configme --reconfig --output ${B} ${kbranch} ${MACHINE}
+        cd ${S}
+        configme --reconfig --output ${B} ${KBRANCH} ${KMACHINE}
         if [ $? -ne 0 ]; then
                 echo "ERROR. Could not configure ${KMACHINE}-${LINUX_KERNEL_TYPE}"
                 exit 1