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>
This commit is contained in:
parent
2d60ffcbda
commit
f7259298a2
|
@ -259,6 +259,8 @@ python autotools_copy_aclocals () {
|
|||
}
|
||||
autotools_copy_aclocals[vardepsexclude] += "MACHINE SDK_ARCH BUILD_ARCH SDK_OS BB_TASKDEPDATA"
|
||||
|
||||
CONFIGURE_FILES = "${S}/configure.in ${S}/configure.ac ${S}/config.h.in ${S}/acinclude.m4 Makefile.am"
|
||||
|
||||
autotools_do_configure() {
|
||||
# WARNING: gross hack follows:
|
||||
# An autotools built package generally needs these scripts, however only
|
||||
|
|
|
@ -84,6 +84,8 @@ EOF
|
|||
|
||||
addtask generate_toolchain_file after do_patch before do_configure
|
||||
|
||||
CONFIGURE_FILES = "CMakeLists.txt"
|
||||
|
||||
cmake_do_configure() {
|
||||
if [ "${OECMAKE_BUILDPATH}" ]; then
|
||||
bbnote "cmake.bbclass no longer uses OECMAKE_BUILDPATH. The default behaviour is now out-of-tree builds with B=WORKDIR/build."
|
||||
|
|
|
@ -103,6 +103,7 @@ python () {
|
|||
d.prependVarFlag('do_configure', 'prefuncs', "externalsrc_configure_prefunc ")
|
||||
|
||||
d.setVarFlag('do_compile', 'file-checksums', '${@srctree_hash_files(d)}')
|
||||
d.setVarFlag('do_configure', 'file-checksums', '${@srctree_configure_hash_files(d)}')
|
||||
|
||||
# We don't want the workdir to go away
|
||||
d.appendVar('RM_WORK_EXCLUDE', ' ' + d.getVar('PN', True))
|
||||
|
@ -166,3 +167,24 @@ def srctree_hash_files(d):
|
|||
else:
|
||||
ret = d.getVar('EXTERNALSRC', True) + '/*:True'
|
||||
return ret
|
||||
|
||||
def srctree_configure_hash_files(d):
|
||||
"""
|
||||
Get the list of files that should trigger do_configure to re-execute,
|
||||
based on the value of CONFIGURE_FILES
|
||||
"""
|
||||
in_files = (d.getVar('CONFIGURE_FILES', True) or '').split()
|
||||
out_items = []
|
||||
search_files = []
|
||||
for entry in in_files:
|
||||
if entry.startswith('/'):
|
||||
out_items.append('%s:%s' % (entry, os.path.exists(entry)))
|
||||
else:
|
||||
search_files.append(entry)
|
||||
if search_files:
|
||||
s_dir = d.getVar('EXTERNALSRC', True)
|
||||
for root, _, files in os.walk(s_dir):
|
||||
for f in files:
|
||||
if f in search_files:
|
||||
out_items.append('%s:True' % os.path.join(root, f))
|
||||
return ' '.join(out_items)
|
||||
|
|
Loading…
Reference in New Issue