mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 07:57:27 +00:00
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 <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+3
-6
@@ -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 <hongxu.jia@windriver.com>
|
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
Date: Thu, 8 Apr 2021 14:08:06 +0800
|
Date: Thu, 8 Apr 2021 14:08:06 +0800
|
||||||
Subject: [PATCH] support to override /usr/bin/arch-test
|
Subject: [PATCH] support to override /usr/bin/arch-test
|
||||||
@@ -11,7 +11,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|||||||
1 file changed, 8 insertions(+), 4 deletions(-)
|
1 file changed, 8 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/debootstrap b/debootstrap
|
diff --git a/debootstrap b/debootstrap
|
||||||
index 552c8d6..11a9465 100755
|
index 43a7383..0cce33e 100755
|
||||||
--- a/debootstrap
|
--- a/debootstrap
|
||||||
+++ b/debootstrap
|
+++ b/debootstrap
|
||||||
@@ -51,6 +51,10 @@ INRELEASE_PATH=""
|
@@ -51,6 +51,10 @@ INRELEASE_PATH=""
|
||||||
@@ -25,7 +25,7 @@ index 552c8d6..11a9465 100755
|
|||||||
# set $CONTAINER
|
# set $CONTAINER
|
||||||
detect_container
|
detect_container
|
||||||
|
|
||||||
@@ -661,12 +665,12 @@ fi
|
@@ -666,12 +670,12 @@ fi
|
||||||
|
|
||||||
###########################################################################
|
###########################################################################
|
||||||
|
|
||||||
@@ -42,6 +42,3 @@ index 552c8d6..11a9465 100755
|
|||||||
else
|
else
|
||||||
ret=3
|
ret=3
|
||||||
fi
|
fi
|
||||||
--
|
|
||||||
2.25.1
|
|
||||||
|
|
||||||
|
|||||||
+3
-6
@@ -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 <hongxu.jia@windriver.com>
|
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
Date: Wed, 2 Jun 2021 13:34:35 +0800
|
Date: Wed, 2 Jun 2021 13:34:35 +0800
|
||||||
Subject: [PATCH] do not hardcode the full path of dpkg
|
Subject: [PATCH] do not hardcode the full path of dpkg
|
||||||
@@ -16,10 +16,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/debootstrap b/debootstrap
|
diff --git a/debootstrap b/debootstrap
|
||||||
index 11a9465..17ab05a 100755
|
index 0cce33e..7586c58 100755
|
||||||
--- a/debootstrap
|
--- a/debootstrap
|
||||||
+++ b/debootstrap
|
+++ b/debootstrap
|
||||||
@@ -551,7 +551,7 @@ fi
|
@@ -553,7 +553,7 @@ fi
|
||||||
|
|
||||||
if in_path dpkg && \
|
if in_path dpkg && \
|
||||||
dpkg --print-architecture >/dev/null 2>&1; then
|
dpkg --print-architecture >/dev/null 2>&1; then
|
||||||
@@ -28,6 +28,3 @@ index 11a9465..17ab05a 100755
|
|||||||
elif in_path udpkg && \
|
elif in_path udpkg && \
|
||||||
udpkg --print-architecture >/dev/null 2>&1; then
|
udpkg --print-architecture >/dev/null 2>&1; then
|
||||||
HOST_ARCH=$(/usr/bin/udpkg --print-architecture)
|
HOST_ARCH=$(/usr/bin/udpkg --print-architecture)
|
||||||
--
|
|
||||||
2.25.1
|
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -11,7 +11,7 @@ SRC_URI = "\
|
|||||||
file://0003-do-not-hardcode-the-full-path-of-dpkg.patch \
|
file://0003-do-not-hardcode-the-full-path-of-dpkg.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[sha256sum] = "c95eb2aeb952b3fd09f4a07859115d40c4d04a8d551b3071b0a10fcd0db7ebc4"
|
SRC_URI[sha256sum] = "232ec755f4b1f445f829996885846abba6f1b6fd55d049476ab26ddd8c4b4e1b"
|
||||||
|
|
||||||
S = "${WORKDIR}/debootstrap"
|
S = "${WORKDIR}/debootstrap"
|
||||||
|
|
||||||
Reference in New Issue
Block a user