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 faa66e0268..e3ab345634 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,4 +1,4 @@ -From 6c8b0a3f9c09a7a135d95ff18038bcba22e87b86 Mon Sep 17 00:00:00 2001 +From 077f72feece0736243f6a2f9aff169b00dbb685d Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Thu, 8 Apr 2021 14:06:05 +0800 Subject: [PATCH] support to override /usr/sbin and /usr/share @@ -34,6 +34,3 @@ index 21a9a39..649f465 100644 - chmod 0755 $(DESTDIR)/usr/sbin/debootstrap + sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)$(sbindir)/debootstrap + chmod 0755 $(DESTDIR)$(sbindir)/debootstrap --- -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 daec80f614..a4b68997c5 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 b7a476cbcd507c03094811690d5497a7e9e15afc Mon Sep 17 00:00:00 2001 +From 7dd1762bbb80941a134b7be88c3104faeb6829c8 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,10 +11,10 @@ Signed-off-by: Hongxu Jia 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/debootstrap b/debootstrap -index 43a7383..0cce33e 100755 +index 76f493a..20d465d 100755 --- a/debootstrap +++ b/debootstrap -@@ -51,6 +51,10 @@ INRELEASE_PATH="" +@@ -52,6 +52,10 @@ INRELEASE_PATH="" DEF_MIRROR="http://deb.debian.org/debian" @@ -25,7 +25,7 @@ index 43a7383..0cce33e 100755 # set $CONTAINER detect_container -@@ -666,12 +670,12 @@ fi +@@ -679,12 +683,12 @@ fi ########################################################################### 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 0c1a7a65a8..b782e08cc6 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 33c4bc9540d6d9aee6d885b89d530130d50b8052 Mon Sep 17 00:00:00 2001 +From ca470a0b0c18a6a3f728c2e5f6cce986d9d28803 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 0cce33e..7586c58 100755 +index 20d465d..a02b28c 100755 --- a/debootstrap +++ b/debootstrap -@@ -553,7 +553,7 @@ fi +@@ -566,7 +566,7 @@ fi if in_path dpkg && \ dpkg --print-architecture >/dev/null 2>&1; then diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.144.bb b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.145.bb similarity index 89% rename from meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.144.bb rename to meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.145.bb index 543d7405a4..2dce7c2450 100644 --- a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.144.bb +++ b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.145.bb @@ -11,7 +11,7 @@ SRC_URI = "\ file://0003-do-not-hardcode-the-full-path-of-dpkg.patch \ " -SRC_URI[sha256sum] = "3e1bafd4bb813cf4d6c17a0adca449ca07603263a8ea40a67257d2d60c186f9a" +SRC_URI[sha256sum] = "7cc8f9e386ed8dfd4b062a3b9527f0f45176dfa1b065e7db270f837956516b20" S = "${UNPACKDIR}/debootstrap"