layer.conf: add a bb_min_version statement to perform an early bitbake version check

Please see the corresponding change in bitbake for the rationale:
https://lists.openembedded.org/g/bitbake-devel/message/18223

This change also means the identical later check in sanity will never fail, and so
that can be removed.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>

diff --git a/meta/classes-global/sanity.bbclass b/meta/classes-global/sanity.bbclass
index 6934e071a3d005f57423bfcc78104937ac56bfbc..bdd4d1474ef650895a1b8921a26ac3dde712d086 100644 (file)
--- a/meta/classes-global/sanity.bbclass
+++ b/meta/classes-global/sanity.bbclass
@@ -845,11 +845,6 @@ def check_sanity_everybuild(status, d):
     if sys.hexversion < 0x030900F0:
         status.addresult('The system requires at least Python 3.9 to run. Please update your Python interpreter.\n')
 
-    # Check the bitbake version meets minimum requirements
-    minversion = d.getVar('BB_MIN_VERSION')
-    if bb.utils.vercmp_string_op(bb.__version__, minversion, "<"):
-        status.addresult('Bitbake version %s is required and version %s was found\n' % (minversion, bb.__version__))
-
     sanity_check_locale(d)
 
     paths = d.getVar('PATH').split(":")

diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf
index 54fa04e213edd918d36713fa28229da90fc425fc..d6dbad040c22125d79ace95b450ac616d61f578b 100644 (file)
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -1,3 +1,6 @@
+BB_MIN_VERSION = "2.15.2"
+bitbake_min_version ${BB_MIN_VERSION}
+
 # We have a conf and classes directory, add to BBPATH
 BBPATH .= ":${LAYERDIR}"
 # We have recipes-* directories, add to BBFILES

diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf
index 718285427487b4c2e2f597e328d28595306689e7..602a7701f4cb61f0b19ba45b6bddf9486481f797 100644 (file)
--- a/meta/conf/sanity.conf
+++ b/meta/conf/sanity.conf
@@ -3,8 +3,6 @@
 # See sanity.bbclass
 #
 # Expert users can confirm their sanity with "touch conf/sanity.conf"
-BB_MIN_VERSION = "2.15.2"
-
 SANITY_ABIFILE = "${TMPDIR}/abi_version"
 
 SANITY_VERSION ?= "1"