[Pkg-libvirt-commits] [libguestfs] 01/156: Deal with changed syslinux paths (Closes: #746748)

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository libguestfs.

commit 0d2afabad825be0c1451910f0b629de28922e4ed
Author: Hilko Bengen <bengen at debian.org>
Date:   Sun May 11 23:27:01 2014 +0200

    Deal with changed syslinux paths (Closes: #746748)
---
 ...slinux-add-new-syslinux-6-path-of-mbr.bin.patch | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 42 insertions(+)

diff --git a/debian/patches/0004-tests-syslinux-add-new-syslinux-6-path-of-mbr.bin.patch b/debian/patches/0004-tests-syslinux-add-new-syslinux-6-path-of-mbr.bin.patch
new file mode 100644
index 0000000..1b5d43e
--- /dev/null
+++ b/debian/patches/0004-tests-syslinux-add-new-syslinux-6-path-of-mbr.bin.patch
@@ -0,0 +1,41 @@
+From: Pino Toscano <ptoscano at redhat.com>
+Date: Fri, 9 May 2014 12:20:33 +0200
+Subject: tests/syslinux: add new syslinux 6+ path of mbr.bin
+
+---
+ tests/syslinux/test-syslinux.pl | 22 +++++++++++++++-------
+ 1 file changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/tests/syslinux/test-syslinux.pl b/tests/syslinux/test-syslinux.pl
+index d86c095..3950309 100755
+--- a/tests/syslinux/test-syslinux.pl
++++ b/tests/syslinux/test-syslinux.pl
+@@ -29,13 +29,21 @@ my $bootloader = $ENV{BOOTLOADER} || "syslinux";
+ my $disk = "$bootloader-guest.img";
+ 
+ # Find prerequisites.
+-my $mbr = "/usr/share/syslinux/mbr.bin";
+-unless (-f $mbr) {
+-    $mbr = "/usr/lib/syslinux/mbr.bin";
+-    unless (-f $mbr) {
+-        print "$0: mbr.bin (from SYSLINUX) not found, skipping test\n";
+-        exit 77;
+-    }
++my $mbr;
++my @mbr_paths = (
++  "/usr/share/syslinux/mbr.bin",
++  "/usr/lib/syslinux/mbr.bin",
++  "/usr/lib/syslinux/mbr/mbr.bin"
++);
++foreach my $m (@mbr_paths) {
++  if (-f $m) {
++    $mbr = $m;
++    last;
++  }
++}
++unless (defined $mbr) {
++    print "$0: mbr.bin (from SYSLINUX) not found, skipping test\n";
++    exit 77;
+ }
+ print "mbr: $mbr\n";
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 4430cbc..a20462a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
 0002-golang-Fix-for-out-of-tree-builds.patch
 0003-appliance-Fix-Debian-specific-package-names.patch
+0004-tests-syslinux-add-new-syslinux-6-path-of-mbr.bin.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git