[packages/linux-gpib] - fix building with kernel 4.11 - rel 9

baggins baggins at pld-linux.org
Wed May 10 07:41:44 CEST 2017


commit 833bdb014cfcb3520e718ba96e52d05481855a68
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed May 10 07:41:26 2017 +0200

    - fix building with kernel 4.11
    - rel 9

 kernel-4.11.patch | 13 +++++++++++++
 linux-gpib.spec   |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/linux-gpib.spec b/linux-gpib.spec
index f307ac8..a46252e 100644
--- a/linux-gpib.spec
+++ b/linux-gpib.spec
@@ -33,7 +33,7 @@ exit 1
 %include	/usr/lib/rpm/macros.perl
 %define		php_name	php%{?php_suffix}
 
-%define		rel	8
+%define		rel	9
 %define		pname	linux-gpib
 Summary:	GPIB (IEEE 488) Linux support
 Summary(pl.UTF-8):	Obsługa GPIB (IEEE 488) dla Linuksa
@@ -51,6 +51,7 @@ Patch3:		%{pname}-perl.patch
 Patch4:		%{pname}-firmwaredir.patch
 Patch5:		%{pname}-guile2.patch
 Patch6:		%{pname}-php7.patch
+Patch7:		kernel-4.11.patch
 URL:		http://linux-gpib.sourceforge.net/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -259,6 +260,7 @@ cd ../..\
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # disable modules build by default, just install userspace header
 echo 'SUBDIRS = gpib/include' > drivers/Makefile.am
diff --git a/kernel-4.11.patch b/kernel-4.11.patch
new file mode 100644
index 0000000..46f98cb
--- /dev/null
+++ b/kernel-4.11.patch
@@ -0,0 +1,13 @@
+diff -ur linux-gpib-4.0.3/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c linux-gpib-4.0.3-4.11/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
+--- linux-gpib-4.0.3/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c	2016-04-09 15:33:13.000000000 +0200
++++ linux-gpib-4.0.3-4.11/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c	2017-05-10 07:38:40.555593617 +0200
+@@ -26,6 +26,9 @@
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/sched.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
++#include <linux/sched/signal.h>
++#endif
+ #include <linux/init.h>
+ #include <linux/kernel.h>
+ #include <linux/tty.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/linux-gpib.git/commitdiff/833bdb014cfcb3520e718ba96e52d05481855a68



More information about the pld-cvs-commit mailing list