SPECS: kernel-desktop.spec - reenabled preempt_ppc_fix patch - /bo...

[sparky]

Author: sparky                       Date: Tue Jun 13 10:06:41 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- reenabled preempt_ppc_fix patch
- /boot/{vmlinu[zx],inidts,System.map} renamed with -desktop suffix, for not
  to conflict with normal kernel

---- Files affected:
SPECS:
   kernel-desktop.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.16 SPECS/kernel-desktop.spec:1.17
--- SPECS/kernel-desktop.spec:1.16	Tue Jun 13 00:55:23 2006
+++ SPECS/kernel-desktop.spec	Tue Jun 13 12:06:36 2006
@@ -694,7 +694,7 @@
 
 #%%patch60 -p1
 
-#%%patch300 -p1
+%patch300 -p1
 
 %if %{with grsec_minimal}
 %patch1000 -p1
@@ -972,16 +972,24 @@
 fi
 
 %post
-mv -f /boot/vmlinuz /boot/vmlinuz.old 2> /dev/null > /dev/null
-mv -f /boot/System.map /boot/System.map.old 2> /dev/null > /dev/null
-ln -sf vmlinuz-%{ver_rel} /boot/vmlinuz
-ln -sf System.map-%{ver_rel} /boot/System.map
+mv -f /boot/vmlinuz-%{_alt_kernel} /boot/vmlinuz-%{_alt_kernel}.old 2> /dev/null > /dev/null
+mv -f /boot/System.map-%{_alt_kernel} /boot/System.map.old-%{_alt_kernel} 2> /dev/null > /dev/null
+ln -sf vmlinuz-%{ver_rel} /boot/vmlinuz-%{_alt_kernel}
+ln -sf System.map-%{ver_rel} /boot/System.map-%{_alt_kernel}
+if [ ! -e /boot/vmlinuz ]; then
+	mv -f /boot/vmlinuz /boot/vmlinuz.old 2> /dev/null > /dev/null
+	mv -f /boot/System.map /boot/System.map.old 2> /dev/null > /dev/null
+	ln -sf vmlinuz-%{ver_rel} /boot/vmlinuz
+	ln -sf System.map-%{_alt_kernel} /boot/System.map
+	mv -f %{initrd_dir}/initrd %{initrd_dir}/initrd.old 2> /dev/null > /dev/null
+	ln -sf %{initrd_dir}/initrd-%{_alt_kernel} %{initrd_dir}/initrd
+fi
 
 %depmod %{ver_rel}
 
 /sbin/geninitrd -f --initrdfs=rom %{initrd_dir}/initrd-%{ver_rel}.gz %{ver_rel}
-mv -f %{initrd_dir}/initrd %{initrd_dir}/initrd.old 2> /dev/null > /dev/null
-ln -sf initrd-%{ver_rel}.gz %{initrd_dir}/initrd
+mv -f %{initrd_dir}/initrd-%{_alt_kernel} %{initrd_dir}/initrd.old-%{_alt_kernel} 2> /dev/null > /dev/null
+ln -sf initrd-%{ver_rel}.gz %{initrd_dir}/initrd-%{_alt_kernel}
 
 if [ -x /sbin/new-kernel-pkg ]; then
 	if [ -f /etc/pld-release ]; then
@@ -998,8 +1006,8 @@
 fi
 
 %post vmlinux
-mv -f /boot/vmlinux /boot/vmlinux.old 2> /dev/null > /dev/null
-ln -sf vmlinux-%{ver_rel} /boot/vmlinux
+mv -f /boot/vmlinux-%{_alt_kernel} /boot/vmlinux.old-%{_alt_kernel} 2> /dev/null > /dev/null
+ln -sf vmlinux-%{ver_rel} /boot/vmlinux-%{_alt_kernel}
 
 %post drm
 %depmod %{ver_rel}
@@ -1032,16 +1040,24 @@
 fi
 
 %post smp
-mv -f /boot/vmlinuz /boot/vmlinuz.old 2> /dev/null > /dev/null
-mv -f /boot/System.map /boot/System.map.old 2> /dev/null > /dev/null
-ln -sf vmlinuz-%{ver_rel}smp /boot/vmlinuz
-ln -sf System.map-%{ver_rel}smp /boot/System.map
+mv -f /boot/vmlinuz-%{_alt_kernel} /boot/vmlinuz.old-%{_alt_kernel} 2> /dev/null > /dev/null
+mv -f /boot/System.map-%{_alt_kernel} /boot/System.map.old-%{_alt_kernel} 2> /dev/null > /dev/null
+ln -sf vmlinuz-%{ver_rel}smp /boot/vmlinuz-%{_alt_kernel}
+ln -sf System.map-%{ver_rel}smp /boot/System.map-%{_alt_kernel}
+if [ ! -e /boot/vmlinuz ]; then
+	mv -f /boot/vmlinuz /boot/vmlinuz.old 2> /dev/null > /dev/null
+	mv -f /boot/System.map /boot/System.map.old 2> /dev/null > /dev/null
+	ln -sf vmlinuz-%{ver_rel} /boot/vmlinuz
+	ln -sf System.map-%{ver_rel} /boot/System.map
+	mv -f %{initrd_dir}/initrd %{initrd_dir}/initrd.old 2> /dev/null > /dev/null
+	ln -sf %{initrd_dir}/initrd-%{_alt_kernel} %{initrd_dir}/initrd
+fi
 
 %depmod %{ver_rel}smp
 
 /sbin/geninitrd -f --initrdfs=rom %{initrd_dir}/initrd-%{ver_rel}smp.gz %{ver_rel}smp
-mv -f %{initrd_dir}/initrd %{initrd_dir}/initrd.old 2> /dev/null > /dev/null
-ln -sf initrd-%{ver_rel}smp.gz %{initrd_dir}/initrd
+mv -f %{initrd_dir}/initrd-%{_alt_kernel} %{initrd_dir}/initrd.old-%{_alt_kernel} 2> /dev/null > /dev/null
+ln -sf initrd-%{ver_rel}smp.gz %{initrd_dir}/initrd-%{_alt_kernel}
 
 if [ -x /sbin/new-kernel-pkg ]; then
 	if [ -f /etc/pld-release ]; then
@@ -1058,8 +1074,8 @@
 fi
 
 %post smp-vmlinux
-mv -f /boot/vmlinux /boot/vmlinux.old 2> /dev/null > /dev/null
-ln -sf vmlinux-%{ver_rel}smp /boot/vmlinux
+mv -f /boot/vmlinux-%{_alt_kernel} /boot/vmlinux.old-%{_alt_kernel} 2> /dev/null > /dev/null
+ln -sf vmlinux-%{ver_rel}smp /boot/vmlinux-%{_alt_kernel}
 
 %post smp-drm
 %depmod %{ver_rel}smp
@@ -1365,6 +1381,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2006/06/13 10:06:36  sparky
+- reenabled preempt_ppc_fix patch
+- /boot/{vmlinu[zx],inidts,System.map} renamed with -desktop suffix, for not
+  to conflict with normal kernel
+
 Revision 1.16  2006/06/12 22:55:23  sparky
 - (re)organised .config creating
 
================================================================

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