2 files changed, 33 insertions, 2 deletions

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 962b4936b9..92ede6a3aa 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -42,6 +42,23 @@ def find_urls(d):
 
     return patch_list
 
+# check the SRC_URI for "kmeta" type'd git repositories. Return the name of
+# the repository as it will be found in WORKDIR
+def find_kernel_feature_dirs(d):
+    feature_dirs=[]
+    fetch = bb.fetch2.Fetch([], d)
+    for url in fetch.urls:
+        urldata = fetch.ud[url]
+        parm = urldata.parm
+        if "type" in parm:
+            type = parm["type"]
+        if "destsuffix" in parm:
+            destdir = parm["destsuffix"]
+            if type == "kmeta":
+                feature_dirs.append(destdir)
+            
+    return feature_dirs
+
 
 do_patch() {
         cd ${S}
@@ -72,6 +89,7 @@ do_patch() {
 
         sccs="${@" ".join(find_sccs(d))}"
         patches="${@" ".join(find_patches(d))}"
+        feat_dirs="${@" ".join(find_kernel_feature_dirs(d))}"
 
         set +e
         # add any explicitly referenced features onto the end of the feature
@@ -82,13 +100,26 @@ do_patch() {
                 done
         fi
 
+        # check for feature directories/repos/branches that were part of the
+        # SRC_URI. If they were supplied, we convert them into include directives
+        # for the update part of the process
+        if [ -n "${feat_dirs}" ]; then
+            for f in ${feat_dirs}; do
+                if [ -d "${WORKDIR}/$f/meta" ]; then
+                    includes="$includes -I${WORKDIR}/$f/meta"
+                elif [ -d "${WORKDIR}/$f" ]; then
+                    includes="$includes -I${WORKDIR}/$f"
+                fi
+            done
+        fi
+
         if [ "${kbranch}" != "${KBRANCH_DEFAULT}" ]; then
                 updateme_flags="--branch ${kbranch}"
         fi
 
         # updates or generates the target description
         updateme ${updateme_flags} -DKDESC=${KMACHINE}:${LINUX_KERNEL_TYPE} \
-                           ${addon_features} ${ARCH} ${KMACHINE} ${sccs} ${patches}
+                         ${includes} ${addon_features} ${ARCH} ${KMACHINE} ${sccs} ${patches}
         if [ $? -ne 0 ]; then
                 echo "ERROR. Could not update ${kbranch}"
                 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 635dfe6add..98cd8b9e85 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=d8d1d729a70c
 
 DEPENDS = "git-native guilt-native"
 
-SRCREV = "62c8807825ea923a18b1519375b0df67ad9daf2b"
+SRCREV = "9284af9b968d40e441b10f5c09961cbe329ccb9b"
 PR = "r12"
 PV = "0.1+git${SRCPV}"