summaryrefslogtreecommitdiffstats
path: root/meta/classes/externalsrc.bbclass
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-10-11 21:33:47 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-11 22:04:44 (GMT)
commitf7259298a29e865dc03bde77e4617bc671a9c85e (patch)
treef219761c8106468283a07fd2ca58c6e23939af94 /meta/classes/externalsrc.bbclass
parent2d60ffcbdadb689767ff3291f6b933d72b569b4b (diff)
downloadpoky-f7259298a29e865dc03bde77e4617bc671a9c85e.tar.gz
classes/externalsrc: re-run do_configure when configure files change
If the user modifies files such as CMakeLists.txt in the case of cmake, we want do_configure to re-run so that those changes can take effect. In order to accomplish that, have a variable CONFIGURE_FILES which specifies a list of files that will be put into do_configure's checksum (either full paths, or just filenames which will be searched for in the entire source tree). CONFIGURE_FILES then just needs to be set appropriately depending on what do_configure is doing; for now I've set this for autotools and cmake which are the most common cases. Fixes [YOCTO #7617]. (From OE-Core rev: 923fc20c2862a6d75f949082c9f6532ab7e2d2cd) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/externalsrc.bbclass')
-rw-r--r--meta/classes/externalsrc.bbclass22
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index 5c65d2b..31908c3 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -103,6 +103,7 @@ python () {
103 d.prependVarFlag('do_configure', 'prefuncs', "externalsrc_configure_prefunc ") 103 d.prependVarFlag('do_configure', 'prefuncs', "externalsrc_configure_prefunc ")
104 104
105 d.setVarFlag('do_compile', 'file-checksums', '${@srctree_hash_files(d)}') 105 d.setVarFlag('do_compile', 'file-checksums', '${@srctree_hash_files(d)}')
106 d.setVarFlag('do_configure', 'file-checksums', '${@srctree_configure_hash_files(d)}')
106 107
107 # We don't want the workdir to go away 108 # We don't want the workdir to go away
108 d.appendVar('RM_WORK_EXCLUDE', ' ' + d.getVar('PN', True)) 109 d.appendVar('RM_WORK_EXCLUDE', ' ' + d.getVar('PN', True))
@@ -166,3 +167,24 @@ def srctree_hash_files(d):
166 else: 167 else:
167 ret = d.getVar('EXTERNALSRC', True) + '/*:True' 168 ret = d.getVar('EXTERNALSRC', True) + '/*:True'
168 return ret 169 return ret
170
171def srctree_configure_hash_files(d):
172 """
173 Get the list of files that should trigger do_configure to re-execute,
174 based on the value of CONFIGURE_FILES
175 """
176 in_files = (d.getVar('CONFIGURE_FILES', True) or '').split()
177 out_items = []
178 search_files = []
179 for entry in in_files:
180 if entry.startswith('/'):
181 out_items.append('%s:%s' % (entry, os.path.exists(entry)))
182 else:
183 search_files.append(entry)
184 if search_files:
185 s_dir = d.getVar('EXTERNALSRC', True)
186 for root, _, files in os.walk(s_dir):
187 for f in files:
188 if f in search_files:
189 out_items.append('%s:True' % os.path.join(root, f))
190 return ' '.join(out_items)