[packages/oslec] - make it build with 3.x kernels

arekm arekm at pld-linux.org
Mon Dec 10 15:26:05 CET 2012


commit 734d96f28ccee799f0bf1f01e08e891716b97a8c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Dec 10 15:26:00 2012 +0100

    - make it build with 3.x kernels

 oslec-build.patch | 35 +++++++++++++++++++++++++++++++++++
 oslec.spec        |  3 +++
 2 files changed, 38 insertions(+)
---
diff --git a/oslec.spec b/oslec.spec
index a783c2e..ba74dad 100644
--- a/oslec.spec
+++ b/oslec.spec
@@ -12,6 +12,7 @@ License:	GPL v2
 Group:		Applications/System
 Source0:	 http://www.rowetel.com/ucasterisk/downloads/%{name}-%{version}.tar.gz
 # Source0-md5:	554a0d44d2b4bac27ca1cc29fc55f69b
+Patch0:		%{name}-build.patch
 URL:		http://www.rowetel.com/ucasterisk/oslec.html
 %if %{with dist_kernel}
 BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2
@@ -53,6 +54,8 @@ oslec - moduł jądra Linuksa.
 
 %prep
 %setup -q
+%patch0 -p1
+
 sed -i "s|#include <echo.h>|#include <$PWD/spandsp-0.0.3/src/spandsp/echo.h>|" kernel/oslec_wrap.c
 
 %build
diff --git a/oslec-build.patch b/oslec-build.patch
new file mode 100644
index 0000000..4b0e833
--- /dev/null
+++ b/oslec-build.patch
@@ -0,0 +1,35 @@
+diff -urN oslec-0.2.org/kernel/Makefile oslec-0.2/kernel/Makefile
+--- oslec-0.2.org/kernel/Makefile	2008-09-25 01:17:32.000000000 +0200
++++ oslec-0.2/kernel/Makefile	2012-12-10 15:25:32.309572923 +0100
+@@ -6,7 +6,7 @@
+ # Version 2
+ 
+ ifeq ($(ARCH), blackfin)
+-EXTRA_CFLAGS    := -Idrivers/zaptel/oslec/kernel -Idrivers/zaptel/oslec/spandsp-0.0.3/src/spandsp -D__BLACKFIN__ -D__BLACKFIN_ASM__ -O6 -DEXPORT_SYMTAB
++ccflags-y	:= -Idrivers/zaptel/oslec/kernel -Idrivers/zaptel/oslec/spandsp-0.0.3/src/spandsp -D__BLACKFIN__ -D__BLACKFIN_ASM__ -O6 -DEXPORT_SYMTAB
+ obj-$(CONFIG_OSLEC)        += oslec.o
+ 
+ oslec-objs := oslec_wrap.o \
+@@ -15,11 +15,11 @@
+ else
+ 
+ UNAME := $(shell uname -r)
+-KERNEL26 := 2.6
++KERNEL26 := 3
+ KERNELVERSION := $(findstring $(KERNEL26),$(UNAME))
+ PWD := $(shell pwd)
+ 
+-ifeq ($(KERNELVERSION),2.6)
++ifeq (y,y)
+ 
+ obj-m	:= oslec.o
+ 
+@@ -39,7 +39,7 @@
+ 
+ INCLUDE	:= -I/lib/modules/`uname -r`/build/include -I/usr/include/asm/mach-default/
+ INCLUDE	+= -I../spandsp-0.0.3/src/spandsp -I.
+-CFLAGS	:= -O2 -Wall -DMODULE -D__KERNEL__ -DLINUX
++ccflags-y	:= -O2 -Wall -DMODULE -D__KERNEL__ -DLINUX
+ CC	:= gcc
+ 
+ all:: oslec.o
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/oslec.git/commitdiff/734d96f28ccee799f0bf1f01e08e891716b97a8c



More information about the pld-cvs-commit mailing list