From c4ffd761e24d64db98cc03e2f91a12f76ba1fae8 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Wed, 14 Sep 2016 01:03:00 +0200 Subject: Add jessie-kfreebsd to merged-/usr blacklist Just as jessie, jessie-kfreebsd doesn't support merged-/usr well enough. --- scripts/sid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sid b/scripts/sid index ceedd66..b359d3b 100644 --- a/scripts/sid +++ b/scripts/sid @@ -42,7 +42,7 @@ work_out_debs () { first_stage_install () { case "$CODENAME" in - etch|etch-m68k|jessie|lenny|squeeze|wheezy) ;; + etch|etch-m68k|jessie|jessie-kfreebsd|lenny|squeeze|wheezy) ;; *) setup_merged_usr ;; esac -- cgit v0.12 From 3515ddefb6dec485d846fc17cbd7fe6bf4772bb5 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Wed, 14 Sep 2016 10:54:48 +0200 Subject: No longer Build-Depend on makedev The code using makedev to create devices.tar.gz was removed in 26ae52971b21e14c6c81af3b8aa0211bc3553dd2 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 6f9fbb8..23371e9 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: extra Maintainer: Debian Install System Team Uploaders: Junichi Uekawa , Colin Watson , Christian Perrier , Steve McIntyre <93sam@debian.org> -Build-Depends: debhelper (>= 9), makedev (>= 2.3.1-69) [linux-any] +Build-Depends: debhelper (>= 9) Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/d-i/debootstrap.git Vcs-Git: https://anonscm.debian.org/git/d-i/debootstrap.git -- cgit v0.12 From 250f851411743ccedb0fccde80c97680c5083ee5 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Wed, 14 Sep 2016 10:56:13 +0200 Subject: TODO: Remove comment about makedev --- TODO | 2 -- 1 file changed, 2 deletions(-) diff --git a/TODO b/TODO index e5fde0e..3a86214 100644 --- a/TODO +++ b/TODO @@ -7,5 +7,3 @@ Features: -- versus command line -- support for sources (vs mirrors) -- faux-pinning for packages - - ++ makedev in second stage -- cgit v0.12 From 51a5fa009aaa4f9703b770bff9b613b06597cfeb Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Tue, 20 Sep 2016 23:48:07 +0200 Subject: Remove empty .gitignore. --- .gitignore | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 8b13789..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ - -- cgit v0.12 From 316b677defc78f8e4410d047bc1e1a314abcd666 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Tue, 20 Sep 2016 23:52:31 +0200 Subject: Only use `tar -k` for new releases In old releases, notably in Debian 6 (Squeeze), multiple packages ship the same files using diversions (e.g. bash/dash). As debootstrap naively extracts packages without implementing diversions itself, it relies on tar replacing the files without an error. Ideally we could use `tar --keep-directory-symlink`, but this is likely not portable enough. So continue to use `tar -k`, but only for future releases. Note that this requires no file conflicts among packages debootstrap installs (which is a good idea anyway as they might be extracted in the wrong order). Bug: https://bugs.debian.org/838388 --- functions | 5 +++-- scripts/sid | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/functions b/functions index d2e3d21..bc5401e 100644 --- a/functions +++ b/functions @@ -819,6 +819,7 @@ get_debs () { ################################################################ extraction EXTRACTORS_SUPPORTED="dpkg-deb ar" +EXTRACT_DEB_TAR_OPTIONS= # Native dpkg-deb based extractors extract_dpkg_deb_field () { @@ -831,7 +832,7 @@ extract_dpkg_deb_field () { extract_dpkg_deb_data () { local pkg="$1" - dpkg-deb --fsys-tarfile "$pkg" | tar -kxf - + dpkg-deb --fsys-tarfile "$pkg" | tar $EXTRACT_DEB_TAR_OPTIONS -xf - } # Raw .deb extractors @@ -869,7 +870,7 @@ extract_ar_deb_data () { esac if type $cat_cmd >/dev/null 2>&1; then - ar -p "$pkg" "$tarball" | $cat_cmd | tar -kxf - + ar -p "$pkg" "$tarball" | $cat_cmd | tar $EXTRACT_DEB_TAR_OPTIONS -xf - else error 1 UNPACKCMDUNVL "Extracting %s requires the %s command, which is not available" "$pkg" "$cat_cmd" fi diff --git a/scripts/sid b/scripts/sid index b359d3b..511cebf 100644 --- a/scripts/sid +++ b/scripts/sid @@ -43,7 +43,10 @@ work_out_debs () { first_stage_install () { case "$CODENAME" in etch|etch-m68k|jessie|jessie-kfreebsd|lenny|squeeze|wheezy) ;; - *) setup_merged_usr ;; + *) + EXTRACT_DEB_TAR_OPTIONS="$EXTRACT_DEB_TAR_OPTIONS -k" + setup_merged_usr + ;; esac extract $required -- cgit v0.12 From 5506572aee213656d58aa560396a72c741f8951f Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Wed, 21 Sep 2016 01:06:06 +0200 Subject: Error out when seeing short options Bug: https://bugs.debian.org/548880 --- debootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debootstrap b/debootstrap index 084a541..7875c5b 100755 --- a/debootstrap +++ b/debootstrap @@ -360,7 +360,7 @@ if [ $# != 0 ] ; then CHECKCERTIF="--no-check-certificate" shift ;; - --*) + -*) error 1 BADARG "unrecognized or invalid option %s" "$1" ;; *) -- cgit v0.12 From 5443d252cff0145823ee137af2b6370914dcfb2e Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Fri, 23 Sep 2016 19:16:54 +0200 Subject: Add symlink for oldoldstable. --- scripts/oldoldstable | 1 + 1 file changed, 1 insertion(+) create mode 120000 scripts/oldoldstable diff --git a/scripts/oldoldstable b/scripts/oldoldstable new file mode 120000 index 0000000..9a63c96 --- /dev/null +++ b/scripts/oldoldstable @@ -0,0 +1 @@ +sid \ No newline at end of file -- cgit v0.12 From a7ce138de967cbc9b9461bec2123f5c75068ecce Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Fri, 23 Sep 2016 19:21:58 +0200 Subject: Remove trailing whitespace. --- README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 47fdec6..1e9402a 100644 --- a/README +++ b/README @@ -10,7 +10,7 @@ You can run debootstrap from its source tree without installing it. This can be useful if you want a quick way to make a Debian chroot on another system, or if you are testing modifications to debootstrap. -First, get the source. +First, get the source. * Either by using git git clone https://anonscm.debian.org/git/d-i/debootstrap.git @@ -41,7 +41,7 @@ Future * Cross-strap support - so you can bootstrap a filesystem to the point where it will successfully boot, and finish installing itself without having to be running the target architecture or OS yourself. - This means you should be able to run + This means you should be able to run debootstrap --arch powerpc sarge ./sarge-ppc-chroot ... -- cgit v0.12 From e1c5de1b385b95f8bf8235190b16f6ca0aa98b18 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Fri, 23 Sep 2016 19:27:40 +0200 Subject: Add symlinks for buster and bullseye --- scripts/bullseye | 1 + scripts/buster | 1 + 2 files changed, 2 insertions(+) create mode 120000 scripts/bullseye create mode 120000 scripts/buster diff --git a/scripts/bullseye b/scripts/bullseye new file mode 120000 index 0000000..9a63c96 --- /dev/null +++ b/scripts/bullseye @@ -0,0 +1 @@ +sid \ No newline at end of file diff --git a/scripts/buster b/scripts/buster new file mode 120000 index 0000000..9a63c96 --- /dev/null +++ b/scripts/buster @@ -0,0 +1 @@ +sid \ No newline at end of file -- cgit v0.12 From a8109a6bf2d4197e616de10f5e496d0ff2b8e763 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Fri, 23 Sep 2016 22:36:26 +0200 Subject: Only unpack and configure the base system when there are packages to install Bug: https://bugs.debian.org/825034 --- scripts/sid | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/scripts/sid b/scripts/sid index 511cebf..0b289f9 100644 --- a/scripts/sid +++ b/scripts/sid @@ -194,17 +194,19 @@ echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/ done_predeps="$done_predeps $predep" done - smallyes '' | - (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages. This will be re-attempted up to five times." "" \ - dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 || echo EXITCODE $?) | - dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING - - info CONFBASE "Configuring the base system..." - - smallyes '' | - (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be re-attempted up to five times." "" \ - dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 || echo EXITCODE $?) | - dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING + if [ -n "$base" ]; then + smallyes '' | + (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages. This will be re-attempted up to five times." "" \ + dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 || echo EXITCODE $?) | + dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING + + info CONFBASE "Configuring the base system..." + + smallyes '' | + (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be re-attempted up to five times." "" \ + dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 || echo EXITCODE $?) | + dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING + fi mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon" rm -f "$TARGET/usr/sbin/policy-rc.d" -- cgit v0.12 From b3204a5b689c8a745b62bc111fdaad29423dd55a Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Fri, 23 Sep 2016 22:41:21 +0200 Subject: Remove unused variable `DATE` --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 55f229d..8516803 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,5 @@ # avoid dpkg-dev dependency; fish out the version with sed VERSION := $(shell sed 's/.*(\(.*\)).*/\1/; q' debian/changelog) -DATE := $(shell sed -n '/^ -- /{s/.*> \(.*\)/\1/p;q;}' debian/changelog) all: -- cgit v0.12 From 2ab4758d3a447698cf2bd28a56a19a1378cd6ac7 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Wed, 14 Sep 2016 01:04:31 +0200 Subject: Update changelog. --- debian/changelog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/debian/changelog b/debian/changelog index ee9e43f..1cee5d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +debootstrap (1.0.85) UNRELEASED; urgency=medium + + * Add jessie-kfreebsd to merged-/usr blacklist. + * No longer Build-Depend on makedev. The code using it was already + removed in debootstrap 1.0.82. + * Do not use `tar -k` for older releases which might have file + conflicts between the packages to be installed. (Closes: #838388) + * Error out when seeing short options. (Closes: #548880) + * Add oldoldstable -> sid script symlink. (Closes: #792734) + * Add buster -> sid and bullseye -> sid script symlinks. + * Only unpack and configure the base system when there are actually + packages to install. (Closes: #825034) + + -- Ansgar Burchardt Wed, 14 Sep 2016 01:03:58 +0200 + debootstrap (1.0.84) unstable; urgency=medium [ Ansgar Burchardt ] -- cgit v0.12 From 6b4019d0d4911cdb337ad8204891223c9f323829 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Wed, 19 Oct 2016 00:14:03 +0200 Subject: Enable merged-/usr by default. Thanks to Marco d'Itri for the patch. --- debian/changelog | 4 ++++ debootstrap | 2 +- debootstrap.8 | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1cee5d1..c746495 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ debootstrap (1.0.85) UNRELEASED; urgency=medium + [ Ansgar Burchardt ] * Add jessie-kfreebsd to merged-/usr blacklist. * No longer Build-Depend on makedev. The code using it was already removed in debootstrap 1.0.82. @@ -11,6 +12,9 @@ debootstrap (1.0.85) UNRELEASED; urgency=medium * Only unpack and configure the base system when there are actually packages to install. (Closes: #825034) + [ Marco d'Itri ] + * Enable merged-/usr by default. (Closes: #839046, #839162) + -- Ansgar Burchardt Wed, 14 Sep 2016 01:03:58 +0200 debootstrap (1.0.84) unstable; urgency=medium diff --git a/debootstrap b/debootstrap index 7875c5b..0d6cb54 100755 --- a/debootstrap +++ b/debootstrap @@ -27,7 +27,7 @@ KEYRING="" DISABLE_KEYRING="" FORCE_KEYRING="" VARIANT="" -MERGED_USR="no" +MERGED_USR="yes" ARCH="" HOST_ARCH="" HOST_OS="" diff --git a/debootstrap.8 b/debootstrap.8 index 3d19683..bb590d7 100644 --- a/debootstrap.8 +++ b/debootstrap.8 @@ -86,6 +86,10 @@ Debian installation in .IP .IP "\fB\-\-merged-usr\fP" Create /{bin,sbin,lib}/ symlinks pointing to their counterparts in /usr/. +(Default.) +.IP +.IP "\fB\-\-no-merged-usr\fP" +Do not create /{bin,sbin,lib}/ symlinks pointing to their counterparts in /usr/. .IP .IP "\fB\-\-keyring=KEYRING\fP" Override the default keyring for the distribution being bootstrapped, -- cgit v0.12