SPECS: CapOver.spec - new style kernel modules build - smp removed

[zbyniu]

Author: zbyniu                       Date: Thu Mar 29 20:31:11 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- new style kernel modules build
- smp removed

---- Files affected:
SPECS:
   CapOver.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/CapOver.spec
diff -u SPECS/CapOver.spec:1.10 SPECS/CapOver.spec:1.11
--- SPECS/CapOver.spec:1.10	Wed Mar 14 01:13:57 2007
+++ SPECS/CapOver.spec	Thu Mar 29 22:31:06 2007
@@ -3,8 +3,6 @@
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
-%bcond_without	up		# don't build UP module
-%bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace module
 #
 %define rel	1
@@ -19,7 +17,7 @@
 # Source0-md5:	971e50c1abaa97ee4a9958e92dd88300
 URL:		http://www.randombit.net/projects/cap_over/
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.0}
-BuildRequires:	rpmbuild(macros) >= 1.153
+BuildRequires:	rpmbuild(macros) >= 1.379
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,7 +39,7 @@
 Summary(pl.UTF-8):	Moduł jądra cap_over
 Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:%requires_releq_kernel}
 Requires(post,postun):	/sbin/depmod
 Requires:	CapOver
 
@@ -56,7 +54,7 @@
 Summary(pl.UTF-8):	Moduł SMP jądra cap_over
 Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
+%{?with_dist_kernel:%requires_releq_kernel}
 Requires(post,postun):	/sbin/depmod
 Requires:	CapOver
 
@@ -74,49 +72,14 @@
 %configure \
 	--with-linux="%{_kernelsrcdir}"
 
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-		exit 1
-	fi
-	install -d o/include/linux
-	ln -sf %{_kernelsrcdir}/config-$cfg o/.config
-	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg 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
-	%{__make} -C %{_kernelsrcdir} clean \
-		RCS_FIND_IGNORE="-name '*.ko' -o" \
-		SYSSRC=%{_kernelsrcdir} \
-		SYSOUT=$PWD/o \
-		M=$PWD O=$PWD/o \
-		%{?with_verbose:V=1}
-	%{__make} -C %{_kernelsrcdir} modules \
-		CC="%{__cc}" CPP="%{__cpp}" \
-		SYSSRC=%{_kernelsrcdir} \
-		SYSOUT=$PWD/o \
-		M=$PWD O=$PWD/o \
-		%{?with_verbose:V=1}
-
-	mv cap_over{,-$cfg}.ko
-done
+%build_kernel_modules -m cap_over
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %if %{with kernel}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-install cap_over-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/cap_over.ko
-%if %{with smp} && %{with dist_kernel}
-install cap_over-smp.ko \
-		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/cap_over.ko
-%endif
+%install_kernel_modules -d misc -m cap_over
 %endif
 
 %if %{with userspace}
@@ -133,12 +96,6 @@
 %postun	-n kernel%{_alt_kernel}-misc-cap_over
 %depmod %{_kernel_ver}
 
-%post	-n kernel%{_alt_kernel}-smp-misc-cap_over
-%depmod %{_kernel_ver}smp
-
-%postun	-n kernel%{_alt_kernel}-smp-misc-cap_over
-%depmod %{_kernel_ver}smp
-
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -147,25 +104,21 @@
 %endif
 
 %if %{with kernel}
-%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-misc-cap_over
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*
 %endif
 
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-misc-cap_over
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/*
-%endif
-%endif
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2007/03/29 20:31:06  zbyniu
+- new style kernel modules build
+- smp removed
+
 Revision 1.10  2007/03/14 00:13:57  glen
 - up bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/CapOver.spec?r1=1.10&r2=1.11&f=u