[packages/linux-fusion] - fixed building with linux 4.1 - rel 5
baggins
baggins at pld-linux.org
Sat Jul 4 15:08:49 CEST 2015
commit d74e87cfae813cc79b8f0ff3dd62aac8bd71e812
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Jul 4 15:08:35 2015 +0200
- fixed building with linux 4.1
- rel 5
linux-4.1.patch | 14 ++++++++++++++
linux-fusion.spec | 4 +++-
2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/linux-fusion.spec b/linux-fusion.spec
index 84ca325..5c29c57 100644
--- a/linux-fusion.spec
+++ b/linux-fusion.spec
@@ -18,7 +18,7 @@ exit 1
%define _enable_debug_packages 0
%endif
-%define rel 4
+%define rel 5
%define pname linux-fusion
Summary: Fusion and One Linux kernel modules
Summary(pl.UTF-8): Moduły Fusion i One dla jądra Linuksa
@@ -30,6 +30,7 @@ Group: Base/Kernel
Source0: http://www.directfb.org/downloads/Core/linux-fusion/%{pname}-%{version}.tar.xz
# Source0-md5: 5799f52ec656cdd3da592c94a6262199
Patch0: linux-3.19.patch
+Patch1: linux-4.1.patch
URL: http://www.directfb.org/
%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
BuildRequires: rpmbuild(macros) >= 1.701
@@ -145,6 +146,7 @@ Linux One to nowe API IPC wykorzystywane przez Comę.\
%prep
%setup -q -n %{pname}-%{version}
%patch0 -p1
+%patch1 -p1
%{__sed} -i -e 's/^obj-[^ ]*/obj-m/' linux/drivers/char/fusion/Makefile-2.6
%{__sed} -i -e 's/^obj-[^ ]*/obj-m/' one/Makefile-2.6
diff --git a/linux-4.1.patch b/linux-4.1.patch
new file mode 100644
index 0000000..7032391
--- /dev/null
+++ b/linux-4.1.patch
@@ -0,0 +1,14 @@
+--- linux-fusion-9.0.3/one/one_udp.c~ 2015-07-03 20:10:40.000000000 +0200
++++ linux-fusion-9.0.3/one/one_udp.c 2015-07-04 15:06:54.458207017 +0200
+@@ -193,7 +193,11 @@
+
+ oldfs = get_fs();
+ set_fs(KERNEL_DS);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0)
+ size = sock_sendmsg(sock,&msg,len);
++#else
++ size = sock_sendmsg(sock,&msg);
++#endif
+ set_fs(oldfs);
+
+ return size;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/linux-fusion.git/commitdiff/d74e87cfae813cc79b8f0ff3dd62aac8bd71e812
More information about the pld-cvs-commit
mailing list