mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

debootstrap: upgrade 1.0.132 -> 1.0.137

Browse Source 
ChangeLog:
https://salsa.debian.org/installer-team/debootstrap/-/blob/1.0.137/debian/changelog

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao
2024-09-15 20:51:53 +08:00
committed by Khem Raj
parent f556659ec3
commit 77b5f1a096
4 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch
+8 -10
View File
@@ -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 <hongxu.jia@windriver.com> From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Thu, 8 Apr 2021 14:06:05 +0800 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] Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
--- ---
Makefile | 12 +++++++----- Makefile | 10 ++++++----
1 file changed, 7 insertions(+), 5 deletions(-) 1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 8516803..a2d8c00 100644 index 21a9a39..649f465 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -5,14 +5,16 @@ all: @@ -5,13 +5,15 @@ all:
clean: clean:
@@ -28,14 +28,12 @@ index 8516803..a2d8c00 100644
+ mkdir -p $(DESTDIR)$(sbindir) + mkdir -p $(DESTDIR)$(sbindir)
cp -a scripts/* $(DSDIR)/scripts/ 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 - sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap
- chown root:root $(DESTDIR)/usr/sbin/debootstrap
- chmod 0755 $(DESTDIR)/usr/sbin/debootstrap - chmod 0755 $(DESTDIR)/usr/sbin/debootstrap
+ sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)$(sbindir)/debootstrap + sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)$(sbindir)/debootstrap
+ chown root:root $(DESTDIR)$(sbindir)/debootstrap
+ chmod 0755 $(DESTDIR)$(sbindir)/debootstrap + chmod 0755 $(DESTDIR)$(sbindir)/debootstrap
-- --
2.17.1 2.25.1
meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch
+6 -6
View File
@@ -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 <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 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] Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55]
@@ -11,12 +11,12 @@ 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 9b9e58d..a3cf3af 100755 index 552c8d6..11a9465 100755
--- a/debootstrap --- a/debootstrap
+++ b/debootstrap +++ b/debootstrap
@@ -51,6 +51,10 @@ INRELEASE_PATH="" @@ -51,6 +51,10 @@ INRELEASE_PATH=""
DEF_MIRROR="http://deb.debian.org/debian" DEF_MIRROR="http://deb.debian.org/debian"
DEF_HTTPS_MIRROR="https://deb.debian.org/debian"
+if [ -z "$ARCH_TEST" ]; then +if [ -z "$ARCH_TEST" ]; then
+ ARCH_TEST="/usr/bin/arch-test" + ARCH_TEST="/usr/bin/arch-test"
@@ -25,7 +25,7 @@ index 9b9e58d..a3cf3af 100755
# set $CONTAINER # set $CONTAINER
detect_container detect_container
@@ -645,12 +649,12 @@ fi @@ -661,12 +665,12 @@ fi
########################################################################### ###########################################################################
@@ -43,5 +43,5 @@ index 9b9e58d..a3cf3af 100755
ret=3 ret=3
fi fi
-- --
2.17.1 2.25.1
meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch → meta-oe/recipes-devtools/debootstrap/debootstrap/0003-do-not-hardcode-the-full-path-of-dpkg.patch
+4 -4
View File
@@ -1,4 +1,4 @@
From e735fb23f46f0c3c7a1144ba6b4050bfc0015a05 Mon Sep 17 00:00:00 2001 From e92554e57b4aae242cb0416025883ccc2c539d2a 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 a3cf3af..5e96c3e 100755 index 11a9465..17ab05a 100755
--- a/debootstrap --- a/debootstrap
+++ b/debootstrap +++ b/debootstrap
@@ -538,7 +538,7 @@ fi @@ -551,7 +551,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
@@ -29,5 +29,5 @@ index a3cf3af..5e96c3e 100755
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.27.0 2.25.1
meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.132.bb → meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.137.bb
+3 -3
View File
@@ -2,16 +2,16 @@ SUMMARY = "Install a Debian system into a subdirectory"
HOMEPAGE = "https://wiki.debian.org/Debootstrap" HOMEPAGE = "https://wiki.debian.org/Debootstrap"
SECTION = "devel" SECTION = "devel"
LICENSE = "MIT" LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://debian/copyright;md5=1e68ced6e1689d4cd9dac75ff5225608" LIC_FILES_CHKSUM = "file://debian/copyright;md5=e7b45429ef05610abf91ac199fdb3a6e"
SRC_URI = "\ SRC_URI = "\
${DEBIAN_MIRROR}/main/d/debootstrap/debootstrap_${PV}.tar.gz \ ${DEBIAN_MIRROR}/main/d/debootstrap/debootstrap_${PV}.tar.gz \
file://0001-support-to-override-usr-sbin-and-usr-share.patch \ file://0001-support-to-override-usr-sbin-and-usr-share.patch \
file://0002-support-to-override-usr-bin-arch-test.patch \ file://0002-support-to-override-usr-bin-arch-test.patch \
file://0001-do-not-hardcode-the-full-path-of-dpkg.patch \ file://0003-do-not-hardcode-the-full-path-of-dpkg.patch \
" "
SRC_URI[sha256sum] = "d963a465314ac0e8fd5392573def042e6663e8edf3d08ace4bbd0d27ee8431f7" SRC_URI[sha256sum] = "666927457ee4b0b3e68e55a0efbf3fb69189610b7abbd534017d7032cb3ae833"
S = "${WORKDIR}/debootstrap" S = "${WORKDIR}/debootstrap"