diff options
| -rw-r--r-- | sysutils/debootstrap/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/debootstrap/files/patch-debootstrap | 6 | ||||
| -rw-r--r-- | sysutils/debootstrap/files/patch-functions | 6 | ||||
| -rw-r--r-- | sysutils/debootstrap/files/patch-scripts-gutsy | 28 | ||||
| -rw-r--r-- | sysutils/debootstrap/files/patch-scripts_debian-common | 24 | ||||
| -rw-r--r-- | sysutils/debootstrap/pkg-message | 8 |
6 files changed, 62 insertions, 12 deletions
diff --git a/sysutils/debootstrap/Makefile b/sysutils/debootstrap/Makefile index b650cec9b268..d1ced0a3122b 100644 --- a/sysutils/debootstrap/Makefile +++ b/sysutils/debootstrap/Makefile @@ -3,7 +3,7 @@ PORTNAME= debootstrap PORTVERSION= 1.0.123 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= DEBIAN/pool/main/d/${PORTNAME} DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/sysutils/debootstrap/files/patch-debootstrap b/sysutils/debootstrap/files/patch-debootstrap index 60428c53281f..dc2822ec82a9 100644 --- a/sysutils/debootstrap/files/patch-debootstrap +++ b/sysutils/debootstrap/files/patch-debootstrap @@ -1,4 +1,4 @@ ---- debootstrap.orig 2019-07-06 11:22:30 UTC +--- debootstrap.orig 2020-03-13 02:03:08 UTC +++ debootstrap @@ -1,4 +1,4 @@ -#!/bin/sh @@ -15,7 +15,7 @@ fi fi -@@ -498,13 +498,7 @@ fi +@@ -516,13 +516,7 @@ fi ########################################################################### @@ -30,7 +30,7 @@ HOST_ARCH=$(cat "$DEBOOTSTRAP_DIR/arch") fi HOST_OS="$HOST_ARCH" -@@ -524,6 +518,11 @@ if [ -z "$HOST_OS" ]; then +@@ -542,6 +536,11 @@ if [ -z "$HOST_OS" ]; then HOST_OS=freebsd ;; esac diff --git a/sysutils/debootstrap/files/patch-functions b/sysutils/debootstrap/files/patch-functions index c612480a3ec7..43f4e2eac2ef 100644 --- a/sysutils/debootstrap/files/patch-functions +++ b/sysutils/debootstrap/files/patch-functions @@ -1,6 +1,6 @@ ---- functions.orig 2019-07-06 11:22:30 UTC +--- functions.orig 2020-03-14 00:53:38 UTC +++ functions -@@ -1139,6 +1139,7 @@ setup_proc () { +@@ -1157,6 +1157,7 @@ setup_proc () { case "$HOST_OS" in *freebsd*) umount_on_exit /dev @@ -8,7 +8,7 @@ umount_on_exit /proc umount "$TARGET/proc" 2>/dev/null || true if [ "$HOST_OS" = kfreebsd ]; then -@@ -1224,7 +1225,8 @@ setup_dynamic_devices () { +@@ -1242,7 +1243,8 @@ setup_dynamic_devices () { kfreebsd*) in_target mount -t devfs devfs /dev ;; freebsd) diff --git a/sysutils/debootstrap/files/patch-scripts-gutsy b/sysutils/debootstrap/files/patch-scripts-gutsy index a118425f2cc6..5dcfca3ba30f 100644 --- a/sysutils/debootstrap/files/patch-scripts-gutsy +++ b/sysutils/debootstrap/files/patch-scripts-gutsy @@ -1,6 +1,28 @@ ---- scripts/gutsy.orig 2020-07-08 20:51:17.590645000 +0100 -+++ scripts/gutsy 2020-07-08 20:51:28.786509000 +0100 -@@ -249,10 +249,13 @@ echo \"Warning: Fake initctl called, doing nothing\"" +--- scripts/gutsy.orig 2020-03-13 02:04:21 UTC ++++ scripts/gutsy +@@ -242,10 +242,21 @@ echo \"Warning: Fake initctl called, doing nothing\"" + predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps") + # XXX: progress is tricky due to how dpkg_progress works + # -- cjwatson 2009-07-29 ++ # This step sometimes fails due to some missing functionality in Linuxulator. Just ignore it. ++ set +e + p; smallyes '' | + in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep) ++ rc=$? + base=$(without "$base" "$predep") + done_predeps="$done_predeps $predep" ++ ++ if [ $rc != 0 ]; then ++ warning FREEBSD_00 "Applying FreeBSD-specific workaround..." ++ # ... for "Failed to mount /etc/machine-id: Bad address" with Focal. ++ in_target truncate -s0 /var/lib/dpkg/info/systemd.postinst ++ in_target dpkg --configure systemd ++ fi ++ set -e + done + + if [ -n "$base" ]; then +@@ -256,10 +267,13 @@ echo \"Warning: Fake initctl called, doing nothing\"" info CONFBASE "Configuring the base system..." diff --git a/sysutils/debootstrap/files/patch-scripts_debian-common b/sysutils/debootstrap/files/patch-scripts_debian-common new file mode 100644 index 000000000000..50de93d375f1 --- /dev/null +++ b/sysutils/debootstrap/files/patch-scripts_debian-common @@ -0,0 +1,24 @@ +--- scripts/debian-common.orig 2021-01-12 21:19:09 UTC ++++ scripts/debian-common +@@ -200,10 +200,21 @@ echo \"Warning: Fake start-stop-daemon called, doing n + predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps") + # XXX: progress is tricky due to how dpkg_progress works + # -- cjwatson 2009-07-29 ++ # This step sometimes fails due to some missing functionality in Linuxulator. Just ignore it. ++ set +e + p; smallyes '' | + in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep) ++ rc=$? + base=$(without "$base" "$predep") + done_predeps="$done_predeps $predep" ++ ++ if [ $rc != 0 ]; then ++ warning FREEBSD_00 "Applying FreeBSD-specific workaround..." ++ # ... for "Failed to mount /etc/machine-id: Bad address" with Focal. ++ in_target truncate -s0 /var/lib/dpkg/info/systemd.postinst ++ in_target dpkg --configure systemd ++ fi ++ set -e + done + + if [ -n "$base" ]; then diff --git a/sysutils/debootstrap/pkg-message b/sysutils/debootstrap/pkg-message index 7d32bcbd2bce..0c39abe95a8c 100644 --- a/sysutils/debootstrap/pkg-message +++ b/sysutils/debootstrap/pkg-message @@ -2,9 +2,13 @@ { type: install message: <<EOM To successfully create an installation of Debian or Ubuntu -debootstrap requires the following kernel modules loaded: +debootstrap requires the following kernel modules to be loaded: -fdescfs linprocfs linsysfs tmpfs +linux64 fdescfs linprocfs linsysfs tmpfs + +To install Ubuntu Bionic into /compat/ubuntu, use: + +debootstrap --no-check-gpg bionic /compat/ubuntu EOM } ] |