diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/0001-tests-base-files-now-ships-merged-usr-symlinks.patch | 109 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 116 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 5cf685e..9790e43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mmdebstrap (1.5.1-2) unstable; urgency=medium + + * tests: base-files now ships merged-/usr symlinks + + -- Johannes Schauer Marin Rodrigues <josch@debian.org> Mon, 10 Jun 2024 07:58:30 +0200 + mmdebstrap (1.5.1-1~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/patches/0001-tests-base-files-now-ships-merged-usr-symlinks.patch b/debian/patches/0001-tests-base-files-now-ships-merged-usr-symlinks.patch new file mode 100644 index 0000000..9d083fa --- /dev/null +++ b/debian/patches/0001-tests-base-files-now-ships-merged-usr-symlinks.patch @@ -0,0 +1,109 @@ +From a1a2d76f6ef37c0b47ba27ef6447a5ba3bb9244f Mon Sep 17 00:00:00 2001 +From: Johannes Schauer Marin Rodrigues <josch@mister-muffin.de> +Date: Mon, 10 Jun 2024 00:12:16 +0200 +Subject: [PATCH] tests: base-files now ships merged-/usr symlinks + +--- + tests/check-against-debootstrap-dist | 2 ++ + tests/eatmydata-via-hook-dir | 1 - + tests/jessie-or-older | 1 + + tests/missing-dev-sys-proc-inside-the-chroot | 4 ++-- + tests/pivot_root | 10 +++++----- + 5 files changed, 10 insertions(+), 8 deletions(-) + +diff --git a/tests/check-against-debootstrap-dist b/tests/check-against-debootstrap-dist +index b5706c6..3ac0db3 100644 +--- a/tests/check-against-debootstrap-dist ++++ b/tests/check-against-debootstrap-dist +@@ -70,6 +70,8 @@ rm /tmp/debian-{{ DIST }}-debootstrap/var/cache/debconf/templates.dat-old \ + /tmp/debian-{{ DIST }}-mm/var/cache/debconf/templates.dat-old + rm /tmp/debian-{{ DIST }}-debootstrap/var/lib/dpkg/status-old \ + /tmp/debian-{{ DIST }}-mm/var/lib/dpkg/status-old ++rm -f /tmp/debian-{{ DIST }}-debootstrap/var/lib/dpkg/diversions-old \ ++ /tmp/debian-{{ DIST }}-mm/var/lib/dpkg/diversions-old + # remove dpkg files + rm /tmp/debian-{{ DIST }}-debootstrap/var/lib/dpkg/available + rm /tmp/debian-{{ DIST }}-debootstrap/var/lib/dpkg/cmethopt +diff --git a/tests/eatmydata-via-hook-dir b/tests/eatmydata-via-hook-dir +index 0df72df..b554508 100644 +--- a/tests/eatmydata-via-hook-dir ++++ b/tests/eatmydata-via-hook-dir +@@ -37,7 +37,6 @@ elfheader="$elfheader\\001\\000" + tar -C /tmp/debian-chroot --one-file-system -c . \ + | tar -t \ + | sort \ +- | grep -v '^\./var/lib/dpkg/diversions\(-old\)\?$' \ + | diff -u tar1.txt - + rm /tmp/checkeatmydata.sh + rm -r /tmp/debian-chroot +diff --git a/tests/jessie-or-older b/tests/jessie-or-older +index a3a2ace..db941b6 100644 +--- a/tests/jessie-or-older ++++ b/tests/jessie-or-older +@@ -30,6 +30,7 @@ filter() { + --path-exclude=/var/cache/debconf/templates.dat-old \ + --path-exclude=/var/lib/dpkg/available \ + --path-exclude=/var/lib/dpkg/diversions \ ++ --path-exclude=/var/lib/dpkg/diversions-old \ + --path-exclude=/var/lib/dpkg/cmethopt \ + --path-exclude=/var/lib/dpkg/status-old \ + --path-exclude=/var/lib/shells.state +diff --git a/tests/missing-dev-sys-proc-inside-the-chroot b/tests/missing-dev-sys-proc-inside-the-chroot +index 9c9b1c0..efc39b3 100644 +--- a/tests/missing-dev-sys-proc-inside-the-chroot ++++ b/tests/missing-dev-sys-proc-inside-the-chroot +@@ -17,8 +17,8 @@ if [ "$(id -u)" -eq 0 ] && [ "{{ MODE }}" != "root" ] && [ "{{ MODE }}" != "auto + prefix="runuser -u ${SUDO_USER:-user} --" + fi + +-# creating /sbin manually because of #1071078 ++# do not install base-files, so that /proc, /sys and /dev are missing + $prefix {{ CMD }} --mode={{ MODE }} --variant={{ VARIANT }} \ +- --setup-hook='mkdir "$1/sbin"' \ ++ --setup-hook='for dir in bin lib lib32 lib64 libo32 libx32 sbin; do ln -s "usr/$dir" "$1/$dir"; done' \ + --include=dpkg,dash,diffutils,coreutils,libc-bin,sed \ + {{ DIST }} /dev/null {{ MIRROR }} +diff --git a/tests/pivot_root b/tests/pivot_root +index 860c41b..7aa025e 100644 +--- a/tests/pivot_root ++++ b/tests/pivot_root +@@ -17,19 +17,19 @@ if [ "$(id -u)" -eq 0 ] && [ "{{ MODE }}" != "root" ] && [ "{{ MODE }}" != "auto + fi + + $prefix {{ CMD }} --mode={{ MODE }} --variant=apt \ +- --include=mount \ ++ --include=mount,perl \ + {{ DIST }} /tmp/chroot1.tar {{ MIRROR }} + + if [ {{ MODE }} = "unshare" ]; then + # calling pivot_root in root mode does not work for mysterious reasons: + # pivot_root: failed to change root from `.' to `mnt': Invalid argument +- $prefix {{ CMD }} --mode={{ MODE }} --variant=apt --include=mount \ ++ $prefix {{ CMD }} --mode={{ MODE }} --variant=apt --include=mount,perl \ + --customize-hook='mkdir -p "$1/mnt" "$1/oldroot"' \ + --customize-hook='[ ! -e /usr/bin/mmdebstrap ] || cp -aT /usr/bin/mmdebstrap "$1/usr/bin/mmdebstrap"' \ + --customize-hook='[ ! -e ./mmdebstrap ] || cp -aT ./mmdebstrap "$1/mnt/mmdebstrap"' \ + --customize-hook='mount -o rbind "$1" /mnt && cd /mnt && /sbin/pivot_root . oldroot' \ + --customize-hook='unshare -U echo nested unprivileged unshare' \ +- --customize-hook='env --chdir=/mnt {{ CMD }} --mode=unshare --variant=apt --include=mount {{ DIST }} /tmp/chroot3.tar {{ MIRROR }}' \ ++ --customize-hook='env --chdir=/mnt {{ CMD }} --mode=unshare --variant=apt --include=mount,perl {{ DIST }} /tmp/chroot3.tar {{ MIRROR }}' \ + --customize-hook='copy-out /tmp/chroot3.tar /tmp' \ + --customize-hook='rm -f "/usr/bin/mmdebstrap" "/mnt/mmdebstrap"' \ + --customize-hook='umount -l oldroot sys' \ +@@ -41,11 +41,11 @@ if [ {{ MODE }} = "unshare" ]; then + rm /tmp/chroot2.tar /tmp/chroot3.tar + fi + +-$prefix {{ CMD }} --mode={{ MODE }} --variant=apt --include=mount \ ++$prefix {{ CMD }} --mode={{ MODE }} --variant=apt --include=mount,perl \ + --customize-hook='mkdir -p "$1/mnt"' \ + --customize-hook='[ ! -e /usr/bin/mmdebstrap ] || cp -aT /usr/bin/mmdebstrap "$1/usr/bin/mmdebstrap"' \ + --customize-hook='[ ! -e ./mmdebstrap ] || cp -aT ./mmdebstrap "$1/mnt/mmdebstrap"' \ +- --chrooted-customize-hook='env --chdir=/mnt {{ CMD }} --mode=unshare --variant=apt --include=mount {{ DIST }} /tmp/chroot3.tar {{ MIRROR }}' \ ++ --chrooted-customize-hook='env --chdir=/mnt {{ CMD }} --mode=unshare --variant=apt --include=mount,perl {{ DIST }} /tmp/chroot3.tar {{ MIRROR }}' \ + --customize-hook='copy-out /tmp/chroot3.tar /tmp' \ + --customize-hook='rm -f "$1/usr/bin/mmdebstrap" "$1/mnt/mmdebstrap"' \ + {{ DIST }} /tmp/chroot2.tar {{ MIRROR }} +-- +2.39.2 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..39c5319 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-tests-base-files-now-ships-merged-usr-symlinks.patch |