rpms/sedutil
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adjust nvme_ioctl.h patch for epel7 compatibility

Browse Source
This commit is contained in:
Charles R. Anderson 2017-05-16 19:31:22 -04:00
parent 910c1674f5
commit a976e15a7a
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
56.patch → sedutil-1.12-nvme_ioctl.patch
View File

@ -1,3 +1,8 @@
From: Charles R. Anderson <cra@wpi.edu>
Date: Tue, 16 May 2016 18:55 -0400
Remove LINUX_VERSION_CODE > 4.4.0 check to support older kernels that use the newer nvme_ioctl.h
From 5ca6100917a025f6e11ae20838e1e37e7db2d587 Mon Sep 17 00:00:00 2001
From: JanLuca <jan@naumannsfamily.de>
Date: Mon, 30 May 2016 00:21:48 +0200
@ -26,7 +31,7 @@ index cc55761..7a67385 100755
#pragma once
-#include "linux/nvme.h"
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
+#if 1 || (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
+#include <linux/nvme_ioctl.h>
+#include "DtaDevLinuxNvmeStructsOpCodes.h"
+#else

9
sedutil.spec
View File

@ -4,7 +4,7 @@
Name: sedutil
Version: %{gittag0}
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Tools to manage the activation and use of self encrypting drives
# Everything is GPLv3+ except:
@ -23,7 +23,9 @@ Source0: https://github.com/Drive-Trust-Alliance/%{name}/archive/%{gittag0}/%{na
# ./dist/Release_x86_64/GNU-Linux/sedutil-cli
# Cleaned up with manual edits:
Source1: sedutil-cli.8
Patch0: https://github.com/Drive-Trust-Alliance/sedutil/pull/56.patch
# Modified version of https://github.com/Drive-Trust-Alliance/sedutil/pull/56.patch
# to use linux/nvme_ioctl.h regardless of kernel version number
Patch0: sedutil-1.12-nvme_ioctl.patch
# sedutil does not work on big-endian architectures
ExcludeArch: ppc ppc64 s390 s390x
@ -96,6 +98,9 @@ install -p -m755 LinuxPBA/dist/Release/GNU-Linux/linuxpba $RPM_BUILD_ROOT%{_libe
%changelog
* Tue May 16 2017 Charles R. Anderson <cra@wpi.edu> - 1.12-4
- Update patch for epel7 build with older kernel version numbering
* Tue May 9 2017 Charles R. Anderson <cra@wpi.edu> - 1.12-3
- Remove commented out macros
- Clarify multiple licensing scenario