mmdebstrap

@@ -5737,9 +5737,6 @@ sub main() {
         if (!can_execute 'mke2fs', '-V') {
             error "need mke2fs for ext4 format";
         }
-        require DynaLoader;
-        my $libarchive = DynaLoader::dl_load_file("libarchive.so.13", 0)
-          or error "need libarchive for ext4 format";
         $blocksize = 4096;
     } elsif ($options->{format} eq 'squashfs') {
         if (!can_execute 'tar2sqfs') {

mmdebstrap-autopkgtest-build-qemu

@@ -235,31 +235,26 @@ case "$ARCHITECTURE" in
 		EFIIMG=bootx64.efi
 		QEMUARCH=x86_64
 		VMFPKG=ovmf
-		LINUXIMAGE=linux-image-amd64
 	;;
 	arm64)
 		EFIIMG=bootaa64.efi
 		QEMUARCH=aarch64
 		VMFPKG=qemu-efi-aarch64
-		LINUXIMAGE=linux-image-arm64
 	;;
 	armhf)
 		EFIIMG=bootarm.efi
 		QEMUARCH=arm
 		VMFPKG=qemu-efi-arm
-		LINUXIMAGE=linux-image-armmp
 	;;
 	i386)
 		EFIIMG=bootia32.efi
 		QEMUARCH=i386
 		VMFPKG=ovmf-ia32
-		LINUXIMAGE=linux-image-686-pae
 	;;
 	riscv64)
 		EFIIMG=bootriscv64.efi
 		QEMUARCH=riscv64
 		VMFPKG=
-		LINUXIMAGE=linux-image-riscv64
 	;;
 	*)
 		die "unsupported architecture: $ARCHITECTURE"
@@ -349,7 +344,7 @@ test "$RELEASE" = jessie &&
 	set -- "$@" --hook-dir=/usr/share/mmdebstrap/hooks/jessie-or-older
 
 set -- "$@" \
-	"--include=init,$LINUXIMAGE,python3" \
+	"--include=init,linux-image-$ARCHITECTURE,python3" \
 	'--customize-hook=echo host >"$1/etc/hostname"' \
 	'--customize-hook=echo 127.0.0.1 localhost host >"$1/etc/hosts"' \
 	'--customize-hook=passwd --root "$1" --delete root' \

tests/debootstrap

@@ -5,12 +5,6 @@ export SOURCE_DATE_EPOCH={{ SOURCE_DATE_EPOCH }}
 
 tmpdir="$(mktemp -d)"
 chmod 755 "$tmpdir"
-ret=0
-debootstrap "$([ "{{ DIST }}" = oldstable ] && echo --no-merged-usr || echo --merged-usr)" --variant={{ VARIANT }} {{ DIST }} "$tmpdir" {{ MIRROR }} || ret=$?
-if [ "$ret" -ne 0 ]; then
-	echo "E: debootstrap failed, dumping $tmpdir/debootstrap/debootstrap.log"
-	cat "$tmpdir/debootstrap/debootstrap.log"
-	exit 1
-fi
+debootstrap "$([ "{{ DIST }}" = oldstable ] && echo --no-merged-usr || echo --merged-usr)" --variant={{ VARIANT }} {{ DIST }} "$tmpdir" {{ MIRROR }}
 tar --sort=name --mtime=@$SOURCE_DATE_EPOCH --clamp-mtime --numeric-owner --one-file-system --xattrs -C "$tmpdir" -c . > "./cache/debian-{{ DIST }}-{{ VARIANT }}.tar"
 rm -r "$tmpdir"