Fix compilation (again).

Small fixes.

4 files changed, 24 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db1ca44a53d1..7ed7460847c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Wed Jul 27 12:37:51 UTC 2016
+# Tue Dec 13 16:22:03 UTC 2016
 pkgbase = sedutil
 	pkgdesc = TCG OPAL 2.00 SED Management Program
 	pkgver = 1.12
@@ -10,6 +10,8 @@ pkgbase = sedutil
 	arch = x86_64
 	license = GPL3
 	optdepends = syslinux: to create a bootable PBA disk image
+	optdepends = gptfdisk: to create a bootable PBA disk image
+	optdepends = parted: to create a bootable PBA disk image
 	optdepends = intel-ucode: microcode update files for Intel CPUs
 	optdepends = yubikey-personalization: for yubikey support
 	backup = etc/linuxpba/linuxpba.conf
@@ -23,18 +25,18 @@ pkgbase = sedutil
 	source = linuxpba.hook
 	source = linuxpba.install
 	source = getpasswd.c
-	source = includes.patch
+	source = nvme_ioctl.patch::https://github.com/bcarmo-caio/sedutil/commit/5ca6100917a025f6e11ae20838e1e37e7db2d587.patch
 	sha256sums = 5509d4279cfb316f33730c5cb06f8162ae212c7f4d31d206642d67cc8be245c1
 	sha256sums = 40d785c16a28a5a8a43050d1731174482ee24459be215d2e4e27ffba3b2e28b2
 	sha256sums = 77c725e4eee095dbede512d2bca13b8f2c139a67b9b87a11d98be94e6df0e1d7
-	sha256sums = cbef4e615d75bb241a7dbea97c1b8b7105cac8cac2206c592f58bcda6f8957ed
+	sha256sums = b860d4d6fcc14a61d110c1d805d919fdfcf0fffaa8f0175b5ecddf60051f7941
 	sha256sums = 6aa4a9cb90da2d1b0f5eae6a9b487d6b7504d40b44ac62ec70edeef15ed40ee3
 	sha256sums = 6bf64faa4e413bac489e83518daf6963760cc4474ea2b848d0192402214c0efb
 	sha256sums = a110e6d6da0fd658412d8c79f7f2cbc58a9b0067c34c34c94c8f623801eecc78
 	sha256sums = d9a7b66d8365e7f4eb0233b30c0ab70b5e978f6554960bf12994a1f0910c1447
 	sha256sums = f31a0ba891dd705ef68174afeb651bdc3426a63202d058d98510907de43248f7
 	sha256sums = e94d011c98bd336f37d6d4923e5d63a22ebd10d8f2c6486b6bcd6617524d6484
-	sha256sums = c9ab6e72db01fa0a3d694cccd652917071b35b2c446f2024725eb37aad0caefc
+	sha256sums = ef179c054ed79399cdb2cdf9e43e565d5556891e7676b795e55d126b2641a919
 
 pkgname = sedutil
 
diff --git a/PKGBUILD b/PKGBUILD
index ce843681be76..627db0b2b1e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,6 +8,8 @@ arch=('i686' 'x86_64')
 url="https://github.com/Drive-Trust-Alliance/sedutil"
 license=('GPL3')
 optdepends=('syslinux: to create a bootable PBA disk image'
+            'gptfdisk: to create a bootable PBA disk image'
+            'parted: to create a bootable PBA disk image'
             'intel-ucode: microcode update files for Intel CPUs'
             'yubikey-personalization: for yubikey support')
 backup=('etc/linuxpba/linuxpba.conf')
@@ -22,26 +24,24 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Drive-Trust-Alliance/${
         'linuxpba.hook'
         'linuxpba.install'
         'getpasswd.c'
-        'includes.patch')
+        'nvme_ioctl.patch::https://github.com/bcarmo-caio/sedutil/commit/5ca6100917a025f6e11ae20838e1e37e7db2d587.patch')
 sha256sums=('5509d4279cfb316f33730c5cb06f8162ae212c7f4d31d206642d67cc8be245c1'
             '40d785c16a28a5a8a43050d1731174482ee24459be215d2e4e27ffba3b2e28b2'
             '77c725e4eee095dbede512d2bca13b8f2c139a67b9b87a11d98be94e6df0e1d7'
-            'cbef4e615d75bb241a7dbea97c1b8b7105cac8cac2206c592f58bcda6f8957ed'
+            'b860d4d6fcc14a61d110c1d805d919fdfcf0fffaa8f0175b5ecddf60051f7941'
             '6aa4a9cb90da2d1b0f5eae6a9b487d6b7504d40b44ac62ec70edeef15ed40ee3'
             '6bf64faa4e413bac489e83518daf6963760cc4474ea2b848d0192402214c0efb'
             'a110e6d6da0fd658412d8c79f7f2cbc58a9b0067c34c34c94c8f623801eecc78'
             'd9a7b66d8365e7f4eb0233b30c0ab70b5e978f6554960bf12994a1f0910c1447'
             'f31a0ba891dd705ef68174afeb651bdc3426a63202d058d98510907de43248f7'
             'e94d011c98bd336f37d6d4923e5d63a22ebd10d8f2c6486b6bcd6617524d6484'
-            'c9ab6e72db01fa0a3d694cccd652917071b35b2c446f2024725eb37aad0caefc')
+            'ef179c054ed79399cdb2cdf9e43e565d5556891e7676b795e55d126b2641a919')
 PKGEXT='.pkg.tar'
 CPPFLAGS="$CPPFLAGS -O2"
 
 prepare() {
-    KVER="$(uname -r)"
     cd "${srcdir}/${pkgname}-${pkgver}/"
-    patch -p1 < "${srcdir}/includes.patch"
-    sed -i "s/%KVER%/${KVER}/" "./linux/DtaDevLinuxNvme.h"
+    patch -p1 < "${srcdir}/nvme_ioctl.patch"
 }
 
 build() {
diff --git a/includes.patch b/includes.patch
deleted file mode 100644
index 54f72982cb78..000000000000
--- a/includes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur a/linux/DtaDevLinuxNvme.h b/linux/DtaDevLinuxNvme.h
---- a/linux/DtaDevLinuxNvme.h	2016-02-18 00:09:02.000000000 +0000
-+++ b/linux/DtaDevLinuxNvme.h	2016-05-19 16:42:24.297290059 +0100
-@@ -18,7 +18,8 @@
- 
-  * C:E********************************************************************** */
- #pragma once
--#include "linux/nvme.h"
-+#include "/usr/lib/modules/%KVER%/build/include/linux/nvme.h"
-+#include <linux/nvme_ioctl.h>
- #include "DtaStructures.h"
- #include "DtaDevLinuxDrive.h"
- 
diff --git a/mklinuxpba-diskimg b/mklinuxpba-diskimg
index a5b5d4713f00..35612598f4cd 100755
--- a/mklinuxpba-diskimg
+++ b/mklinuxpba-diskimg
@@ -40,6 +40,18 @@ then
     exit 1
 fi
 
+if [[ ! -e /usr/bin/gdisk ]]
+then
+    echo "gptfdisk is not installed: nothing to do."
+    exit 1
+fi
+
+if [[ ! -e /usr/bin/partprobe ]]
+then
+    echo "parted is not installed: nothing to do."
+    exit 1
+fi
+
 mklinuxpba-initramfs
 
 kernel_release="$(uname -r)"