SPECS (LINUX_2_6): kernel.spec - merged subname/alt_kernel support...

[qboosh]

Author: qboosh                       Date: Tue Jun 26 17:31:58 2007 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- merged subname/alt_kernel support from LINUX_2_6_16 branch

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1732 -> 1.441.2.1733) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1732 SPECS/kernel.spec:1.441.2.1733
--- SPECS/kernel.spec:1.441.2.1732	Mon Jun 11 22:34:59 2007
+++ SPECS/kernel.spec	Tue Jun 26 19:31:52 2007
@@ -121,6 +121,7 @@
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
 %define		_rel			0.1
+%define		subname			%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
 
 %define		_netfilter_snap		20061213
 %define		_nf_hipac_ver		0.9.1
@@ -142,7 +143,7 @@
 Summary(et.UTF-8):	Linuxi kernel (ehk operatsioonisĂźsteemi tuum)
 Summary(fr.UTF-8):	Le Kernel-Linux (La partie centrale du systeme)
 Summary(pl.UTF-8):	JÄ
dro Linuksa
-Name:		kernel%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
+Name:		kernel%{subname}
 
 %if "%{_prepatch}" == "%{nil}"
 Version:	%{_basever}%{_postver}
@@ -431,7 +432,7 @@
 # _localversion is just that without version for "> localversion"
 %define		_localversion %{release}
 %define		kernel_release %{version}-%{_localversion}
-%define		_kernelsrcdir	/usr/src/linux-%{version}
+%define		_kernelsrcdir	/usr/src/linux%{subname}-%{version}
 
 %if "%{_target_base_arch}" != "%{_arch}"
 	%define	CrossOpts ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-
@@ -1407,14 +1408,14 @@
 %depmod %{kernel_release}
 
 %post headers
-rm -f %{_prefix}/src/linux
-ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux
+rm -f %{_prefix}/src/linux%{subname}
+ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{subname}
 
 %postun headers
 if [ "$1" = "0" ]; then
-	if [ -L %{_prefix}/src/linux ]; then
-		if [ "$(readlink %{_prefix}/src/linux)" = "linux-%{version}" ]; then
-			rm -f %{_prefix}/src/linux
+	if [ -L %{_prefix}/src/linux%{subname} ]; then
+		if [ "$(readlink %{_prefix}/src/linux%{subname})" = "linux%{subname}-%{version}" ]; then
+			rm -f %{_prefix}/src/linux%{subname}
 		fi
 	fi
 fi
@@ -1622,6 +1623,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1733  2007/06/26 17:31:52  qboosh
+- merged subname/alt_kernel support from LINUX_2_6_16 branch
+
 Revision 1.441.2.1732  2007/06/11 20:34:59  arekm
 - up to 2.6.21.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1732&r2=1.441.2.1733&f=u