Add syslinux path patch to tails-installer

3 files changed, 52 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef52115..8db42f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Feb 15 21:29:03 UTC 2016
+# Tue Feb 16 09:29:31 UTC 2016
 pkgbase = tails-installer
 	pkgdesc = Installer for the Tails live operating system
 	pkgver = 4.4.7
-	pkgrel = 1
+	pkgrel = 2
 	url = https://tails.boum.org/
 	arch = x86_64
 	arch = i686
@@ -21,7 +21,9 @@ pkgbase = tails-installer
 	depends = udisks2
 	depends = urlgrabber
 	source = git://git.tails.boum.org/liveusb-creator#tag=tails-installer_4.4.7
+	source = 0001-syslinux-path.patch
 	sha256sums = SKIP
+	sha256sums = 9f6d72212172e3f4275f953b4d3387b17fe8c4daac83d41a93d659d688f9ea27
 
 pkgname = tails-installer
 
diff --git a/0001-syslinux-path.patch b/0001-syslinux-path.patch
new file mode 100644
index 0000000..628c507
--- /dev/null
+++ b/0001-syslinux-path.patch
@@ -0,0 +1,34 @@
+From 65a2b31fa89ff27251ae30ad3bb3a22d4ef6dff0 Mon Sep 17 00:00:00 2001
+From: Yuval Adam <yuval@y3xz.com>
+Date: Mon, 15 Feb 2016 23:08:00 +0200
+Subject: [PATCH] Add additional syslinux paths
+
+This path exists on Arch Linux systems, and since liveusb-creator is now
+packaged for Arch we should probably add it
+---
+ tails_installer/creator.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tails_installer/creator.py b/tails_installer/creator.py
+index 38ec961..4683c3c 100755
+--- a/tails_installer/creator.py
++++ b/tails_installer/creator.py
+@@ -997,6 +997,7 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
+             for com32mod in com32modules:
+                 copied = False
+                 for orig_dir in ('/usr/lib/syslinux/modules/bios',
++                                 '/usr/lib/syslinux/bios',
+                                  '/usr/share/syslinux',
+                                  '/usr/lib/syslinux'):
+                     com32path = os.path.join(orig_dir, com32mod)
+@@ -1227,6 +1228,7 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
+             for mbr_bin in ('/usr/lib/syslinux/mbr/gptmbr.bin',
+                             '/usr/lib/SYSLINUX/gptmbr.bin',
+                             '/usr/lib/syslinux/gptmbr.bin',
++                            '/usr/lib/syslinux/bios/gptmbr.bin',
+                             '/usr/share/syslinux/gptmbr.bin'):
+                 if os.path.exists(mbr_bin):
+                     return mbr_bin
+-- 
+2.7.1
+
diff --git a/PKGBUILD b/PKGBUILD
index 364cf33..1356d65 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,28 @@
 
 pkgname=tails-installer
 pkgver=4.4.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Installer for the Tails live operating system"
 arch=('x86_64' 'i686')
 url="https://tails.boum.org/"
 license=(GPL)
 depends=('cdrkit' 'coreutils' 'dosfstools' 'e2fsprogs' 'gptfdisk' 'gtk3' 'p7zip' 'python2-configobj' 'syslinux' 'udisks2' 'urlgrabber')
 makedepends=('git')
-source=("git://git.tails.boum.org/liveusb-creator#tag=tails-installer_${pkgver}")
-sha256sums=('SKIP')
+source=(
+  "git://git.tails.boum.org/liveusb-creator#tag=tails-installer_${pkgver}"
+  "0001-syslinux-path.patch"
+)
+sha256sums=(
+  'SKIP'
+  '9f6d72212172e3f4275f953b4d3387b17fe8c4daac83d41a93d659d688f9ea27'
+)
 _pkgname=liveusb-creator
 
+prepare() {
+  cd "${srcdir}/${_pkgname}"
+  patch -p1 -i "${srcdir}/0001-syslinux-path.patch"
+}
+
 package() {
   cd "${srcdir}/${_pkgname}"
   sed -i '1!b;s/python/python2/' tails-installer{,-launcher}