]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
cml1: remove needless check for write_taint attribute
authorEnrico Jörns <ejo@pengutronix.de>
Tue, 5 Mar 2024 21:57:27 +0000 (22:57 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 30 Mar 2024 22:25:17 +0000 (22:25 +0000)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes-recipe/cml1.bbclass

index c4e3c9ff7a3b9173dbfcc59817964763faa2de9e..2da19cb4cf5e74687b2e8dd690b1142a68d9b650 100644 (file)
@@ -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"