From e7217dd24c3fb07d4fb18ec37a818ab9530dbf12 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 21 Jun 2010 12:06:38 +0100 Subject: [PATCH] Remove qemu-system build-dependency on hurd-i386, where it doesn't seem to exist. Disable tests if qemu-system-i386 isn't available. --- debian/changelog | 2 ++ debian/control | 2 +- debian/rules | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 60d19b0ad..802c953cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ grub2 (1.98+20100617-2) UNRELEASED; urgency=low /usr/lib/grub/mipsel-*, so that it stops clashing with grub-yeeloong; add a versioned Replaces to grub-yeeloong just in case (closes: #586526). + * Remove qemu-system build-dependency on hurd-i386, where it doesn't seem + to exist. Disable tests if qemu-system-i386 isn't available. [ Updated translations ] * Ukrainian (uk.po) by Yatsenko Alexandr / Borys Yanovych (closes: diff --git a/debian/control b/debian/control index 421ad3fcf..6f24e508e 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Build-Depends: cdbs, libdevmapper-dev [amd64 i386 powerpc mipsel sparc], libsdl1.2-dev [!hurd-i386], xorriso (>= 0.5.6.pl00), - qemu-system [i386 kfreebsd-i386 hurd-i386 kopensolaris-i386 amd64 kfreebsd-amd64], + qemu-system [i386 kfreebsd-i386 kopensolaris-i386 amd64 kfreebsd-amd64], Build-Conflicts: autoconf2.13 Standards-Version: 3.8.4 Homepage: http://www.gnu.org/software/grub/grub-2.en.html diff --git a/debian/rules b/debian/rules index aa6571836..5b8dae280 100755 --- a/debian/rules +++ b/debian/rules @@ -27,6 +27,10 @@ else with_check := no endif +ifeq (,$(shell which qemu-system-i386 2>/dev/null)) +with_check := no +endif + CC := gcc-4.4 # Enable external modules from grub-extras. -- 2.39.5