From 7b87925ac3decbed41ed896b79fd98ff290a2f12 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Sat, 21 Jan 2023 22:34:59 +0100 Subject: fix ftbfs: cannot use arch restriction for arch:all package --- debian/control | 5 ++--- debian/tests/control | 3 ++- 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 -- cgit v1.2.3