summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHelmut Grohne <helmut@subdivi.de>2023-01-21 22:34:59 +0100
committerHelmut Grohne <helmut@subdivi.de>2023-01-21 22:38:00 +0100
commit7b87925ac3decbed41ed896b79fd98ff290a2f12 (patch)
tree47fdc5f45e40315788aa662422e701bc70c41676
parent7ef6fbf41f0160534999059c4e08f183c4339fbe (diff)
downloaddebvm-7b87925ac3decbed41ed896b79fd98ff290a2f12.tar.gz
fix ftbfs: cannot use arch restriction for arch:all package
-rw-r--r--debian/control5
-rw-r--r--debian/tests/control3
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/control b/debian/control
index 02c7dcb..0c1b3cf 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,7 @@ Depends:
e2fsprogs,
genext2fs,
mmdebstrap (>= 1.3.0),
-# Work around qemu-system-misc not providing qemu-kvm on s390x. #1029309
- qemu-system-misc [s390x] | qemu-kvm | qemu-system-arm | qemu-system-mips | qemu-system-misc [!s390x] | qemu-system-ppc | qemu-system-sparc | qemu-system-x86,
+ qemu-kvm | qemu-system-arm | qemu-system-mips | qemu-system-misc | qemu-system-ppc | qemu-system-sparc | qemu-system-x86,
# Required for -device virtio-net-pci,netdev=net0
ipxe-qemu,
Recommends:
@@ -26,7 +25,7 @@ Recommends:
openssh-client,
qemu-system,
qemu-user-static,
- seabios [ppc64el],
+ seabios,
uidmap | fakeroot,
uidmap | fakechroot,
Suggests:
diff --git a/debian/tests/control b/debian/tests/control
index 5421e52..47e3122 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,6 @@
Test-Command: ./tests/create-and-run.sh $(dpkg --print-architecture) sid
-Depends: debvm, fakeroot, fakechroot, libsystemd-shared, openssh-client, seabios [ppc64el]
+# Work around #1029309: qemu-system-misc does not Provide: qemu-kvm [s390x]
+Depends: debvm, fakeroot, fakechroot, libsystemd-shared, openssh-client, seabios [ppc64el], qemu-system-misc [s390x]
Restrictions: allow-stderr, needs-internet
Features: test-name=hint-testsuite-triggers