diff options
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-12-04 10:42:13 +1300
committerPaul Eggleton <paul.eggleton@linux.intel.com>2017-12-05 14:39:24 +1300
commit9c274bc8a5d622ab3cdf3b8439bdb0503cfbf7ad (patch)
parent854119e59af55a565f24d5d069dc29eb48d00dab (diff)
devtool: fix handling of linux-yocto after multisrc changes
devtool now handles multiple source trees for any recipe that includes them in SRC_URI, extracting them all side-by-side so that you can make changes in any of them. As a result, when running devtool modify on a linux-yocto kernel recipe under the source path you will get a "source" subdirectory containing the kernel source and a "kernel-meta" subdirectory next to it containing the kernel metadata. (Previously you just got the source tree and the kernel metadata remained in the work directory). We create a symlink automatically at do_unpack from the work directory so that it can still be found there, however kernel_feature_dirs() expects to find the kernel-meta repository and we also now need to make externalsrc remove that so that it doesn't unpack and overwrite the one we've already extracted. Change kernel_feature_dirs() so that if there are no kmeta entries in SRC_URI, it will fall back to a directory named ${KMETA} if it happens to be present in the work directory, ignoring how it got there. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
3 files changed, 10 insertions, 3 deletions
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index 65dd13ddc1f..1ce53ee2d60 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -65,7 +65,7 @@ python () {
url_data = fetch.ud[url]
parm = url_data.parm
if (url_data.type == 'file' or
- 'type' in parm and parm['type'] == 'kmeta'):
+ (parm.get('type', None) == 'kmeta' and d.getVar('EXTERNALSRC_KMETA') != "1")):
d.setVar('SRC_URI', ' '.join(local_srcuri))
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 1d447951c49..18a71132278 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -42,7 +42,12 @@ def find_kernel_feature_dirs(d):
destdir = parm["destsuffix"]
if type == "kmeta":
+ if not feature_dirs:
+ # If the kernel-meta directory already exists (e.g from externalsrc)
+ # with EXTERNALSRC_KMETA = "1" then use it
+ kmetadir = d.getVar('KMETA')
+ if os.path.isdir(os.path.join(d.getVar('WORKDIR'), kmetadir)):
+ feature_dirs.append(kmetadir)
return feature_dirs
# find the master/machine source branch. In the same way that the fetcher proceses
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index cadd038bf6a..fe33c7e1be8 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -909,7 +909,9 @@ def modify(args, config, basepath, workspace):
if bb.data.inherits_class('kernel', rd):
f.write('SRCTREECOVEREDTASKS = "do_validate_branches do_kernel_checkout '
- 'do_fetch do_unpack do_kernel_configme do_kernel_configcheck"\n')
+ 'do_fetch do_kernel_configme do_kernel_configcheck"\n')
+ if bb.data.inherits_class('kernel-yocto', rd):
+ f.write('EXTERNALSRC_KMETA = "1"\n')
f.write('\ndo_patch() {\n'
' :\n'