From 77b5f1a09694b15aa5c729f078d50a5c4c0a78b2 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Sun, 15 Sep 2024 20:51:53 +0800 Subject: debootstrap: upgrade 1.0.132 -> 1.0.137 ChangeLog: https://salsa.debian.org/installer-team/debootstrap/-/blob/1.0.137/debian/changelog Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- ...001-do-not-hardcode-the-full-path-of-dpkg.patch | 33 ---------------------- ...upport-to-override-usr-sbin-and-usr-share.patch | 18 ++++++------ ...002-support-to-override-usr-bin-arch-test.patch | 12 ++++---- ...003-do-not-hardcode-the-full-path-of-dpkg.patch | 33 ++++++++++++++++++++++ .../debootstrap/debootstrap_1.0.132.bb | 27 ------------------ .../debootstrap/debootstrap_1.0.137.bb | 27 ++++++++++++++++++ 6 files changed, 74 insertions(+), 76 deletions(-) delete mode 100644 meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch create mode 100644 meta-oe/recipes-devtools/debootstrap/debootstrap/0003-do-not-hardcode-the-full-path-of-dpkg.patch delete mode 100644 meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.132.bb create mode 100644 meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.137.bb diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch b/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch deleted file mode 100644 index 2a5f233165..0000000000 --- a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e735fb23f46f0c3c7a1144ba6b4050bfc0015a05 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 - -While calling debootstrap in sdk, if host does not install dpkg package, -the full path calling will fail - -Do not hardcode the full path of dpkg, then then sdk's dpkg will be used. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Hongxu Jia ---- - debootstrap | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/debootstrap b/debootstrap -index a3cf3af..5e96c3e 100755 ---- a/debootstrap -+++ b/debootstrap -@@ -538,7 +538,7 @@ fi - - if in_path dpkg && \ - dpkg --print-architecture >/dev/null 2>&1; then -- HOST_ARCH=$(/usr/bin/dpkg --print-architecture) -+ HOST_ARCH=$(dpkg --print-architecture) - elif in_path udpkg && \ - udpkg --print-architecture >/dev/null 2>&1; then - HOST_ARCH=$(/usr/bin/udpkg --print-architecture) --- -2.27.0 - diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch b/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch index 12dd238108..faa66e0268 100644 --- a/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch +++ b/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch @@ -1,20 +1,20 @@ -From 87d0174e8d56e7458dc94f05f82ab7a67a5cf7d0 Mon Sep 17 00:00:00 2001 +From 6c8b0a3f9c09a7a135d95ff18038bcba22e87b86 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Thu, 8 Apr 2021 14:06:05 +0800 -Subject: [PATCH 1/2] support to override /usr/sbin and /usr/share +Subject: [PATCH] support to override /usr/sbin and /usr/share Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55] Signed-off-by: Hongxu Jia --- - Makefile | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) + Makefile | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index 8516803..a2d8c00 100644 +index 21a9a39..649f465 100644 --- a/Makefile +++ b/Makefile -@@ -5,14 +5,16 @@ all: +@@ -5,13 +5,15 @@ all: clean: @@ -28,14 +28,12 @@ index 8516803..a2d8c00 100644 + mkdir -p $(DESTDIR)$(sbindir) cp -a scripts/* $(DSDIR)/scripts/ - install -o root -g root -m 0644 functions $(DSDIR)/ + install -m 0644 functions $(DSDIR)/ - sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap -- chown root:root $(DESTDIR)/usr/sbin/debootstrap - chmod 0755 $(DESTDIR)/usr/sbin/debootstrap + sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)$(sbindir)/debootstrap -+ chown root:root $(DESTDIR)$(sbindir)/debootstrap + chmod 0755 $(DESTDIR)$(sbindir)/debootstrap -- -2.17.1 +2.25.1 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 69329df4ea..5de65779d4 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,7 +1,7 @@ -From f0420b201f2fb5286ccf5657faa6b38cd2680e10 Mon Sep 17 00:00:00 2001 +From 3fee46c7e50f432fbd5c97c60b918d71c91f1adc Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Thu, 8 Apr 2021 14:08:06 +0800 -Subject: [PATCH 2/2] support to override /usr/bin/arch-test +Subject: [PATCH] support to override /usr/bin/arch-test Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55] @@ -11,12 +11,12 @@ Signed-off-by: Hongxu Jia 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/debootstrap b/debootstrap -index 9b9e58d..a3cf3af 100755 +index 552c8d6..11a9465 100755 --- a/debootstrap +++ b/debootstrap @@ -51,6 +51,10 @@ INRELEASE_PATH="" + DEF_MIRROR="http://deb.debian.org/debian" - DEF_HTTPS_MIRROR="https://deb.debian.org/debian" +if [ -z "$ARCH_TEST" ]; then + ARCH_TEST="/usr/bin/arch-test" @@ -25,7 +25,7 @@ index 9b9e58d..a3cf3af 100755 # set $CONTAINER detect_container -@@ -645,12 +649,12 @@ fi +@@ -661,12 +665,12 @@ fi ########################################################################### @@ -43,5 +43,5 @@ index 9b9e58d..a3cf3af 100755 ret=3 fi -- -2.17.1 +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 new file mode 100644 index 0000000000..5cd1ce88af --- /dev/null +++ b/meta-oe/recipes-devtools/debootstrap/debootstrap/0003-do-not-hardcode-the-full-path-of-dpkg.patch @@ -0,0 +1,33 @@ +From e92554e57b4aae242cb0416025883ccc2c539d2a 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 + +While calling debootstrap in sdk, if host does not install dpkg package, +the full path calling will fail + +Do not hardcode the full path of dpkg, then then sdk's dpkg will be used. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia +--- + debootstrap | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/debootstrap b/debootstrap +index 11a9465..17ab05a 100755 +--- a/debootstrap ++++ b/debootstrap +@@ -551,7 +551,7 @@ fi + + if in_path dpkg && \ + dpkg --print-architecture >/dev/null 2>&1; then +- HOST_ARCH=$(/usr/bin/dpkg --print-architecture) ++ HOST_ARCH=$(dpkg --print-architecture) + 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.132.bb b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.132.bb deleted file mode 100644 index c28a51749c..0000000000 --- a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.132.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=1e68ced6e1689d4cd9dac75ff5225608" - -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://0001-do-not-hardcode-the-full-path-of-dpkg.patch \ -" - -SRC_URI[sha256sum] = "d963a465314ac0e8fd5392573def042e6663e8edf3d08ace4bbd0d27ee8431f7" - -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.137.bb b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.137.bb new file mode 100644 index 0000000000..d4783b3549 --- /dev/null +++ b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.137.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] = "666927457ee4b0b3e68e55a0efbf3fb69189610b7abbd534017d7032cb3ae833" + +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