From: Alexander Kanavin <[email protected]> barebox-tools needs to be updated in lockstep with barebox, and was already once erroneously updated to 2024.10 without barebox itself.
Particularly, this change puts PV into .inc as well for both recipes. This will allow AUH to produce correct update patches, as barebox recipe is mutually exclusive with u-boot, and so isn't handled by AUH. mesa-gl recipe uses a similar trick with mesa. Signed-off-by: Alexander Kanavin <[email protected]> --- meta/recipes-bsp/barebox/barebox-common.inc | 8 ++++++++ .../{barebox-tools_2024.10.0.bb => barebox-tools.bb} | 9 ++------- meta/recipes-bsp/barebox/barebox-version.inc | 1 - .../barebox/{barebox_2024.10.0.bb => barebox.bb} | 10 ++-------- 4 files changed, 12 insertions(+), 16 deletions(-) create mode 100644 meta/recipes-bsp/barebox/barebox-common.inc rename meta/recipes-bsp/barebox/{barebox-tools_2024.10.0.bb => barebox-tools.bb} (83%) delete mode 100644 meta/recipes-bsp/barebox/barebox-version.inc rename meta/recipes-bsp/barebox/{barebox_2024.10.0.bb => barebox.bb} (67%) diff --git a/meta/recipes-bsp/barebox/barebox-common.inc b/meta/recipes-bsp/barebox/barebox-common.inc new file mode 100644 index 00000000000..5dcdb707578 --- /dev/null +++ b/meta/recipes-bsp/barebox/barebox-common.inc @@ -0,0 +1,8 @@ +HOMEPAGE = "https://barebox.org/"; +SECTION = "bootloaders" + +LIC_FILES_CHKSUM = "file://COPYING;md5=f5125d13e000b9ca1f0d3364286c4192" + +PV = "2024.10.0" +SRC_URI = "https://barebox.org/download/barebox-${PV}.tar.bz2"; +SRC_URI[sha256sum] = "955b20bfa7358732d2c0c09ccfd4c1a69087b7e2c610b16dee7442d71a5af88d" diff --git a/meta/recipes-bsp/barebox/barebox-tools_2024.10.0.bb b/meta/recipes-bsp/barebox/barebox-tools.bb similarity index 83% rename from meta/recipes-bsp/barebox/barebox-tools_2024.10.0.bb rename to meta/recipes-bsp/barebox/barebox-tools.bb index 25d6a5c0622..2a117bc9c08 100644 --- a/meta/recipes-bsp/barebox/barebox-tools_2024.10.0.bb +++ b/meta/recipes-bsp/barebox/barebox-tools.bb @@ -1,16 +1,11 @@ SUMMARY = "barebox bootloader tools" -HOMEPAGE = "https://barebox.org/"; -SECTION = "bootloaders" + +require barebox-common.inc LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=f5125d13e000b9ca1f0d3364286c4192" DEPENDS = "bison-native flex-native libusb1" -SRC_URI = "https://barebox.org/download/barebox-${PV}.tar.bz2"; - -require barebox-version.inc - S = "${WORKDIR}/barebox-${PV}" B = "${WORKDIR}/build" diff --git a/meta/recipes-bsp/barebox/barebox-version.inc b/meta/recipes-bsp/barebox/barebox-version.inc deleted file mode 100644 index d008c49f289..00000000000 --- a/meta/recipes-bsp/barebox/barebox-version.inc +++ /dev/null @@ -1 +0,0 @@ -SRC_URI[sha256sum] = "955b20bfa7358732d2c0c09ccfd4c1a69087b7e2c610b16dee7442d71a5af88d" diff --git a/meta/recipes-bsp/barebox/barebox_2024.10.0.bb b/meta/recipes-bsp/barebox/barebox.bb similarity index 67% rename from meta/recipes-bsp/barebox/barebox_2024.10.0.bb rename to meta/recipes-bsp/barebox/barebox.bb index aa63be4080c..dc9ae669d76 100644 --- a/meta/recipes-bsp/barebox/barebox_2024.10.0.bb +++ b/meta/recipes-bsp/barebox/barebox.bb @@ -4,15 +4,9 @@ but also for initial hardware bringup and development. \ Users should feel right at home with a shell with UNIX-like virtual file system access to hardware, \ Linux kernel driver API for making driver porting easier, \ and a subset of the POSIX C library for writing more command-line utilities." -HOMEPAGE = "https://barebox.org/"; -SECTION = "bootloaders" - -LIC_FILES_CHKSUM = "file://COPYING;md5=f5125d13e000b9ca1f0d3364286c4192" +require barebox-common.inc inherit barebox -SRC_URI = "https://barebox.org/download/barebox-${PV}.tar.bz2 \ - file://0001-lib-lz4-use-lz4-instead-of-lz4c.patch \ +SRC_URI += "file://0001-lib-lz4-use-lz4-instead-of-lz4c.patch \ " - -require barebox-version.inc -- 2.39.5
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#208232): https://lists.openembedded.org/g/openembedded-core/message/208232 Mute This Topic: https://lists.openembedded.org/mt/109915733/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
