SPECS (LINUX_2_6_16): kernel.spec - fix {build, source} symlinks - ...

[glen]

Author: glen                         Date: Wed Feb 13 17:03:50 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_16
---- Log message:
- fix {build,source} symlinks
- added %{subname} to kernel_release to allow simultaneous installation
  of normal and grsecurity kernel (there was conflict on
  /lib/modules/%{version}-%{release})
- provide %{name}(vermagic) for module deps
- rel 5

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1558.2.134 -> 1.441.2.1558.2.135) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1558.2.134 SPECS/kernel.spec:1.441.2.1558.2.135
--- SPECS/kernel.spec:1.441.2.1558.2.134	Wed Feb 13 10:42:33 2008
+++ SPECS/kernel.spec	Wed Feb 13 18:03:45 2008
@@ -126,9 +126,19 @@
 
 %define		xen_version		3.0.2
 
+# Our Kernel ABI, increase this when you want out of source modules being rebuilt
+# Usually same as %{_rel}
+%define		KABI		5
+
+# kernel release (used in filesystem and eventually in uname -r)
+# modules will be looked from /lib/modules/%{kernel_release}%{?smp}
+# _localversion is just that without version for "> localversion"
+%define		_localversion %{KABI}%{xen}
+%define		kernel_release %{version}%{subname}-%{_localversion}
+
 %define		_basever	2.6.16
 %define		_postver	.60
-%define		_rel		4
+%define		_rel		5
 %define		subname	%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de.UTF-8):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
@@ -345,6 +355,7 @@
 Requires:	geninitrd >= 2.57
 Requires:	module-init-tools >= 0.9.9
 Provides:	%{name}(netfilter) = %{netfilter_snap}
+Provides:	%{name}(vermagic) = %{kernel_release}
 Provides:	%{name}-up = %{epoch}:%{version}-%{release}
 %if %{with xen0}
 Provides:	kernel(xen0) = %{xen_version}
@@ -389,11 +400,6 @@
 %define		initrd_dir	/boot
 %endif
 
-# kernel release (used in filesystem and eventually in uname -r)
-# modules will be looked from /lib/modules/%{kernel_release}%{?smp}
-# _localversion is just that without version for "> localversion"
-%define		_localversion %{release}%{xen}
-%define		kernel_release %{version}-%{_localversion}
 %define		_kernelsrcdir	/usr/src/linux%{subname}-%{version}
 
 %if "%{_target_base_arch}" != "%{_arch}"
@@ -567,6 +573,7 @@
 Requires:	geninitrd >= 2.26
 Requires:	module-init-tools >= 0.9.9
 Provides:	%{name}(netfilter) = %{netfilter_snap}
+Provides:	%{name}-smp(vermagic) = %{kernel_release}
 %if %{with xen0}
 Provides:	kernel(xen0) = %{xen_version}
 %endif
@@ -964,7 +971,7 @@
 %endif
 
 # Fix EXTRAVERSION in main Makefile
-sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}#g' Makefile
+sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}%{subname}#g' Makefile
 
 # on sparc this line causes CONFIG_INPUT=m (instead of =y), thus breaking build
 sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig
@@ -1325,8 +1332,8 @@
 %if %{with up} || %{with smp}
 # ghosted initrd
 touch $RPM_BUILD_ROOT/boot/initrd-%{kernel_release}{,smp}.gz
-rm -f /lib/modules/%{kernel_release}{,smp}/{build,source}
-touch /lib/modules/%{kernel_release}{,smp}/{build,source}
+rm -f $RPM_BUILD_ROOT/lib/modules/%{kernel_release}{,smp}/{build,source}
+touch $RPM_BUILD_ROOT/lib/modules/%{kernel_release}{,smp}/{build,source}
 %endif
 
 %clean
@@ -1826,6 +1833,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1558.2.135  2008-02-13 17:03:45  glen
+- fix {build,source} symlinks
+- added %{subname} to kernel_release to allow simultaneous installation
+  of normal and grsecurity kernel (there was conflict on
+  /lib/modules/%{version}-%{release})
+- provide %{name}(vermagic) for module deps
+- rel 5
+
 Revision 1.441.2.1558.2.134  2008-02-13 09:42:33  glen
 - move build and source symlinks to main pkg and use triggers to make links (fixes grsec and plain module-build collision)
 
================================================================

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