From 8e7b015b35593d14e57532b28e50396ed8a92280 Mon Sep 17 00:00:00 2001 From: Adrian Freihofer Date: Mon, 15 May 2023 17:26:20 +0200 Subject: [PATCH] busybox-initrd: auto pv from busybox Not hardcoding the version of busybox from the core layer in this layer is a small improvement for maintenance. But the main motivation is to support the following layer combination without getting a parse error from bitbake: - poky LTS, branch = kirkstone - meta-lts-mixins, branch = kirkstone/go - meta-lts-mixins, branch = kirkstone/rust - meta-virtualization, branch = master Signed-off-by: Adrian Freihofer Signed-off-by: Bruce Ashfield --- ...{busybox-initrd_1.36.0.bb => busybox-initrd.bb} | 14 ++++++++++++++ 1 file changed, 14 insertions(+) rename recipes-core/busybox/{busybox-initrd_1.36.0.bb => busybox-initrd.bb} (59%) diff --git a/recipes-core/busybox/busybox-initrd_1.36.0.bb b/recipes-core/busybox/busybox-initrd.bb similarity index 59% rename from recipes-core/busybox/busybox-initrd_1.36.0.bb rename to recipes-core/busybox/busybox-initrd.bb index 6108e9af..513ed135 100644 --- a/recipes-core/busybox/busybox-initrd_1.36.0.bb +++ b/recipes-core/busybox/busybox-initrd.bb @@ -1,5 +1,19 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/busybox-initrd:${COREBASE}/meta/recipes-core/busybox/busybox:${COREBASE}/meta/recipes-core/busybox/files:" +def get_busybox_pv(d): + import re + corebase = d.getVar('COREBASE') + bb_dir = os.path.join(corebase, 'meta', 'recipes-core', 'busybox') + if os.path.isdir(bb_dir): + re_bb_name = re.compile(r"busybox_([0-9.]*)\.bb") + for bb_file in os.listdir(bb_dir): + result = re_bb_name.match(bb_file) + if result: + return result.group(1) + bb.fatal("Cannot find busybox recipe in %s" % bb_dir) + +PV := "${@get_busybox_pv(d)}" + require recipes-core/busybox/busybox_${PV}.bb SRC_URI += "file://init.cfg \