Skip to content

Instantly share code, notes, and snippets.

@zeha
Created October 19, 2024 15:44
Show Gist options
  • Save zeha/6f616f2beefb18b4a999014915dd01e5 to your computer and use it in GitHub Desktop.
Save zeha/6f616f2beefb18b4a999014915dd01e5 to your computer and use it in GitHub Desktop.
From 689fd3d6bceb492b2665ada3c6677da3f5e72e88 Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <[email protected]>
Date: Sat, 19 Oct 2024 17:43:46 +0200
Subject: [PATCH] Stop running quickcheck on i386
Closes: #1085438
---
debian/README.source | 2 +-
debian/control | 3 +--
debian/rules | 2 +-
debian/tests/control | 7 +++----
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index dbef34370..2c628cc9d 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -3,6 +3,6 @@ libguestfs for Debian
This package build-depends on linux-image-* to be able to run the
tests which involves firing up qemu and a minimal system. This is
-currently only done on i386, amd64.
+currently only done on amd64.
-- Hilko Bengen <[email protected]>, Mon, 19 Feb 2018 18:00:47 +0100
diff --git a/debian/control b/debian/control
index cbca50b69..48ee4f8aa 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
qemu-system-misc [s390x riscv64],
qemu-system-ppc [powerpc powerpcspe ppc64 ppc64el],
qemu-system-sparc [sparc sparc64],
- qemu-system-x86 [i386 amd64],
+ qemu-system-x86 [amd64],
xorriso,
sqlite3,
pkgconf,
@@ -56,7 +56,6 @@ Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
linux-image-amd64 [amd64] <!nocheck>,
linux-image-armmp [armhf] <!nocheck>,
linux-image-arm64 [arm64] <!nocheck>,
- linux-image-686-pae [i386] <!nocheck> | linux-image-586 [i386] <!nocheck> | linux-image-486 [i386] <!nocheck>,
linux-image-powerpc64le [ppc64el] <!nocheck>,
linux-image-riscv64 [riscv64] <!nocheck>,
linux-image-s390x [s390x] <!nocheck>,
diff --git a/debian/rules b/debian/rules
index 7988493a5..7b5d7b7a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,7 +53,7 @@ QEMU_CPU := $(shell echo $(DEB_HOST_GNU_CPU) \
-e 's,arm.*,arm,')
# Run "make quickcheck" only on these architectures
-QUICKCHECK_ARCHITECTURES := i386 amd64 armhf arm64 riscv64 ppc64el # s390x
+QUICKCHECK_ARCHITECTURES := amd64 armhf arm64 riscv64 ppc64el # s390x
# Template for generating dh_{clean,configure,build,test} overrides.
# $1 is replaced with the build number.
diff --git a/debian/tests/control b/debian/tests/control
index 55ec51ef1..cf5de6ea3 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,9 +1,9 @@
Tests: extlinux
Depends: guestfish, libguestfs-tools,
- linux-image-amd64 [amd64], linux-image-686-pae [i386],
+ linux-image-amd64 [amd64],
mmdebstrap, openssh-client, sleepenh,
Restrictions: needs-root, allow-stderr
-Architecture: i386 amd64
+Architecture: amd64
Tests: libguestfs-test-tool
Depends: libguestfs-tools,
@@ -20,8 +20,7 @@ Depends: libguestfs-tools,
linux-image-powerpc64le [ppc64el],
linux-image-sparc64 [sparc sparc64],
linux-image-amd64 [amd64 x32],
- linux-image-686-pae [i386] | linux-image-586 [i386] | linux-image-486 [i386],
linux-image-riscv64 [riscv64],
linux-image-itanium [ia64] | linux-image-mckinley [ia64],
Restrictions: needs-root, allow-stderr
-
+Architecture: alpha armel armhf arm64 mips mipsel mips64 mips64el s390x hppa powerpc ppc64 ppc64el sparc sparc64 x32 riscv64 ia64
--
2.39.5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment