diff mbox series

[meta-oe,02/23] debootstrap: upgrade 1.0.140 -> 1.0.141

Message ID 1745900138-26424-2-git-send-email-wangmy@fujitsu.com
State Under Review
Headers show
Series [meta-oe,01/23] ctags: upgrade 6.1.20250420.0 -> 6.1.20250427.0 | expand

Commit Message

Mingyu Wang (Fujitsu) April 29, 2025, 4:15 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

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>
---
 .../0002-support-to-override-usr-bin-arch-test.patch     | 9 +++------
 .../0003-do-not-hardcode-the-full-path-of-dpkg.patch     | 9 +++------
 .../{debootstrap_1.0.140.bb => debootstrap_1.0.141.bb}   | 2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)
 rename meta-oe/recipes-devtools/debootstrap/{debootstrap_1.0.140.bb => debootstrap_1.0.141.bb} (89%)
diff mbox series

Patch

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 <hongxu.jia@windriver.com>
 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 <hongxu.jia@windriver.com>
  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 <hongxu.jia@windriver.com>
 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 <hongxu.jia@windriver.com>
  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.141.bb
similarity index 89%
rename from meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.140.bb
rename to 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  = "\
     file://0003-do-not-hardcode-the-full-path-of-dpkg.patch \
 "
 
-SRC_URI[sha256sum] = "c95eb2aeb952b3fd09f4a07859115d40c4d04a8d551b3071b0a10fcd0db7ebc4"
+SRC_URI[sha256sum] = "232ec755f4b1f445f829996885846abba6f1b6fd55d049476ab26ddd8c4b4e1b"
 
 S = "${WORKDIR}/debootstrap"