summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch9
-rw-r--r--meta-oe/recipes-devtools/debootstrap/debootstrap/0003-do-not-hardcode-the-full-path-of-dpkg.patch9
-rw-r--r--meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.141.bb (renamed from meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.140.bb)2
3 files changed, 7 insertions, 13 deletions
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 @@
1From 3fee46c7e50f432fbd5c97c60b918d71c91f1adc Mon Sep 17 00:00:00 2001 1From b7a476cbcd507c03094811690d5497a7e9e15afc Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 8 Apr 2021 14:08:06 +0800 3Date: Thu, 8 Apr 2021 14:08:06 +0800
4Subject: [PATCH] support to override /usr/bin/arch-test 4Subject: [PATCH] support to override /usr/bin/arch-test
@@ -11,7 +11,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11 1 file changed, 8 insertions(+), 4 deletions(-) 11 1 file changed, 8 insertions(+), 4 deletions(-)
12 12
13diff --git a/debootstrap b/debootstrap 13diff --git a/debootstrap b/debootstrap
14index 552c8d6..11a9465 100755 14index 43a7383..0cce33e 100755
15--- a/debootstrap 15--- a/debootstrap
16+++ b/debootstrap 16+++ b/debootstrap
17@@ -51,6 +51,10 @@ INRELEASE_PATH="" 17@@ -51,6 +51,10 @@ INRELEASE_PATH=""
@@ -25,7 +25,7 @@ index 552c8d6..11a9465 100755
25 # set $CONTAINER 25 # set $CONTAINER
26 detect_container 26 detect_container
27 27
28@@ -661,12 +665,12 @@ fi 28@@ -666,12 +670,12 @@ fi
29 29
30 ########################################################################### 30 ###########################################################################
31 31
@@ -42,6 +42,3 @@ index 552c8d6..11a9465 100755
42 else 42 else
43 ret=3 43 ret=3
44 fi 44 fi
45--
462.25.1
47
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 @@
1From e92554e57b4aae242cb0416025883ccc2c539d2a Mon Sep 17 00:00:00 2001 1From 33c4bc9540d6d9aee6d885b89d530130d50b8052 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 2 Jun 2021 13:34:35 +0800 3Date: Wed, 2 Jun 2021 13:34:35 +0800
4Subject: [PATCH] do not hardcode the full path of dpkg 4Subject: [PATCH] do not hardcode the full path of dpkg
@@ -16,10 +16,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
16 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
17 17
18diff --git a/debootstrap b/debootstrap 18diff --git a/debootstrap b/debootstrap
19index 11a9465..17ab05a 100755 19index 0cce33e..7586c58 100755
20--- a/debootstrap 20--- a/debootstrap
21+++ b/debootstrap 21+++ b/debootstrap
22@@ -551,7 +551,7 @@ fi 22@@ -553,7 +553,7 @@ fi
23 23
24 if in_path dpkg && \ 24 if in_path dpkg && \
25 dpkg --print-architecture >/dev/null 2>&1; then 25 dpkg --print-architecture >/dev/null 2>&1; then
@@ -28,6 +28,3 @@ index 11a9465..17ab05a 100755
28 elif in_path udpkg && \ 28 elif in_path udpkg && \
29 udpkg --print-architecture >/dev/null 2>&1; then 29 udpkg --print-architecture >/dev/null 2>&1; then
30 HOST_ARCH=$(/usr/bin/udpkg --print-architecture) 30 HOST_ARCH=$(/usr/bin/udpkg --print-architecture)
31--
322.25.1
33
diff --git a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.140.bb b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.141.bb
index 468a6c13b6..5fa71896b2 100644
--- a/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.140.bb
+++ b/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.141.bb
@@ -11,7 +11,7 @@ SRC_URI = "\
11 file://0003-do-not-hardcode-the-full-path-of-dpkg.patch \ 11 file://0003-do-not-hardcode-the-full-path-of-dpkg.patch \
12" 12"
13 13
14SRC_URI[sha256sum] = "c95eb2aeb952b3fd09f4a07859115d40c4d04a8d551b3071b0a10fcd0db7ebc4" 14SRC_URI[sha256sum] = "232ec755f4b1f445f829996885846abba6f1b6fd55d049476ab26ddd8c4b4e1b"
15 15
16S = "${WORKDIR}/debootstrap" 16S = "${WORKDIR}/debootstrap"
17 17