SPECS: cisco-vpnclient.spec - adapted to kernel-module-build and t...

[bartowl]

Author: bartowl                      Date: Thu Apr 12 15:02:13 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapted to kernel-module-build and tested by Marcin Biczan

---- Files affected:
SPECS:
   cisco-vpnclient.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/cisco-vpnclient.spec
diff -u SPECS/cisco-vpnclient.spec:1.19 SPECS/cisco-vpnclient.spec:1.20
--- SPECS/cisco-vpnclient.spec:1.19	Wed Mar 14 01:13:57 2007
+++ SPECS/cisco-vpnclient.spec	Thu Apr 12 17:02:08 2007
@@ -26,6 +26,7 @@
 Source2:	cisco_vpnclient.init
 NoSource:	0
 NoSource:	1
+Patch0:		%{name}-kernel.patch
 URL:		http://www.cisco.com/en/US/products/sw/secursw/ps2308/tsd_products_support_series_home.html
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.0}
 BuildRequires:	rpmbuild(macros) >= 1.268
@@ -79,6 +80,7 @@
 %ifarch %{x8664}
 tar -zxvf %{SOURCE1}
 %endif
+%patch0 -p1
 
 %build
 cd vpnclient
@@ -87,22 +89,31 @@
 	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
 		exit 1
 	fi
-	rm -rf include
-	install -d include/{linux,config}
-	ln -sf %{_kernelsrcdir}/config-$cfg .config
-	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
-	ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
-%if !%{with dist_kernel}
-	ln -sf %{_kernelsrcdir}/scripts
-%endif
-	touch include/config/MARKER
+	install -d o/include/linux
+	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+	ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+	%if %{with dist_kernel}
+		%{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+	%else
+		install -d o/include/config
+		touch o/include/config/MARKER
+		ln -sf %{_kernelsrcdir}/scripts o/scripts
+	%endif
+#
+#       patching/creating makefile(s) (optional)
+#
 	%{__make} -C %{_kernelsrcdir} clean \
 		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		M=$PWD O=$PWD \
+		SYSSRC=%{_kernelsrcdir} \
+		SYSOUT=$PWD/o \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 	%{__make} -C %{_kernelsrcdir} modules \
-		M=$PWD O=$PWD \
+		CC="%{__cc}" CPP="%{__cpp}" \
+		SYSSRC=%{_kernelsrcdir} \
+		SYSOUT=$PWD/o \
+		M=$PWD O=$PWD/o \
 		%{?with_verbose:V=1}
 	mv cisco_ipsec.ko cisco_ipsec-$cfg.ko
 done
@@ -206,6 +217,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2007/04/12 15:02:08  bartowl
+- adapted to kernel-module-build and tested by Marcin Biczan
+
 Revision 1.19  2007/03/14 00:13:57  glen
 - up bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cisco-vpnclient.spec?r1=1.19&r2=1.20&f=u