@@ -61,16 +61,14 @@ python do_menuconfig() {
oe_terminal("sh -c 'make %s; if [ \\$? -ne 0 ]; then echo \"Command failed.\"; printf \"Press any key to continue... \"; read r; fi'" % d.getVar('KCONFIG_CONFIG_COMMAND'),
d.getVar('PN') + ' Configuration', d)
- # FIXME this check can be removed when the minimum bitbake version has been bumped
- if hasattr(bb.build, 'write_taint'):
- try:
- newmtime = os.path.getmtime(config)
- except OSError:
- newmtime = 0
-
- if newmtime > mtime:
- bb.note("Configuration changed, recompile will be forced")
- bb.build.write_taint('do_compile', d)
+ try:
+ newmtime = os.path.getmtime(config)
+ except OSError:
+ newmtime = 0
+
+ if newmtime > mtime:
+ bb.note("Configuration changed, recompile will be forced")
+ bb.build.write_taint('do_compile', d)
}
do_menuconfig[depends] += "ncurses-native:do_populate_sysroot"
do_menuconfig[nostamp] = "1"
The 'FIXME' comment itself says to remove this once the minimum bitbake version has been bumped. This was in 2012. The function was introduced in bitbake commit f7b55a94 ("bitbake: bitbake: ensure -f causes dependent tasks to be re-run") and is already part of bitbake 1.15.3 which is the minimum bitbake version since 'danny'. Remove the check. Signed-off-by: Enrico Jörns <ejo@pengutronix.de> --- meta/classes-recipe/cml1.bbclass | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)