[packages/linux-gpib] - reenable ISA driver and fix missing header
baggins
baggins at pld-linux.org
Mon Jul 31 11:58:18 CEST 2023
commit d5b04c61241d7f19218695ba9dd9936f33412b3b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Jul 31 10:53:22 2023 +0200
- reenable ISA driver and fix missing header
isa-dma.patch | 10 ++++++++++
linux-gpib.spec | 6 ++++--
2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/linux-gpib.spec b/linux-gpib.spec
index 9f74063..b492823 100644
--- a/linux-gpib.spec
+++ b/linux-gpib.spec
@@ -1,7 +1,7 @@
#
# Conditional build:
%bcond_without kernel # kernel modules
-%bcond_with drivers_isa # ISA kernel drivers [ix86 only]
+%bcond_without drivers_isa # ISA kernel drivers [ix86 only]
%bcond_without drivers_usb # USB kernel drivers
%bcond_without userspace # userspace packages
%bcond_without verbose # verbose modules build (V=1)
@@ -59,6 +59,7 @@ Patch8: kernel-5.2.patch
Patch9: kernel-5.10.patch
Patch10: pkgconfig-version.patch
Patch11: linux-gpib-guile3.patch
+Patch12: isa-dma.patch
URL: http://linux-gpib.sourceforge.net/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -258,7 +259,7 @@ Ten pakiet zawiera sterowniki dla Linuksa do urządzeń GPIB (IEEE 488).\
%define build_kernel_pkg()\
%{__make} VERBOSE=1 LINUX_SRCDIR=%{_kernelsrcdir} clean\
-%{__make} VERBOSE=1 LINUX_SRCDIR=%{_kernelsrcdir} %{?with_drivers_isa:ENABLE_ISA=m}%{!?with_drivers_isa:ENABLE_ISA=n}\
+%{__make} VERBOSE=1 LINUX_SRCDIR=%{_kernelsrcdir}\
cd drivers/gpib\
%if %{_kernel_version_code} < %{_kernel_version_magic 5 10 0}\
%if %{with drivers_usb}\
@@ -300,6 +301,7 @@ cd linux-gpib-kernel-%{version}
%ifarch %{ix86}
%patch8 -p1
%endif
+%patch12 -p1
%endif
%build
diff --git a/isa-dma.patch b/isa-dma.patch
new file mode 100644
index 0000000..f8251ce
--- /dev/null
+++ b/isa-dma.patch
@@ -0,0 +1,10 @@
+--- linux-gpib-4.3.6/linux-gpib-kernel-4.3.6/drivers/gpib/pc2/pc2_init.c~ 2022-08-22 18:07:00.000000000 +0200
++++ linux-gpib-4.3.6/linux-gpib-kernel-4.3.6/drivers/gpib/pc2/pc2_init.c 2023-07-31 10:51:41.010507617 +0200
+@@ -25,6 +25,7 @@
+ #include <asm-generic/dma.h>
+ #include <linux/string.h>
+ #include <linux/init.h>
++#include <linux/dma-mapping.h>
+
+ MODULE_LICENSE("GPL");
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/linux-gpib.git/commitdiff/d5b04c61241d7f19218695ba9dd9936f33412b3b
More information about the pld-cvs-commit
mailing list