From 769d5c70e8792d58b7cc2a2120ff2643ca05f1c3 Mon Sep 17 00:00:00 2001 From: Enrico Jorns Date: Tue, 8 Aug 2023 21:59:49 +0200 Subject: [PATCH 1/5] dt-utils: update to 2023.08.0 Signed-off-by: Enrico Jorns (cherry picked from commit 6c5faed98b7124e1f084280b0981da349f38c8d6) Signed-off-by: Enrico Jorns --- recipes-bsp/dt-utils/dt-utils.inc | 2 +- recipes-bsp/dt-utils/dt-utils_2021.03.0.bb | 3 --- recipes-bsp/dt-utils/dt-utils_2023.08.0.bb | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 recipes-bsp/dt-utils/dt-utils_2021.03.0.bb create mode 100644 recipes-bsp/dt-utils/dt-utils_2023.08.0.bb diff --git a/recipes-bsp/dt-utils/dt-utils.inc b/recipes-bsp/dt-utils/dt-utils.inc index df59d43b..6f03dc52 100644 --- a/recipes-bsp/dt-utils/dt-utils.inc +++ b/recipes-bsp/dt-utils/dt-utils.inc @@ -2,7 +2,7 @@ DESCRIPTION = "device-tree and barebox-related tools" HOMEPAGE = "http://git.pengutronix.de/?p=tools/dt-utils.git" SECTION = "base" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" +LIC_FILES_CHKSUM = "file://COPYING;md5=18d902a0242c37a4604224b47d02f802" DEPENDS = "udev" PR = "r0" diff --git a/recipes-bsp/dt-utils/dt-utils_2021.03.0.bb b/recipes-bsp/dt-utils/dt-utils_2021.03.0.bb deleted file mode 100644 index 121ac8d6..00000000 --- a/recipes-bsp/dt-utils/dt-utils_2021.03.0.bb +++ /dev/null @@ -1,3 +0,0 @@ -require dt-utils.inc - -SRC_URI[sha256sum] = "36a56924e356250988315cd8761fde52832e6d4934323aca2827ff93fa12907f" diff --git a/recipes-bsp/dt-utils/dt-utils_2023.08.0.bb b/recipes-bsp/dt-utils/dt-utils_2023.08.0.bb new file mode 100644 index 00000000..57072522 --- /dev/null +++ b/recipes-bsp/dt-utils/dt-utils_2023.08.0.bb @@ -0,0 +1,3 @@ +require dt-utils.inc + +SRC_URI[sha256sum] = "15cda6fdbaaf08711e55b49db4479f3af48660b812d8d587ec9b3fffaa13a0f7" From fe6c0199f795ae22ac3aed17d93e475b9c924b8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= Date: Fri, 24 Nov 2023 13:40:43 +0100 Subject: [PATCH 2/5] dt-utils: update to 2023.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This release fixes an issue when using barebox-state on systems with a barebox state partition on the eMMC user partition. Without this patch barebox-state searches for the state partition on one of the eMMC boot (hardware) partitions. Fixes: 6c5faed ("dt-utils: update to 2023.08.0") Signed-off-by: Leonard Göhrs (cherry picked from commit 564181f3fd119a37f4dfe04f179b5f6cc7807730) Signed-off-by: Enrico Jorns --- recipes-bsp/dt-utils/dt-utils_2023.08.0.bb | 3 --- recipes-bsp/dt-utils/dt-utils_2023.11.0.bb | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 recipes-bsp/dt-utils/dt-utils_2023.08.0.bb create mode 100644 recipes-bsp/dt-utils/dt-utils_2023.11.0.bb diff --git a/recipes-bsp/dt-utils/dt-utils_2023.08.0.bb b/recipes-bsp/dt-utils/dt-utils_2023.08.0.bb deleted file mode 100644 index 57072522..00000000 --- a/recipes-bsp/dt-utils/dt-utils_2023.08.0.bb +++ /dev/null @@ -1,3 +0,0 @@ -require dt-utils.inc - -SRC_URI[sha256sum] = "15cda6fdbaaf08711e55b49db4479f3af48660b812d8d587ec9b3fffaa13a0f7" diff --git a/recipes-bsp/dt-utils/dt-utils_2023.11.0.bb b/recipes-bsp/dt-utils/dt-utils_2023.11.0.bb new file mode 100644 index 00000000..a1e90250 --- /dev/null +++ b/recipes-bsp/dt-utils/dt-utils_2023.11.0.bb @@ -0,0 +1,3 @@ +require dt-utils.inc + +SRC_URI[sha256sum] = "d224d941c076c143f43d59cd7c6e1c522926064a31ac34a67720632ddecb6b53" From 4d23ce94107a229ec738ca9a16c7a530f8cbd292 Mon Sep 17 00:00:00 2001 From: Enrico Jorns Date: Wed, 20 Dec 2023 16:52:37 +0100 Subject: [PATCH 3/5] rauc: update to v1.11 Signed-off-by: Enrico Jorns (cherry picked from commit 1c1498e3facd9fe0d8be60736c3a6b07e578ec5f) Signed-off-by: Enrico Jorns --- .../rauc/{nativesdk-rauc_1.10.1.bb => nativesdk-rauc_1.11.bb} | 2 +- recipes-core/rauc/{rauc-1.10.1.inc => rauc-1.11.inc} | 2 +- .../rauc/{rauc-native_1.10.1.bb => rauc-native_1.11.bb} | 2 +- recipes-core/rauc/{rauc_1.10.1.bb => rauc_1.11.bb} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename recipes-core/rauc/{nativesdk-rauc_1.10.1.bb => nativesdk-rauc_1.11.bb} (64%) rename recipes-core/rauc/{rauc-1.10.1.inc => rauc-1.11.inc} (63%) rename recipes-core/rauc/{rauc-native_1.10.1.bb => rauc-native_1.11.bb} (63%) rename recipes-core/rauc/{rauc_1.10.1.bb => rauc_1.11.bb} (63%) diff --git a/recipes-core/rauc/nativesdk-rauc_1.10.1.bb b/recipes-core/rauc/nativesdk-rauc_1.11.bb similarity index 64% rename from recipes-core/rauc/nativesdk-rauc_1.10.1.bb rename to recipes-core/rauc/nativesdk-rauc_1.11.bb index 837dbcb4..038a1c48 100644 --- a/recipes-core/rauc/nativesdk-rauc_1.10.1.bb +++ b/recipes-core/rauc/nativesdk-rauc_1.11.bb @@ -1,3 +1,3 @@ require rauc.inc -require rauc-1.10.1.inc +require rauc-1.11.inc require nativesdk-rauc.inc diff --git a/recipes-core/rauc/rauc-1.10.1.inc b/recipes-core/rauc/rauc-1.11.inc similarity index 63% rename from recipes-core/rauc/rauc-1.10.1.inc rename to recipes-core/rauc/rauc-1.11.inc index 8f376474..8678ccb6 100644 --- a/recipes-core/rauc/rauc-1.10.1.inc +++ b/recipes-core/rauc/rauc-1.11.inc @@ -1,5 +1,5 @@ SRC_URI = "https://github.com/rauc/rauc/releases/download/v${PV}/rauc-${PV}.tar.xz" -SRC_URI[sha256sum] = "aa99164c5f54fd29b5c8456221b51f92c900884af66de3e1b7f15a25b7db98a7" +SRC_URI[sha256sum] = "a28f415c580390dd9e65016a5d90a63ee1cfd7e1b3e864cbb13cb3ac3513391f" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" diff --git a/recipes-core/rauc/rauc-native_1.10.1.bb b/recipes-core/rauc/rauc-native_1.11.bb similarity index 63% rename from recipes-core/rauc/rauc-native_1.10.1.bb rename to recipes-core/rauc/rauc-native_1.11.bb index 5cf4d7b1..71c9f9b5 100644 --- a/recipes-core/rauc/rauc-native_1.10.1.bb +++ b/recipes-core/rauc/rauc-native_1.11.bb @@ -1,3 +1,3 @@ require rauc.inc require rauc-native.inc -require rauc-1.10.1.inc +require rauc-1.11.inc diff --git a/recipes-core/rauc/rauc_1.10.1.bb b/recipes-core/rauc/rauc_1.11.bb similarity index 63% rename from recipes-core/rauc/rauc_1.10.1.bb rename to recipes-core/rauc/rauc_1.11.bb index 1becdfc9..46ee3579 100644 --- a/recipes-core/rauc/rauc_1.10.1.bb +++ b/recipes-core/rauc/rauc_1.11.bb @@ -1,3 +1,3 @@ require rauc.inc require rauc-target.inc -require rauc-1.10.1.inc +require rauc-1.11.inc From d7cbd5d8f908f5d87f199876cce4cc5951a27a8e Mon Sep 17 00:00:00 2001 From: Enrico Jorns Date: Tue, 16 Jan 2024 13:20:49 +0100 Subject: [PATCH 4/5] rauc: update to v1.11.1 Signed-off-by: Enrico Jorns (cherry picked from commit 3a1fbab7d9c9acfac4f4b847ce7f4691209be13b) Signed-off-by: Enrico Jorns --- .../rauc/{nativesdk-rauc_1.11.bb => nativesdk-rauc_1.11.1.bb} | 2 +- recipes-core/rauc/{rauc-1.11.inc => rauc-1.11.1.inc} | 2 +- .../rauc/{rauc-native_1.11.bb => rauc-native_1.11.1.bb} | 2 +- recipes-core/rauc/{rauc_1.11.bb => rauc_1.11.1.bb} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename recipes-core/rauc/{nativesdk-rauc_1.11.bb => nativesdk-rauc_1.11.1.bb} (64%) rename recipes-core/rauc/{rauc-1.11.inc => rauc-1.11.1.inc} (63%) rename recipes-core/rauc/{rauc-native_1.11.bb => rauc-native_1.11.1.bb} (63%) rename recipes-core/rauc/{rauc_1.11.bb => rauc_1.11.1.bb} (63%) diff --git a/recipes-core/rauc/nativesdk-rauc_1.11.bb b/recipes-core/rauc/nativesdk-rauc_1.11.1.bb similarity index 64% rename from recipes-core/rauc/nativesdk-rauc_1.11.bb rename to recipes-core/rauc/nativesdk-rauc_1.11.1.bb index 038a1c48..eb3f1977 100644 --- a/recipes-core/rauc/nativesdk-rauc_1.11.bb +++ b/recipes-core/rauc/nativesdk-rauc_1.11.1.bb @@ -1,3 +1,3 @@ require rauc.inc -require rauc-1.11.inc +require rauc-1.11.1.inc require nativesdk-rauc.inc diff --git a/recipes-core/rauc/rauc-1.11.inc b/recipes-core/rauc/rauc-1.11.1.inc similarity index 63% rename from recipes-core/rauc/rauc-1.11.inc rename to recipes-core/rauc/rauc-1.11.1.inc index 8678ccb6..6be2efca 100644 --- a/recipes-core/rauc/rauc-1.11.inc +++ b/recipes-core/rauc/rauc-1.11.1.inc @@ -1,5 +1,5 @@ SRC_URI = "https://github.com/rauc/rauc/releases/download/v${PV}/rauc-${PV}.tar.xz" -SRC_URI[sha256sum] = "a28f415c580390dd9e65016a5d90a63ee1cfd7e1b3e864cbb13cb3ac3513391f" +SRC_URI[sha256sum] = "391d13d709abb630c459e79e62e474e68224c5d07c816355784bba75a86a2507" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" diff --git a/recipes-core/rauc/rauc-native_1.11.bb b/recipes-core/rauc/rauc-native_1.11.1.bb similarity index 63% rename from recipes-core/rauc/rauc-native_1.11.bb rename to recipes-core/rauc/rauc-native_1.11.1.bb index 71c9f9b5..b9e20dc6 100644 --- a/recipes-core/rauc/rauc-native_1.11.bb +++ b/recipes-core/rauc/rauc-native_1.11.1.bb @@ -1,3 +1,3 @@ require rauc.inc require rauc-native.inc -require rauc-1.11.inc +require rauc-1.11.1.inc diff --git a/recipes-core/rauc/rauc_1.11.bb b/recipes-core/rauc/rauc_1.11.1.bb similarity index 63% rename from recipes-core/rauc/rauc_1.11.bb rename to recipes-core/rauc/rauc_1.11.1.bb index 46ee3579..44c1e878 100644 --- a/recipes-core/rauc/rauc_1.11.bb +++ b/recipes-core/rauc/rauc_1.11.1.bb @@ -1,3 +1,3 @@ require rauc.inc require rauc-target.inc -require rauc-1.11.inc +require rauc-1.11.1.inc From 95b385a76c64b1a24d4e56aa92cffc28dc32aed2 Mon Sep 17 00:00:00 2001 From: Mark Cilissen Date: Wed, 6 Dec 2023 17:39:51 +0100 Subject: [PATCH 5/5] classes-recipe: bundle: use native paths instead of target paths If either ${prefix} is not equal to ${prefix_native}, or ${bindir} is not equal to ${bindir_native}, the recipe will fail. Correct this by using ${prefix_native} and ${STAGING_BINDIR_NATIVE}. Signed-off-by: Mark Cilissen (cherry picked from commit 95bef89a6ff4855f17ab02b494b2a706430a723e) Signed-off-by: Enrico Jorns --- classes/bundle.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/bundle.bbclass b/classes/bundle.bbclass index a918ab55..1dafb37f 100644 --- a/classes/bundle.bbclass +++ b/classes/bundle.bbclass @@ -420,7 +420,7 @@ do_bundle() { bbfatal "'RAUC_CERT_FILE' not set. Please set to a valid certificate file location." fi - ${STAGING_DIR_NATIVE}${bindir}/rauc bundle \ + ${STAGING_BINDIR_NATIVE}/rauc bundle \ --debug \ --cert="${RAUC_CERT_FILE}" \ --key="${RAUC_KEY_FILE}" \ @@ -437,9 +437,9 @@ do_bundle() { # replacement named "pseudo". But casync requires fakeroot to be # installed, thus make a symlink. if ! [ -x "$(command -v fakeroot)" ]; then - ln -sf ${STAGING_DIR_NATIVE}${bindir}/pseudo ${STAGING_DIR_NATIVE}${bindir}/fakeroot + ln -sf ${STAGING_BINDIR_NATIVE}/pseudo ${STAGING_BINDIR_NATIVE}/fakeroot fi - PSEUDO_PREFIX=${STAGING_DIR_NATIVE}/usr PSEUDO_DISABLED=0 ${STAGING_DIR_NATIVE}${bindir}/rauc convert \ + PSEUDO_PREFIX=${STAGING_DIR_NATIVE}/${prefix_native} PSEUDO_DISABLED=0 ${STAGING_BINDIR_NATIVE}/rauc convert \ --debug \ --trust-environment \ --cert=${RAUC_CERT_FILE} \