Fix name (nvme.h -> nvme_ioctl.h) and location of include ("" -> <>).

Include missing declarations directly instead of hardcoding then in a patch.

4 files changed, 23 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c5223f24baa..82e6564b913b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Apr 29 23:15:48 UTC 2016
+# Thu May 19 15:48:34 UTC 2016
 pkgbase = sedutil
 	pkgdesc = TCG OPAL 2.00 SED Management Program
 	pkgver = 1.12
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Drive-Trust-Alliance/sedutil
 	install = sedutil.install
 	arch = i686
@@ -23,7 +23,7 @@ pkgbase = sedutil
 	source = linuxpba.hook
 	source = linuxpba.install
 	source = getpasswd.c
-	source = add_missing_declarations.patch
+	source = includes.patch
 	sha256sums = 5509d4279cfb316f33730c5cb06f8162ae212c7f4d31d206642d67cc8be245c1
 	sha256sums = 5ab7ef67fea0f4e370d8f0a4da87636a1df18e0edb0152d08f906f38280cc0e8
 	sha256sums = 77c725e4eee095dbede512d2bca13b8f2c139a67b9b87a11d98be94e6df0e1d7
@@ -34,7 +34,7 @@ pkgbase = sedutil
 	sha256sums = d9a7b66d8365e7f4eb0233b30c0ab70b5e978f6554960bf12994a1f0910c1447
 	sha256sums = f31a0ba891dd705ef68174afeb651bdc3426a63202d058d98510907de43248f7
 	sha256sums = e94d011c98bd336f37d6d4923e5d63a22ebd10d8f2c6486b6bcd6617524d6484
-	sha256sums = 74f41f3dde1d4291757f74e3bc1ab33ae832ee63b6b8879869705baa054ef2d9
+	sha256sums = c9ab6e72db01fa0a3d694cccd652917071b35b2c446f2024725eb37aad0caefc
 
 pkgname = sedutil
 
diff --git a/PKGBUILD b/PKGBUILD
index c8321a8b655c..d11b9e182a25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=sedutil
 pkgver=1.12
-pkgrel=1
+pkgrel=2
 pkgdesc="TCG OPAL 2.00 SED Management Program"
 arch=('i686' 'x86_64')
 url="https://github.com/Drive-Trust-Alliance/sedutil"
@@ -22,7 +22,7 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Drive-Trust-Alliance/${
         'linuxpba.hook'
         'linuxpba.install'
         'getpasswd.c'
-        'add_missing_declarations.patch')
+        'includes.patch')
 sha256sums=('5509d4279cfb316f33730c5cb06f8162ae212c7f4d31d206642d67cc8be245c1'
             '5ab7ef67fea0f4e370d8f0a4da87636a1df18e0edb0152d08f906f38280cc0e8'
             '77c725e4eee095dbede512d2bca13b8f2c139a67b9b87a11d98be94e6df0e1d7'
@@ -33,13 +33,15 @@ sha256sums=('5509d4279cfb316f33730c5cb06f8162ae212c7f4d31d206642d67cc8be245c1'
             'd9a7b66d8365e7f4eb0233b30c0ab70b5e978f6554960bf12994a1f0910c1447'
             'f31a0ba891dd705ef68174afeb651bdc3426a63202d058d98510907de43248f7'
             'e94d011c98bd336f37d6d4923e5d63a22ebd10d8f2c6486b6bcd6617524d6484'
-            '74f41f3dde1d4291757f74e3bc1ab33ae832ee63b6b8879869705baa054ef2d9')
+            'c9ab6e72db01fa0a3d694cccd652917071b35b2c446f2024725eb37aad0caefc')
 PKGEXT='.pkg.tar'
 CPPFLAGS="$CPPFLAGS -O2"
 
 prepare() {
+    KVER="$(uname -r)"
     cd "${srcdir}/${pkgname}-${pkgver}/"
-    patch -p1 < "${srcdir}/add_missing_declarations.patch"
+    patch -p1 < "${srcdir}/includes.patch"
+    sed -i "s/%KVER%/${KVER}/" "./linux/DtaDevLinuxNvme.h"
 }
 
 build() {
diff --git a/add_missing_declarations.patch b/add_missing_declarations.patch
deleted file mode 100644
index b363771bdc20..000000000000
--- a/add_missing_declarations.patch
+++ /dev/null
@@ -1,55 +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-04-30 00:03:24.275330994 +0100
-@@ -22,6 +22,51 @@
- #include "DtaStructures.h"
- #include "DtaDevLinuxDrive.h"
- 
-+struct nvme_user_io {
-+	__u8	opcode;
-+	__u8	flags;
-+	__u16	control;
-+	__u16	nblocks;
-+	__u16	rsvd;
-+	__u64	metadata;
-+	__u64	addr;
-+	__u64	slba;
-+	__u32	dsmgmt;
-+	__u32	reftag;
-+	__u16	apptag;
-+	__u16	appmask;
-+};
-+
-+struct nvme_passthru_cmd {
-+	__u8	opcode;
-+	__u8	flags;
-+	__u16	rsvd1;
-+	__u32	nsid;
-+	__u32	cdw2;
-+	__u32	cdw3;
-+	__u64	metadata;
-+	__u64	addr;
-+	__u32	metadata_len;
-+	__u32	data_len;
-+	__u32	cdw10;
-+	__u32	cdw11;
-+	__u32	cdw12;
-+	__u32	cdw13;
-+	__u32	cdw14;
-+	__u32	cdw15;
-+	__u32	timeout_ms;
-+	__u32	result;
-+};
-+
-+#define nvme_admin_cmd nvme_passthru_cmd
-+
-+#define NVME_IOCTL_ID		_IO('N', 0x40)
-+#define NVME_IOCTL_ADMIN_CMD	_IOWR('N', 0x41, struct nvme_admin_cmd)
-+#define NVME_IOCTL_SUBMIT_IO	_IOW('N', 0x42, struct nvme_user_io)
-+#define NVME_IOCTL_IO_CMD	_IOWR('N', 0x43, struct nvme_passthru_cmd)
-+#define NVME_IOCTL_RESET	_IO('N', 0x44)
-+#define NVME_IOCTL_SUBSYS_RESET	_IO('N', 0x45)
-+
- /** Linux specific implementation of DtaDevOS.
-  * Uses the NVMe to send commands to the 
-  * device 
diff --git a/includes.patch b/includes.patch
new file mode 100644
index 000000000000..54f72982cb78
--- /dev/null
+++ b/includes.patch
@@ -0,0 +1,13 @@
+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"
+