[packages/linux-gpib] - disable hp_82341 driver on ix86, kernel 5.2 exposed that it never worked because isapnp_read_byte

[baggins]

commit 82a3ed184f6e28ffbed20de3146f09205afdebb2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Jul 12 16:54:51 2019 +0200

    - disable hp_82341 driver on ix86, kernel 5.2 exposed that it never worked because isapnp_read_byte was never exported from kernel
    - rel 3

 kernel-5.2.patch | 10 ++++++++++
 linux-gpib.spec  | 11 ++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
---
diff --git a/linux-gpib.spec b/linux-gpib.spec
index 305013d..f8f7431 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	2
+%define		rel	3
 %define		pname	linux-gpib
 Summary:	GPIB (IEEE 488) Linux support
 Summary(pl.UTF-8):	Obsługa GPIB (IEEE 488) dla Linuksa
@@ -50,6 +50,7 @@ Patch4:		%{pname}-firmwaredir.patch
 Patch5:		%{pname}-guile2.patch
 Patch6:		%{pname}-php7.patch
 Patch7:		kernel-5.0.patch
+Patch8:		kernel-5.2.patch
 URL:		http://linux-gpib.sourceforge.net/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -248,7 +249,11 @@ Ten pakiet zawiera sterowniki dla Linuksa do urządzeń GPIB (IEEE 488).\
 	--with-linux-srcdir=%{_kernelsrcdir}\
 %{__make}\
 cd drivers/gpib\
+%ifarch %{ix86}\
+%install_kernel_modules -D installed -m agilent_82350b/agilent_82350b,cb7210/cb7210,cec/cec_gpib,hp_82335/hp82335,ines/ines_gpib,nec7210/nec7210,sys/gpib_common,tms9914/tms9914,tnt4882/tnt4882%{?with_drivers_isa:,pc2/pc2_gpib}%{?with_drivers_usb:,agilent_82357a/agilent_82357a,lpvo_usb_gpib/lpvo_usb_gpib,ni_usb/ni_usb_gpib} -d kernel/gpib\
+%else\
 %install_kernel_modules -D installed -m agilent_82350b/agilent_82350b,cb7210/cb7210,cec/cec_gpib,hp_82335/hp82335,hp_82341/hp_82341,ines/ines_gpib,nec7210/nec7210,sys/gpib_common,tms9914/tms9914,tnt4882/tnt4882%{?with_drivers_isa:,pc2/pc2_gpib}%{?with_drivers_usb:,agilent_82357a/agilent_82357a,lpvo_usb_gpib/lpvo_usb_gpib,ni_usb/ni_usb_gpib} -d kernel/gpib\
+%endif\
 cd ../..\
 %{nil}
 
@@ -274,6 +279,9 @@ cd ..
 tar xzf linux-gpib-kernel-%{version}.tar.gz
 cd linux-gpib-kernel-%{version}
 %patch7 -p1
+%ifarch %{ix86}
+%patch8 -p1
+%endif
 
 # disable modules build by default, just install userspace header
 echo 'SUBDIRS = gpib/include' > drivers/Makefile.am
@@ -393,6 +401,7 @@ cp -pr language/tcl/examples $RPM_BUILD_ROOT%{_examplesdir}/tcl-gpib-%{version}
 # packaged as %doc
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/linux-gpib-user/html
 %endif
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/kernel-5.2.patch b/kernel-5.2.patch
new file mode 100644
index 0000000..a154273
--- /dev/null
+++ b/kernel-5.2.patch
@@ -0,0 +1,10 @@
+--- linux-gpib-kernel-4.2.0/drivers/gpib/Makefile~	2018-11-07 15:58:07.000000000 +0100
++++ linux-gpib-kernel-4.2.0/drivers/gpib/Makefile	2019-07-12 16:49:53.176504410 +0200
+@@ -6,7 +6,6 @@
+ obj-y += cec/
+ obj-y += fmh_gpib/
+ obj-y += hp_82335/
+-obj-y += hp_82341/
+ obj-y += ines/
+ obj-$(CONFIG_USB) += lpvo_usb_gpib/
+ obj-y += nec7210/
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/linux-gpib.git/commitdiff/82a3ed184f6e28ffbed20de3146f09205afdebb2