From 946d7dc680df9595c9daed2dc61a92ab1e95c128 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 29 Apr 2025 12:15:17 +0800 Subject: debootstrap: upgrade 1.0.140 -> 1.0.141 0002-support-to-override-usr-bin-arch-test.patch 0003-do-not-hardcode-the-full-path-of-dpkg.patch refreshed for 1.0.141 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...002-support-to-override-usr-bin-arch-test.patch | 9 +++----- ...003-do-not-hardcode-the-full-path-of-dpkg.patch | 9 +++----- .../debootstrap/debootstrap_1.0.140.bb | 27 ---------------------- .../debootstrap/debootstrap_1.0.141.bb | 27 ++++++++++++++++++++++ 4 files changed, 33 insertions(+), 39 deletions(-) delete mode 100644 meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.140.bb create mode 100644 meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.141.bb (limited to 'meta-oe/recipes-devtools/debootstrap') diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch b/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch index 5de65779d4..daec80f614 100644 --- a/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch +++ b/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch @@ -1,4 +1,4 @@ -From 3fee46c7e50f432fbd5c97c60b918d71c91f1adc Mon Sep 17 00:00:00 2001 +From b7a476cbcd507c03094811690d5497a7e9e15afc Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Thu, 8 Apr 2021 14:08:06 +0800 Subject: [PATCH] support to override /usr/bin/arch-test @@ -11,7 +11,7 @@ Signed-off-by: Hongxu Jia 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/debootstrap b/debootstrap -index 552c8d6..11a9465 100755 +index 43a7383..0cce33e 100755 --- a/debootstrap +++ b/debootstrap @@ -51,6 +51,10 @@ INRELEASE_PATH="" @@ -25,7 +25,7 @@ index 552c8d6..11a9465 100755 # set $CONTAINER detect_container -@@ -661,12 +665,12 @@ fi +@@ -666,12 +670,12 @@ fi ########################################################################### @@ -42,6 +42,3 @@ index 552c8d6..11a9465 100755 else ret=3 fi --- -2.25.1 - diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap/0003-do-not-hardcode-the-full-path-of-dpkg.patch b/meta-oe/recipes-devtools/debootstrap/debootstrap/0003-do-not-hardcode-the-full-path-of-dpkg.patch index 5cd1ce88af..0c1a7a65a8 100644 --- a/meta-oe/recipes-devtools/debootstrap/debootstrap/0003-do-not-hardcode-the-full-path-of-dpkg.patch +++ b/meta-oe/recipes-devtools/debootstrap/debootstrap/0003-do-not-hardcode-the-full-path-of-dpkg.patch @@ -1,4 +1,4 @@ -From e92554e57b4aae242cb0416025883ccc2c539d2a Mon Sep 17 00:00:00 2001 +From 33c4bc9540d6d9aee6d885b89d530130d50b8052 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 2 Jun 2021 13:34:35 +0800 Subject: [PATCH] do not hardcode the full path of dpkg @@ -16,10 +16,10 @@ Signed-off-by: Hongxu Jia 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debootstrap b/debootstrap -index 11a9465..17ab05a 100755 +index 0cce33e..7586c58 100755 --- a/debootstrap +++ b/debootstrap -@@ -551,7 +551,7 @@ fi +@@ -553,7 +553,7 @@ fi if in_path dpkg && \ dpkg --print-architecture >/dev/null 2>&1; then @@ -28,6 +28,3 @@ index 11a9465..17ab05a 100755 elif in_path udpkg && \ udpkg --print-architecture >/dev/null 2>&1; then HOST_ARCH=$(/usr/bin/udpkg --print-architecture) --- -2.25.1 - diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.140.bb b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.140.bb deleted file mode 100644 index 468a6c13b6..0000000000 --- a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.140.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Install a Debian system into a subdirectory" -HOMEPAGE = "https://wiki.debian.org/Debootstrap" -SECTION = "devel" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=e7b45429ef05610abf91ac199fdb3a6e" - -SRC_URI = "\ - ${DEBIAN_MIRROR}/main/d/debootstrap/debootstrap_${PV}.tar.gz \ - file://0001-support-to-override-usr-sbin-and-usr-share.patch \ - file://0002-support-to-override-usr-bin-arch-test.patch \ - file://0003-do-not-hardcode-the-full-path-of-dpkg.patch \ -" - -SRC_URI[sha256sum] = "c95eb2aeb952b3fd09f4a07859115d40c4d04a8d551b3071b0a10fcd0db7ebc4" - -S = "${WORKDIR}/debootstrap" - -DEPENDS = " \ - virtual/fakeroot-native \ -" - -fakeroot do_install() { - oe_runmake 'DESTDIR=${D}' install - chown -R root:root ${D}${datadir}/debootstrap -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.141.bb b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.141.bb new file mode 100644 index 0000000000..5fa71896b2 --- /dev/null +++ b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.141.bb @@ -0,0 +1,27 @@ +SUMMARY = "Install a Debian system into a subdirectory" +HOMEPAGE = "https://wiki.debian.org/Debootstrap" +SECTION = "devel" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=e7b45429ef05610abf91ac199fdb3a6e" + +SRC_URI = "\ + ${DEBIAN_MIRROR}/main/d/debootstrap/debootstrap_${PV}.tar.gz \ + file://0001-support-to-override-usr-sbin-and-usr-share.patch \ + file://0002-support-to-override-usr-bin-arch-test.patch \ + file://0003-do-not-hardcode-the-full-path-of-dpkg.patch \ +" + +SRC_URI[sha256sum] = "232ec755f4b1f445f829996885846abba6f1b6fd55d049476ab26ddd8c4b4e1b" + +S = "${WORKDIR}/debootstrap" + +DEPENDS = " \ + virtual/fakeroot-native \ +" + +fakeroot do_install() { + oe_runmake 'DESTDIR=${D}' install + chown -R root:root ${D}${datadir}/debootstrap +} + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf