[packages/lin_tape] - fix building with kernel 4.13 - rel 2

baggins baggins at pld-linux.org
Sat Sep 16 10:34:06 CEST 2017


commit e63c79d80d74b5a7253e54bad9bad8f02cd15fab
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Sep 16 10:33:45 2017 +0200

    - fix building with kernel 4.13
    - rel 2

 lin_tape.spec    |  4 +++-
 linux-4.13.patch | 28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
---
diff --git a/lin_tape.spec b/lin_tape.spec
index dd98a86..a11b6ab 100644
--- a/lin_tape.spec
+++ b/lin_tape.spec
@@ -5,7 +5,7 @@
 # nothing to be placed to debuginfo package
 %define		_enable_debug_packages	0
 
-%define		rel	1
+%define		rel	2
 %define		pname	lin_tape
 Summary:	IBM Tape SCSI Device Driver for Linux
 Name:		%{pname}%{_alt_kernel}
@@ -22,6 +22,7 @@ Patch2:		linux-4.9.patch
 Patch3:		linux-4.10.patch
 Patch4:		linux-4.11.patch
 Patch5:		linux-4.12.patch
+Patch6:		linux-4.13.patch
 # System Storage, Tape systems, Tape drivers and software, Tape device drivers (Linux)
 URL:		http://www.ibm.com/support/fixcentral/
 BuildRequires:	rpmbuild(macros) >= 1.701
@@ -75,6 +76,7 @@ compatible platforms.\
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 install -p %{SOURCE1} .
 
diff --git a/linux-4.13.patch b/linux-4.13.patch
new file mode 100644
index 0000000..e8228d3
--- /dev/null
+++ b/linux-4.13.patch
@@ -0,0 +1,28 @@
+--- lin_tape-3.0.20/lin_tape_ioctl_tape.c~	2017-09-16 10:27:48.000000000 +0200
++++ lin_tape-3.0.20/lin_tape_ioctl_tape.c	2017-09-16 10:31:03.642711575 +0200
+@@ -6465,7 +6465,11 @@
+ 
+ 	tmp_rq = (void*)sdev->request_queue;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,13,0)
++	scsi_req_init(scsi_req(req));
++#else
+ 	scsi_req_init(req);
++#endif
+ #else
+ 	req->cmd_type = REQ_TYPE_BLOCK_PC;
+ #endif
+--- lin_tape-3.0.20/lower.c~	2017-09-16 10:27:48.000000000 +0200
++++ lin_tape-3.0.20/lower.c	2017-09-16 10:32:08.377461388 +0200
+@@ -470,7 +470,11 @@
+ 	}
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
++	scsi_req_init(scsi_req(rq));
++#else
+ 	scsi_req_init(rq);
++#endif
+ #else
+ 	rq->cmd_type = REQ_TYPE_BLOCK_PC;
+ #endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lin_tape.git/commitdiff/e63c79d80d74b5a7253e54bad9bad8f02cd15fab



More information about the pld-cvs-commit mailing list