2 files changed, 6 insertions, 4 deletions

diff --git a/meta/classes/devtool-source.bbclass b/meta/classes/devtool-source.bbclass
index 1372e32c9e..a8110006fb 100644
--- a/meta/classes/devtool-source.bbclass
+++ b/meta/classes/devtool-source.bbclass
@@ -103,8 +103,10 @@ python devtool_post_unpack() {
                 for l in sccfile:
                     line = l.split()
                     if line and line[0] in ('kconf', 'patch'):
-                        local_files[line[-1]] = os.path.join(os.path.dirname(local_files[key]), line[-1])
-                        shutil.copy2(os.path.join(os.path.dirname(local_files[key]), line[-1]), workdir)
+                        cfg = os.path.join(os.path.dirname(local_files[key]), line[-1])
+                        if not cfg in local_files.values():
+                            local_files[line[-1]] = cfg
+                            shutil.copy2(cfg, workdir)
                 sccfile.close()
 
     # Ignore local files with subdir={BP}
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 496c8a7f68..2f556ca03b 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -138,10 +138,10 @@ do_kernel_metadata() {
         for f in ${feat_dirs}; do
                 if [ -d "${WORKDIR}/$f/meta" ]; then
                         includes="$includes -I${WORKDIR}/$f/kernel-meta"
-                elif [ -d "${WORKDIR}/$f" ]; then
-                        includes="$includes -I${WORKDIR}/$f"
                 elif [ -d "${WORKDIR}/../oe-local-files/$f" ]; then
                         includes="$includes -I${WORKDIR}/../oe-local-files/$f"
+                elif [ -d "${WORKDIR}/$f" ]; then
+                        includes="$includes -I${WORKDIR}/$f"
                 fi
         done
         for s in ${sccs} ${patches}; do