SPECS (LINUX_2_6_16): kernel.spec - nicer /boot symlinks names (e....

[jajcus]

Author: jajcus                       Date: Fri Jun 30 12:51:40 2006 GMT
Module: SPECS                         Tag: LINUX_2_6_16
---- Log message:
- nicer /boot symlinks names (e.g. vmlinuz-xen0 instead of vmlinuzxen0)

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1558.2.7 -> 1.441.2.1558.2.8) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1558.2.7 SPECS/kernel.spec:1.441.2.1558.2.8
--- SPECS/kernel.spec:1.441.2.1558.2.7	Fri Jun 30 14:27:26 2006
+++ SPECS/kernel.spec	Fri Jun 30 14:51:34 2006
@@ -67,13 +67,16 @@
 
 %if %{with xen0} 
 %define		xen	xen0
-%define		pae		1
+%define		dashxen	\-xen0
+%define		pae	1
 %else
 %if %{with xenU}
 %define		xen	xenU
-%define		pae		1
+%define		dashxen	\-xenU
+%define		pae	1
 %else
 %define		xen	%{nil}
+%define		dashxen	%{nil}
 %endif
 %endif
 
@@ -1182,22 +1185,22 @@
 
 %post
 %ifarch ia64
-mv -f /boot/efi/vmlinuz%{xen} /boot/efi/vmlinuz%{xen}.old 2> /dev/null > /dev/null
+mv -f /boot/efi/vmlinuz%{dashxen} /boot/efi/vmlinuz%{dashxen}.old 2> /dev/null > /dev/null
 %endif
-mv -f /boot/vmlinuz%{xen} /boot/vmlinuz%{xen}.old 2> /dev/null > /dev/null
-mv -f /boot/System.map%{xen} /boot/System.map%{xen}.old 2> /dev/null > /dev/null
+mv -f /boot/vmlinuz%{dashxen} /boot/vmlinuz%{dashxen}.old 2> /dev/null > /dev/null
+mv -f /boot/System.map%{dashxen} /boot/System.map%{dashxen}.old 2> /dev/null > /dev/null
 %ifarch ia64
-ln -sf vmlinuz-%{version}-%{release}%{xen} /boot/efi/vmlinuz%{xen}
+ln -sf vmlinuz-%{version}-%{release}%{xen} /boot/efi/vmlinuz%{dashxen}
 %endif
-ln -sf vmlinuz-%{version}-%{release}%{xen} /boot/vmlinuz%{xen}
-ln -sf System.map-%{version}-%{release}%{xen} /boot/System.map%{xen}
+ln -sf vmlinuz-%{version}-%{release}%{xen} /boot/vmlinuz%{dashxen}
+ln -sf System.map-%{version}-%{release}%{xen} /boot/System.map%{dashxen}
 
 %depmod %{version}-%{release}%{xen}
 
 %if %{without xenU}
 /sbin/geninitrd -f --initrdfs=rom %{initrd_dir}/initrd-%{version}-%{release}%{xen}.gz %{version}-%{release}%{xen}
-mv -f %{initrd_dir}/initrd%{xen} %{initrd_dir}/initrd%{xen}.old 2> /dev/null > /dev/null
-ln -sf initrd-%{version}-%{release}%{xen}.gz %{initrd_dir}/initrd%{xen}
+mv -f %{initrd_dir}/initrd%{dashxen} %{initrd_dir}/initrd%{dashxen}.old 2> /dev/null > /dev/null
+ln -sf initrd-%{version}-%{release}%{xen}.gz %{initrd_dir}/initrd%{dashxen}
 
 if [ -x /sbin/new-kernel-pkg ]; then
 	if [ -f /etc/pld-release ]; then
@@ -1218,8 +1221,8 @@
 %endif
 
 %post vmlinux
-mv -f /boot/vmlinux%{xen} /boot/vmlinux%{xen}.old 2> /dev/null > /dev/null
-ln -sf vmlinux-%{version}-%{release}%{xen} /boot/vmlinux%{xen}
+mv -f /boot/vmlinux%{dashxen} /boot/vmlinux%{dashxen}.old 2> /dev/null > /dev/null
+ln -sf vmlinux-%{version}-%{release}%{xen} /boot/vmlinux%{dashxen}
 
 %post libs
 %{_sbindir}/mkvmlinuz /boot/zImage-%{version}-%{release} %{version}-%{release}
@@ -1258,19 +1261,19 @@
 %ifarch ia64
 mv -f /boot/efi/vmlinuz /boot/efi/vmlinuz.old 2> /dev/null > /dev/null
 %endif
-mv -f /boot/vmlinuz%{xen} /boot/vmlinuz%{xen}.old 2> /dev/null > /dev/null
-mv -f /boot/System.map%{xen} /boot/System.map%{xen}.old 2> /dev/null > /dev/null
+mv -f /boot/vmlinuz%{dashxen} /boot/vmlinuz%{dashxen}.old 2> /dev/null > /dev/null
+mv -f /boot/System.map%{dashxen} /boot/System.map%{dashxen}.old 2> /dev/null > /dev/null
 %ifarch ia64
 ln -sf vmlinuz-%{version}-%{release}smp /boot/efi/vmlinuz
 %endif
-ln -sf vmlinuz-%{version}-%{release}%{xen}smp /boot/vmlinuz%{xen}
-ln -sf System.map-%{version}-%{release}%{xen}smp /boot/System.map%{xen}
+ln -sf vmlinuz-%{version}-%{release}%{xen}smp /boot/vmlinuz%{dashxen}
+ln -sf System.map-%{version}-%{release}%{xen}smp /boot/System.map%{dashxen}
 
 %depmod %{version}-%{release}%{xen}smp
 
 /sbin/geninitrd -f --initrdfs=rom %{initrd_dir}/initrd-%{version}-%{release}%{xen}smp.gz %{version}-%{release}%{xen}smp
-mv -f %{initrd_dir}/initrd%{xen} %{initrd_dir}/initrd%{xen}.old 2> /dev/null > /dev/null
-ln -sf initrd-%{version}-%{release}%{xen}smp.gz %{initrd_dir}/initrd%{xen}
+mv -f %{initrd_dir}/initrd%{dashxen} %{initrd_dir}/initrd%{dashxen}.old 2> /dev/null > /dev/null
+ln -sf initrd-%{version}-%{release}%{xen}smp.gz %{initrd_dir}/initrd%{dashxen}
 
 if [ -x /sbin/new-kernel-pkg ]; then
 	if [ -f /etc/pld-release ]; then
@@ -1290,8 +1293,8 @@
 fi
 
 %post smp-vmlinux
-mv -f /boot/vmlinux%{xen} /boot/vmlinux%{xen}.old 2> /dev/null > /dev/null
-ln -sf vmlinux-%{version}-%{release}%{xen}smp /boot/vmlinux%{xen}
+mv -f /boot/vmlinux%{dashxen} /boot/vmlinux%{dashxen}.old 2> /dev/null > /dev/null
+ln -sf vmlinux-%{version}-%{release}%{xen}smp /boot/vmlinux%{dashxen}
 
 %post smp-libs
 %{_sbindir}/mkvmlinuz /boot/zImage-%{version}-%{release}smp %{version}-%{release}smp
@@ -1647,6 +1650,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1558.2.8  2006/06/30 12:51:34  jajcus
+- nicer /boot symlinks names (e.g. vmlinuz-xen0 instead of vmlinuzxen0)
+
 Revision 1.441.2.1558.2.7  2006/06/30 12:27:26  jajcus
 - Release: 3
 - Xen bconds made work
================================================================

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