Package: release.debian.org Severity: normal Tags: bullseye User: release.debian.org@packages.debian.org Usertags: pu X-Debbugs-CC: dimitri.ledkov@canonical.com debian-boot@lists.debian.org debian-wb-team@lists.debian.org Dear release team, An improvement to reduce the number of dependencies pulled down by the usr-merged debootstrapped image has been available in unstable, bookworm and bullseye-backports for a while. I'd like to make this improvement available in bullseye as well, as it saves ~50MB on a minbase image. See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1025657 I have tested this locally and seems to work as expected. Debdiff attached. It also enables usrmerge on hurd. -- Kind regards, Luca Boccassi
diff -Nru debootstrap-1.0.123+deb11u1/debian/changelog debootstrap-1.0.123+deb11u2/debian/changelog
--- debootstrap-1.0.123+deb11u1/debian/changelog 2022-07-28 12:04:03.000000000 +0100
+++ debootstrap-1.0.123+deb11u2/debian/changelog 2022-12-07 15:31:02.000000000 +0000
@@ -1,3 +1,19 @@
+debootstrap (1.0.123+deb11u2) bullseye; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Samuel Thibault ]
+ * Enable usrmerge on hurd-i386 too
+
+ [ Ansgar ]
+ * debootstrap: optionally exclude specific dependencies
+ * debian-common: exclude usrmerge when installing usr-is-merged
+
+ [ Tianon Gravi ]
+ * Apply "EXCLUDE_DEPENDENCY" during "resolve_deps" (Closes: #1025657)
+
+ -- Luca Boccassi <bluca@debian.org> Wed, 07 Dec 2022 15:31:02 +0000
+
debootstrap (1.0.123+deb11u1) bullseye; urgency=medium
* Non-maintainer upload.
diff -Nru debootstrap-1.0.123+deb11u1/debootstrap debootstrap-1.0.123+deb11u2/debootstrap
--- debootstrap-1.0.123+deb11u1/debootstrap 2022-07-28 11:55:11.000000000 +0100
+++ debootstrap-1.0.123+deb11u2/debootstrap 2022-12-07 15:30:03.000000000 +0000
@@ -41,6 +41,7 @@
UNPACK_TARBALL=""
ADDITIONAL=""
EXCLUDE=""
+EXCLUDE_DEPENDENCY=""
VERBOSE=""
CERTIFICATE=""
CHECKCERTIF=""
diff -Nru debootstrap-1.0.123+deb11u1/functions debootstrap-1.0.123+deb11u2/functions
--- debootstrap-1.0.123+deb11u1/functions 2022-07-28 11:55:40.000000000 +0100
+++ debootstrap-1.0.123+deb11u2/functions 2022-12-07 15:30:03.000000000 +0000
@@ -1361,7 +1361,6 @@
local link_dir
case $ARCH in
- hurd-*) return 0 ;;
amd64) link_dir="lib32 lib64 libx32" ;;
i386) link_dir="lib64 libx32" ;;
mips|mipsel)
@@ -1555,6 +1554,9 @@
NEWPKGS="$NEWPKGS $("$PKGDETAILS" GETDEPS "$pkgdest" $PKGS)"
done
done
+ if [ -n "${EXCLUDE_DEPENDENCY:-}" ]; then
+ NEWPKGS="$(without "$NEWPKGS" "$EXCLUDE_DEPENDENCY")"
+ fi
PKGS=$(echo "$PKGS $NEWPKGS" | tr ' ' '\n' | sort | uniq)
local REALPKGS=""
for s in $SUITE $EXTRA_SUITES; do
diff -Nru debootstrap-1.0.123+deb11u1/scripts/debian-common debootstrap-1.0.123+deb11u2/scripts/debian-common
--- debootstrap-1.0.123+deb11u1/scripts/debian-common 2022-07-28 11:55:40.000000000 +0100
+++ debootstrap-1.0.123+deb11u2/scripts/debian-common 2022-12-07 15:30:03.000000000 +0000
@@ -52,6 +52,7 @@
;;
*)
required="$required usr-is-merged"
+ EXCLUDE_DEPENDENCY="$EXCLUDE_DEPENDENCY usrmerge"
;;
esac
}
Attachment:
signature.asc
Description: This is a digitally signed message part