Package: autopkgtest
Version: 5.15
Severity: wishlist
Tags: patch
Please consider including the following patch. It adds a new option
"variant" to autopkg-test-build-qemu that is passed on to debootstrap.
This is useful when creating images for sbuild's
--chroot-mod=autopkgtest, where variant=buildd seems the most appropriate.
-- System Information:
Debian Release: 10.6
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 5.8.0-0.bpo.2-amd64 (SMP w/24 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8),
LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages autopkgtest depends on:
ii apt-utils 1.8.2.1
ii libdpkg-perl 1.19.7
ii procps 2:3.3.15-2
ii python3 3.7.3-1
ii python3-debian 0.1.35
Versions of packages autopkgtest recommends:
ii autodep8 0.24~bpo10+1
Versions of packages autopkgtest suggests:
pn lxc <none>
pn lxd <none>
ii ovmf 2020.05-3~bpo+1
ii qemu-efi-aarch64 2020.05-3~bpo+1
ii qemu-efi-arm 2020.05-3~bpo+1
pn qemu-system <none>
ii qemu-utils 1:5.0-14~bpo10+1
pn schroot <none>
ii vmdb2 0.19-1
-- debconf-show failed
-- debsums errors found:
debsums: changed file /usr/bin/autopkgtest-build-qemu (from autopkgtest
package)
>From 9ebee3734de9caa4af9054d29cf34fdb593fde48 Mon Sep 17 00:00:00 2001
From: Christian Kastner <c...@debian.org>
Date: Fri, 30 Oct 2020 20:37:59 +0100
Subject: [PATCH] build-qemu: Add option to specify debootstrap variant
Useful when creating images for sbuild's --chroot-mod=autopkgtest, where
variant=buildd seems the most appropriate.
---
tools/autopkgtest-build-qemu | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/tools/autopkgtest-build-qemu b/tools/autopkgtest-build-qemu
index 3d6666a..2906bc1 100755
--- a/tools/autopkgtest-build-qemu
+++ b/tools/autopkgtest-build-qemu
@@ -29,6 +29,7 @@ set -eu
apt_proxy=
architecture=
mirror=
+variant=
user_script=
size=
@@ -40,6 +41,7 @@ usage () {
echo " [default: $(dpkg
--print-architecture)]"
echo "--mirror=URL Set apt mirror [default:"
echo " http://deb.debian.org/debian]";
+ echo "--variant=VARIANT Set debootstrap variant [default:
\"\"]"
echo "--script=SCRIPT Run an extra customization script"
echo "--size=SIZE Set image size [default: 25G]"
exit "${1-1}"
@@ -47,7 +49,7 @@ usage () {
if getopt_temp="$(
getopt -o '' \
- --long 'apt-proxy:,arch:,architecture:,help,mirror:,script:,size:' \
+ --long 'apt-proxy:,arch:,architecture:,help,mirror:,variant:,script:,size:' \
-n "$0" -- "$@"
)"; then
eval set -- "$getopt_temp"
@@ -77,6 +79,11 @@ while true; do
shift 2
;;
+ (--variant)
+ variant="$2"
+ shift 2
+ ;;
+
(--script)
user_script="$2"
shift 2
@@ -244,6 +251,13 @@ else
debootstrap_arch="arch: $architecture"
fi
+if [ -n "$variant" ]; then
+ debootstrap_variant="variant: $variant"
+ echo "@@@ 1/ $debootstrap_variant"
+else
+ debootstrap_variant=
+ echo "@@@ 2/ $debootstrap_variant"
+fi
vmdb2_config=$(mktemp)
trap "rm -rf $vmdb2_config" INT TERM EXIT
@@ -272,6 +286,7 @@ steps:
mirror: $mirror
target: root
$debootstrap_arch
+ $debootstrap_variant
- apt: install
packages:
--
2.27.0
