SPECS (AC-branch): template-kernel-module.spec - AC-branch two ker...

[glen]

Author: glen                         Date: Wed Feb 27 18:19:17 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- AC-branch two kernels

---- Files affected:
SPECS:
   template-kernel-module.spec (1.49 -> 1.49.2.1) 

---- Diffs:

================================================================
Index: SPECS/template-kernel-module.spec
diff -u SPECS/template-kernel-module.spec:1.49 SPECS/template-kernel-module.spec:1.49.2.1
--- SPECS/template-kernel-module.spec:1.49	Sun Nov 25 15:10:20 2007
+++ SPECS/template-kernel-module.spec	Wed Feb 27 19:19:12 2008
@@ -6,6 +6,8 @@
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-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 programs
 %bcond_with	verbose		# verbose build (V=1)
 
@@ -32,8 +34,8 @@
 #Patch0:	%{name}-what.patch
 #URL:		-
 %if %{with kernel}
-%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
-BuildRequires:	rpmbuild(macros) >= 1.379
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.14}
+BuildRequires:	rpmbuild(macros) >= 1.330
 %endif
 #BuildRequires:	-
 #Requires(postun):	-
@@ -58,8 +60,8 @@
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
-%requires_releq_kernel
-Requires(postun):	%releq_kernel
+%requires_releq_kernel_up
+Requires(postun):	%releq_kernel_up
 %endif
 
 %description -n kernel%{_alt_kernel}-MODULE_DIR-MODULE_NAME
@@ -72,6 +74,27 @@
 
 Ten pakiet zawiera moduł jądra Linuksa.
 
+%package -n kernel%{_alt_kernel}-smp-MODULE_DIR-MODULE_NAME
+Summary:	Linux SMP driver for MODULE_NAME
+Summary(pl.UTF-8):	Sterownik dla Linuksa SMP do MODULE_NAME
+Release:	%{_rel}@%{_kernel_ver_str}
+Group:		Base/Kernel
+Requires(post,postun):	/sbin/depmod
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+Requires(postun):	%releq_kernel_smp
+%endif
+
+%description -n kernel%{_alt_kernel}-smp-MODULE_DIR-MODULE_NAME
+This is driver for MODULE_NAME for Linux.
+
+This package contains Linux SMP module.
+
+%description -n kernel%{_alt_kernel}-smp-MODULE_DIR-MODULE_NAME -l pl.UTF-8
+Sterownik dla Linuksa do MODULE_NAME.
+
+Ten pakiet zawiera moduł jądra Linuksa SMP.
+
 %prep
 # prepare makefile:
 cat > path/to/dir/Makefile << EOF
@@ -140,12 +163,26 @@
 %postun	-n kernel%{_alt_kernel}-MODULE_DIR-MODULE_NAME
 %depmod %{_kernel_ver}
 
+%post	-n kernel%{_alt_kernel}-smp-MODULE_DIR-MODULE_NAME
+%depmod %{_kernel_ver}smp
+
+%postun	-n kernel%{_alt_kernel}-smp-MODULE_DIR-MODULE_NAME
+%depmod %{_kernel_ver}smp
+
 %if %{with kernel}
+%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-MODULE_DIR-MODULE_NAME
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/MODULE_DIR/*.ko*
 %endif
 
+%if %{with smp} && %{with dist_kernel}
+%files -n kernel%{_alt_kernel}-smp-MODULE_DIR-MODULE_NAME
+%defattr(644,root,root,755)
+/lib/modules/%{_kernel_ver}smp/MODULE_DIR/*.ko*
+%endif
+%endif
+
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -158,39 +195,6 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.49  2007-11-25 14:10:20  qboosh
-- use just rel, no point in prefixing local macros with underscore
-
-Revision 1.48  2007-11-19 09:23:55  glen
-- put to kernel/ dir or the parend dir won't be owned by anybody
-
-Revision 1.47  2007-04-12 15:17:43  shadzik
-- proper kernel-module-build version
-
-Revision 1.46  2007/03/16 10:06:15  pluto
-- merge up/smp kernel infrastructure. th will use only smp.
-
-Revision 1.45  2007/03/14 00:07:37  glen
-- default some version
-
-Revision 1.44  2007/02/12 22:09:17  glen
-- tabs in preamble
-
-Revision 1.43  2007/02/12 01:06:34  baggins
-- converted to UTF-8
-
-Revision 1.42  2007/01/28 14:48:58  sparky
-- allow building modules for smp-only kernel
-
-Revision 1.41  2007/01/24 19:21:17  glen
-- %if %{without ... are okay
-
-Revision 1.40  2006/11/14 20:36:22  sparky
-- BR: rpmbuild(macros) >= 1.330 -- build_kernel_modules fix for kernels 2.6.18
-
-Revision 1.39  2006/11/12 21:42:14  sparky
-- using %if %{without ...} may give problems after inverting bcond, don't use
+Revision 1.49.2.1  2008-02-27 18:19:12  glen
+- AC-branch two kernels
 
-Revision 1.38  2006/11/12 18:54:55  sparky
-- Makefile exemple
-- cut changelog
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/template-kernel-module.spec?r1=1.49&r2=1.49.2.1&f=u