SPECS (LINUX_2_6): kernel.spec - backport vesa related fix from 2....

[pluto]

Author: pluto                        Date: Wed Apr  9 11:33:35 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- backport vesa related fix from 2.6.25-rcX.
- little fix for /boot symlinks (support alt_kernel, drop .old trash).

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1861 -> 1.441.2.1862) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1861 SPECS/kernel.spec:1.441.2.1862
--- SPECS/kernel.spec:1.441.2.1861	Wed Apr  9 03:04:27 2008
+++ SPECS/kernel.spec	Wed Apr  9 13:33:29 2008
@@ -305,6 +305,11 @@
 Patch71:	linux-2.6-suspend2-page.patch
 Patch72:	kernel-2.6-ueagle-atm-freezer.patch
 
+# VESA related fixes (from 2.6.25-rcX).
+Patch75:	kernel-display_vesa_modes_in_vgaask_menu.patch
+Patch76:	kernel-dont_request_vbe2_info.patch
+Patch77:	kernel-uvesafb-upstream.patch
+
 # adds some ids for hostap suported cards and monitor_enable from/for aircrack-ng
 # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
 Patch85:	hostap-kernel-2.6.18.patch
@@ -887,6 +892,11 @@
 # linux-2.6-sk98lin_v10.0.4.3.patch
 #patch60 -p1
 
+# 2.6.25-rcX vesa fixes.
+%patch75 -p1
+%patch76 -p1
+%patch77 -p1
+
 # hostap enhancements from/for aircrack-ng
 %patch85 -p1
 
@@ -1414,21 +1424,15 @@
 
 %post
 %ifarch ia64
-mv -f /boot/efi/vmlinuz /boot/efi/vmlinuz.old 2> /dev/null > /dev/null
+ln -sf vmlinuz-%{kernel_release} /boot/efi/vmlinuz%{subname}
 %endif
-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
-%ifarch ia64
-ln -sf vmlinuz-%{kernel_release} /boot/efi/vmlinuz
-%endif
-ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz
-ln -sf System.map-%{kernel_release} /boot/System.map
+ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz%{subname}
+ln -sf System.map-%{kernel_release} /boot/System.map%{subname}
 
 %depmod %{kernel_release}
 
 /sbin/geninitrd -f --initrdfs=rom %{initrd_dir}/initrd-%{kernel_release}.gz %{kernel_release}
-mv -f %{initrd_dir}/initrd %{initrd_dir}/initrd.old 2> /dev/null > /dev/null
-ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd
+ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd%{subname}
 
 if [ -x /sbin/new-kernel-pkg ]; then
 	if [ -f /etc/pld-release ]; then
@@ -1448,8 +1452,7 @@
 fi
 
 %post vmlinux
-mv -f /boot/vmlinux /boot/vmlinux.old 2> /dev/null > /dev/null
-ln -sf vmlinux-%{kernel_release} /boot/vmlinux
+ln -sf vmlinux-%{kernel_release} /boot/vmlinux%{subname}
 
 %post libs
 %{_sbindir}/mkvmlinuz /boot/zImage-%{kernel_release} %{kernel_release}
@@ -1700,6 +1703,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1862  2008-04-09 11:33:29  pluto
+- backport vesa related fix from 2.6.25-rcX.
+- little fix for /boot symlinks (support alt_kernel, drop .old trash).
+
 Revision 1.441.2.1861  2008-04-09 01:04:27  zbyniu
 - merged KABI, module-build symlinks from LINUX_2_6_22
 
================================================================

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