forked from josch/mmdebstrap
tests/chrootless: now that all of essential is supported, test everything
This commit is contained in:
parent
52d1531c0d
commit
cc5ea8c0c7
4 changed files with 33 additions and 15 deletions
|
@ -307,7 +307,7 @@ Variants: essential
|
|||
Modes: chrootless
|
||||
Skip-If:
|
||||
dist in ["oldstable", "stable"]
|
||||
hostarch != "amd64"
|
||||
hostarch not in ["amd64", "arm64"]
|
||||
not run_ma_same_tests
|
||||
Needs-QEMU: true
|
||||
|
||||
|
|
|
@ -2,14 +2,10 @@
|
|||
set -eu
|
||||
export LC_ALL=C.UTF-8
|
||||
export SOURCE_DATE_EPOCH={{ SOURCE_DATE_EPOCH }}
|
||||
if dpkg --compare-versions "$(dpkg-query -W -f='${Version}' libpam-runtime)" le 1.5.2-5; then
|
||||
# https://bugs.debian.org/1022952
|
||||
exit 0
|
||||
fi
|
||||
trap "rm -f /tmp/chrootless.tar /tmp/root.tar" EXIT INT TERM
|
||||
# we need --hook-dir=./hooks/merged-usr because usrmerge does not understand
|
||||
# DPKG_ROOT
|
||||
for INCLUDE in '' 'systemd-sysv'; do
|
||||
for INCLUDE in '' 'apt' 'apt,build-essential' 'systemd-sysv'; do
|
||||
for MODE in root chrootless; do
|
||||
{{ CMD }} --mode=$MODE --variant={{ VARIANT }} --hook-dir=./hooks/merged-usr \
|
||||
${INCLUDE:+--include="$INCLUDE"} \
|
||||
|
|
|
@ -16,7 +16,7 @@ prefix=
|
|||
# DPKG_ROOT
|
||||
# permissions drwxr-sr-x and extended attributes of ./var/log/journal/ cannot
|
||||
# be preserved under fakeroot
|
||||
for INCLUDE in '' 'systemd-sysv'; do
|
||||
for INCLUDE in '' 'apt' 'apt,build-essential' 'systemd-sysv'; do
|
||||
{{ CMD }} --variant={{ VARIANT }} --hook-dir=./hooks/merged-usr \
|
||||
--customize-hook='if [ -d "$1"/var/log/journal ]; then rmdir "$1"/var/log/journal; mkdir --mode=2755 "$1"/var/log/journal; chroot "$1" chown root:systemd-journal /var/log/journal; fi' \
|
||||
${INCLUDE:+--include="$INCLUDE"} \
|
||||
|
|
|
@ -8,20 +8,42 @@ if [ ! -e /mmdebstrap-testenv ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
deb2qemu() {
|
||||
case "$1" in
|
||||
amd64) echo x86_64;;
|
||||
arm64) echo aarch64;;
|
||||
armel|armhf) echo arm;;
|
||||
ppc64el) echo ppc64le;;
|
||||
*) echo "$1";;
|
||||
esac
|
||||
}
|
||||
if [ "$(dpkg --print-architecture)" = "arm64" ]; then
|
||||
arch=amd64
|
||||
else
|
||||
arch=arm64
|
||||
fi
|
||||
|
||||
[ "$(id -u)" -eq 0 ]
|
||||
[ -e /proc/sys/fs/binfmt_misc/qemu-aarch64 ]
|
||||
[ -e "/proc/sys/fs/binfmt_misc/qemu-$(deb2qemu "$arch")" ]
|
||||
|
||||
|
||||
# we need --hook-dir=./hooks/merged-usr because usrmerge does not understand
|
||||
# DPKG_ROOT
|
||||
for INCLUDE in '' 'systemd-sysv'; do
|
||||
echo 1 > /proc/sys/fs/binfmt_misc/qemu-aarch64
|
||||
arch-test arm64
|
||||
{{ CMD }} --mode=root --architecture=arm64 --variant={{ VARIANT }} \
|
||||
#
|
||||
# dpkg is unable to install architecture arch:all packages with a
|
||||
# dependency on an arch:any package (perl-modules-5.34 in this case)
|
||||
# inside foreign architecture chrootless chroots, because dpkg will use
|
||||
# its own architecture as the native architecture, see #825385 and #1020533
|
||||
# So we are not testing the installation of apt,build-essential here.
|
||||
for INCLUDE in '' 'apt' 'systemd-sysv'; do
|
||||
echo 1 > "/proc/sys/fs/binfmt_misc/qemu-$(deb2qemu "$arch")"
|
||||
arch-test "$arch"
|
||||
{{ CMD }} --mode=root --architecture="$arch" --variant={{ VARIANT }} \
|
||||
--hook-dir=./hooks/merged-usr ${INCLUDE:+--include="$INCLUDE"} \
|
||||
{{ DIST }} "/tmp/root.tar" {{ MIRROR }}
|
||||
echo 0 > /proc/sys/fs/binfmt_misc/qemu-aarch64
|
||||
arch-test arm64 && exit 1
|
||||
{{ CMD }} --mode=chrootless --architecture=arm64 --variant={{ VARIANT }} \
|
||||
echo 0 > "/proc/sys/fs/binfmt_misc/qemu-$(deb2qemu "$arch")"
|
||||
arch-test "$arch" && exit 1
|
||||
{{ CMD }} --mode=chrootless --architecture="$arch" --variant={{ VARIANT }} \
|
||||
--hook-dir=./hooks/merged-usr ${INCLUDE:+--include="$INCLUDE"} \
|
||||
{{ DIST }} "/tmp/chrootless.tar" {{ MIRROR }}
|
||||
# when creating a foreign architecture chroot, the tarballs are not
|
||||
|
|
Loading…
Reference in a new issue