From: Enrico Jörns Date: Tue, 5 Mar 2024 21:57:27 +0000 (+0100) Subject: cml1: remove needless check for write_taint attribute X-Git-Tag: yocto-5.2~3284 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=035fe46fbf57ca83baf6610482ee7ee83c825a06;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git cml1: remove needless check for write_taint attribute 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 Signed-off-by: Richard Purdie --- diff --git a/meta/classes-recipe/cml1.bbclass b/meta/classes-recipe/cml1.bbclass index c4e3c9ff7a3..2da19cb4cf5 100644 --- a/meta/classes-recipe/cml1.bbclass +++ b/meta/classes-recipe/cml1.bbclass @@ -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"