1 files changed, 50 insertions, 28 deletions

diff --git a/meta/classes-recipe/kernel-yocto.bbclass b/meta/classes-recipe/kernel-yocto.bbclass
index 6468e8aa90..e53bf15194 100644
--- a/meta/classes-recipe/kernel-yocto.bbclass
+++ b/meta/classes-recipe/kernel-yocto.bbclass
@@ -25,6 +25,7 @@ KCONF_AUDIT_LEVEL ?= "1"
 KCONF_BSP_AUDIT_LEVEL ?= "0"
 KMETA_AUDIT ?= "yes"
 KMETA_AUDIT_WERROR ?= ""
+KMETA_CONFIG_FEATURES ?= ""
 
 # returns local (absolute) path names for all valid patches in the
 # src_uri
@@ -62,8 +63,8 @@ def find_sccs(d):
 
     return sources_list
 
-# check the SRC_URI for "kmeta" type'd git repositories. Return the name of
-# the repository as it will be found in UNPACKDIR
+# check the SRC_URI for "kmeta" type'd git repositories and directories. Return
+# the name of the repository or directory as it will be found in UNPACKDIR
 def find_kernel_feature_dirs(d):
     feature_dirs=[]
     fetch = bb.fetch2.Fetch([], d)
@@ -71,13 +72,16 @@ def find_kernel_feature_dirs(d):
         urldata = fetch.ud[url]
         parm = urldata.parm
         type=""
+        destdir = ""
         if "type" in parm:
             type = parm["type"]
         if "destsuffix" in parm:
             destdir = parm["destsuffix"]
-            if type == "kmeta":
-                feature_dirs.append(destdir)
-            
+        elif urldata.type == "file":
+            destdir = urldata.basepath
+        if type == "kmeta" and destdir:
+            feature_dirs.append(destdir)
+
     return feature_dirs
 
 # find the master/machine source branch. In the same way that the fetcher proceses
@@ -147,10 +151,6 @@ do_kernel_metadata() {
         # from the source tree, into a common location and normalized "defconfig" name,
         # where the rest of the process will include and incoroporate it into the build
         #
-        # If the fetcher has already placed a defconfig in UNPACKDIR (from the SRC_URI),
-        # we don't overwrite it, but instead warn the user that SRC_URI defconfigs take
-        # precendence.
-        #
         if [ -n "${KBUILD_DEFCONFIG}" ]; then
                 if [ -f "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}" ]; then
                         if [ -f "${UNPACKDIR}/defconfig" ]; then
@@ -158,12 +158,10 @@ do_kernel_metadata() {
                                 # one already placed in UNPACKDIR
                                 cmp "${UNPACKDIR}/defconfig" "${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG}"
                                 if [ $? -ne 0 ]; then
-                                        bbdebug 1 "detected SRC_URI or unpatched defconfig in UNPACKDIR. ${KBUILD_DEFCONFIG} copied over it"
+                                        bbdebug 1 "detected SRC_URI or patched defconfig in UNPACKDIR. ${KBUILD_DEFCONFIG} copied over it"
                                 fi
-                                cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${UNPACKDIR}/defconfig
-                        else
-                                cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${UNPACKDIR}/defconfig
                         fi
+                        cp -f ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${UNPACKDIR}/defconfig
                         in_tree_defconfig="${UNPACKDIR}/defconfig"
                 else
                         bbfatal "A KBUILD_DEFCONFIG '${KBUILD_DEFCONFIG}' was specified, but not present in the source tree (${S}/arch/${ARCH}/configs/)"
@@ -234,8 +232,6 @@ do_kernel_metadata() {
         for f in ${feat_dirs}; do
                 if [ -d "${UNPACKDIR}/$f/kernel-meta" ]; then
                         includes="$includes -I${UNPACKDIR}/$f/kernel-meta"
-                elif [ -d "${UNPACKDIR}/../oe-local-files/$f" ]; then
-                        includes="$includes -I${UNPACKDIR}/../oe-local-files/$f"
                 elif [ -d "${UNPACKDIR}/$f" ]; then
                         includes="$includes -I${UNPACKDIR}/$f"
                 fi
@@ -250,6 +246,9 @@ do_kernel_metadata() {
                 fi
         done
 
+        # allow in-tree config fragments to be used in KERNEL_FEATURES
+        includes="$includes -I${S}/arch/${ARCH}/configs -I${S}/kernel/configs"
+
         # expand kernel features into their full path equivalents
         bsp_definition=$(spp ${includes} --find -DKMACHINE=${KMACHINE} -DKTYPE=${LINUX_KERNEL_TYPE})
         if [ -z "$bsp_definition" ]; then
@@ -270,6 +269,9 @@ do_kernel_metadata() {
         KERNEL_FEATURES_FINAL=""
         if [ -n "${KERNEL_FEATURES}" ]; then
                 for feature in ${KERNEL_FEATURES}; do
+                        feature_as_specified="$feature"
+                        feature="$(echo $feature_as_specified | cut -d: -f1)"
+                        feature_specifier="$(echo $feature_as_specified | cut -d: -f2)"
                         feature_found=f
                         for d in $includes; do
                                 path_to_check=$(echo $d | sed 's/^-I//')
@@ -287,7 +289,7 @@ do_kernel_metadata() {
                                     bbfatal_log "Set KERNEL_DANGLING_FEATURES_WARN_ONLY to ignore this issue"
                                 fi
                         else
-                                KERNEL_FEATURES_FINAL="$KERNEL_FEATURES_FINAL $feature"
+                                KERNEL_FEATURES_FINAL="$KERNEL_FEATURES_FINAL $feature_as_specified"
                         fi
                 done
         fi
@@ -297,7 +299,11 @@ do_kernel_metadata() {
                 elements="`echo -n ${bsp_definition} $sccs_defconfig ${sccs} ${patches} $KERNEL_FEATURES_FINAL`"
                 if [ -n "${elements}" ]; then
                         echo "${bsp_definition}" > ${S}/${meta_dir}/bsp_definition
-                        scc --force -o ${S}/${meta_dir}:cfg,merge,meta ${includes} $sccs_defconfig $bsp_definition $sccs $patches $KERNEL_FEATURES_FINAL
+                        echo "${KMETA_CONFIG_FEATURES}" | grep -q "prefer-modules"
+                        if [ $? -eq 0 ]; then
+                                scc_defines="-DMODULE_OR_Y=m"
+                        fi
+                        scc --force $scc_defines -o ${S}/${meta_dir}:cfg,merge,meta ${includes} $sccs_defconfig $bsp_definition $sccs $patches $KERNEL_FEATURES_FINAL
                         if [ $? -ne 0 ]; then
                                 bbfatal_log "Could not generate configuration queue for ${KMACHINE}."
                         fi
@@ -345,6 +351,9 @@ do_patch() {
         cd ${S}
 
         check_git_config
+        if [ "${KERNEL_DEBUG_TIMESTAMPS}" != "1" ]; then
+                reproducible_git_committer_author
+        fi
         meta_dir=$(kgit --meta)
         (cd ${meta_dir}; ln -sf patch.queue series)
         if [ -f "${meta_dir}/series" ]; then
@@ -379,19 +388,19 @@ do_kernel_checkout() {
         set +e
 
         source_dir=`echo ${S} | sed 's%/$%%'`
-        source_workdir="${WORKDIR}/git"
-        if [ -d "${WORKDIR}/git/" ]; then
+        source_unpackdir="${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
+        if [ -d "${source_unpackdir}" ]; then
                 # case: git repository
-                # if S is WORKDIR/git, then we shouldn't be moving or deleting the tree.
-                if [ "${source_dir}" != "${source_workdir}" ]; then
-                        if [ -d "${source_workdir}/.git" ]; then
+                # if S is UNPACKDIR/BB_GIT_DEFAULT_DESTSUFFIX, then we shouldn't be moving or deleting the tree.
+                if [ "${source_dir}" != "${source_unpackdir}" ]; then
+                        if [ -d "${source_unpackdir}/.git" ]; then
                                 # regular git repository with .git
                                 rm -rf ${S}
-                                mv ${WORKDIR}/git ${S}
+                                mv ${source_unpackdir} ${S}
                         else
                                 # create source for bare cloned git repository
-                                git clone ${WORKDIR}/git ${S}
-                                rm -rf ${WORKDIR}/git
+                                git clone ${source_unpackdir} ${S}
+                                rm -rf ${source_unpackdir}
                         fi
                 fi
                 cd ${S}
@@ -427,6 +436,9 @@ do_kernel_checkout() {
                 rm -f .gitignore
                 git init
                 check_git_config
+                if [ "${KERNEL_DEBUG_TIMESTAMPS}" != "1" ]; then
+                        reproducible_git_committer_author
+                fi
                 git add .
                 git commit -q -n -m "baseline commit: creating repo for ${PN}-${PV}"
                 git clean -d -f
@@ -434,7 +446,7 @@ do_kernel_checkout() {
 
         set -e
 }
-do_kernel_checkout[dirs] = "${S} ${WORKDIR}"
+do_kernel_checkout[dirs] = "${S} ${UNPACKDIR}"
 
 addtask kernel_checkout before do_kernel_metadata after do_symlink_kernsrc
 addtask kernel_metadata after do_validate_branches do_unpack before do_patch
@@ -442,8 +454,13 @@ do_kernel_metadata[depends] = "kern-tools-native:do_populate_sysroot"
 do_kernel_metadata[file-checksums] = " ${@get_dirs_with_fragments(d)}"
 do_validate_branches[depends] = "kern-tools-native:do_populate_sysroot"
 
-do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}binutils:do_populate_sysroot"
-do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot"
+# ${S} doesn't exist for us at unpack
+do_qa_unpack() {
+    return
+}
+
+do_kernel_configme[depends] += "virtual/cross-binutils:do_populate_sysroot"
+do_kernel_configme[depends] += "virtual/cross-cc:do_populate_sysroot"
 do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot"
 do_kernel_configme[depends] += "kern-tools-native:do_populate_sysroot"
 do_kernel_configme[dirs] += "${S} ${B}"
@@ -559,6 +576,11 @@ python do_config_analysis() {
 python do_kernel_configcheck() {
     import re, string, sys, subprocess
 
+    audit_flag = d.getVar( "KMETA_AUDIT" )
+    if not audit_flag:
+       bb.note( "kernel config audit disabled, skipping .." )
+       return
+
     s = d.getVar('S')
 
     # if KMETA isn't set globally by a recipe using this routine, use kgit to