SPECS: kernel-desktop.spec - cleanups

[glen]

Author: glen                         Date: Sun Oct 28 19:39:06 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanups

---- Files affected:
SPECS:
   kernel-desktop.spec (1.131 -> 1.132) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.131 SPECS/kernel-desktop.spec:1.132
--- SPECS/kernel-desktop.spec:1.131	Mon Oct 22 21:00:31 2007
+++ SPECS/kernel-desktop.spec	Sun Oct 28 20:39:00 2007
@@ -92,7 +92,7 @@
 
 %define		_basever	2.6.22
 %define		_postver	.10
-%define		_rel		0.6
+%define		_rel		0.8
 %define		_rc	%{nil}
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de.UTF-8):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
@@ -840,20 +840,18 @@
 
 KERNEL_BUILD_DIR=$(pwd)
 
-
-# Install modules
-
 install System.map $RPM_BUILD_ROOT/boot/System.map-%{kernel_release}
 %ifarch %{ix86} %{x8664}
-	install arch/%{_target_base_arch}/boot/bzImage $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
+install arch/%{_target_base_arch}/boot/bzImage $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
 %endif
 
 %ifarch ppc
-	install vmlinux $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
+install vmlinux $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release}
+%else
+install vmlinux $RPM_BUILD_ROOT/boot/vmlinux-%{kernel_release}
 %endif
-	install vmlinux $RPM_BUILD_ROOT/boot/vmlinux-%{kernel_release}
 
-#export DEPMOD=%{DepMod}
+# Install modules
 %{__make} %{MakeOpts} modules_install \
 	%{?with_verbose:V=1} \
 	DEPMOD=%{DepMod} \
@@ -869,22 +867,17 @@
 		&& echo "OK" || echo "FAILED"
 %endif
 
-
 rm -f $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/build
 ln -sf %{_kernelsrcdir} $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/build
 install -d $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/{cluster,misc}
 
 find . -maxdepth 1 -name "." -exec cp -a$l "{}" "$RPM_BUILD_ROOT%{_kernelsrcdir}/" ";"
 
-install Module.symvers \
-	$RPM_BUILD_ROOT%{_kernelsrcdir}/Module.symvers-dist
-install include/linux/autoconf.h \
-	$RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/autoconf-dist.h
-install .config \
-	$RPM_BUILD_ROOT%{_kernelsrcdir}/config-dist
+install Module.symvers $RPM_BUILD_ROOT%{_kernelsrcdir}/Module.symvers-dist
+install include/linux/autoconf.h $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/autoconf-dist.h
+install .config $RPM_BUILD_ROOT%{_kernelsrcdir}/config-dist
 
 cd $RPM_BUILD_ROOT%{_kernelsrcdir}
-
 %{__make} %{MakeOpts} mrproper
 
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -896,7 +889,7 @@
 # collect module-build files and directories
 %{__perl} %{SOURCE5} %{_kernelsrcdir} $KERNEL_BUILD_DIR
 
-# ghosted initrd
+# ghost initrd not to leave images around when pkg is uninstalled
 touch $RPM_BUILD_ROOT/boot/initrd-%{kernel_release}.gz
 
 %clean
@@ -909,23 +902,23 @@
 fi
 
 %post
-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-%{alt_kernel}.old 2> /dev/null > /dev/null
+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-%{alt_kernel}.old 2>/dev/null > /dev/null
 ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz-%{alt_kernel}
 ln -sf System.map-%{kernel_release} /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
+	mv -f /boot/vmlinuz /boot/vmlinuz.old 2>/dev/null
+	mv -f /boot/System.map /boot/System.map.old 2>/dev/null
 	ln -sf vmlinuz-%{alt_kernel} /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
+	mv -f %{initrd_dir}/initrd %{initrd_dir}/initrd.old 2>/dev/null
 	ln -sf initrd-%{alt_kernel} %{initrd_dir}/initrd
 fi
 
 %depmod %{kernel_release}
 
 /sbin/geninitrd -f --initrdfs=initramfs %{?with_bootsplash:--with-bootsplash} %{?with_fbsplash:--with-fbsplash} --with-suspend2 %{initrd_dir}/initrd-%{kernel_release}.gz %{kernel_release}
-mv -f %{initrd_dir}/initrd-%{alt_kernel} %{initrd_dir}/initrd-%{alt_kernel}.old 2> /dev/null > /dev/null
+mv -f %{initrd_dir}/initrd-%{alt_kernel} %{initrd_dir}/initrd-%{alt_kernel}.old 2>/dev/null
 ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd-%{alt_kernel}
 
 if [ -x /sbin/new-kernel-pkg ]; then
@@ -943,7 +936,7 @@
 fi
 
 %post vmlinux
-mv -f /boot/vmlinux-%{alt_kernel} /boot/vmlinux-%{alt_kernel}.old 2> /dev/null > /dev/null
+mv -f /boot/vmlinux-%{alt_kernel} /boot/vmlinux-%{alt_kernel}.old 2>/dev/null
 ln -sf vmlinux-%{kernel_release} /boot/vmlinux-%{alt_kernel}
 
 %post drm
@@ -1128,6 +1121,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.132  2007/10/28 19:39:00  glen
+- cleanups
+
 Revision 1.131  2007/10/22 19:00:31  glen
 - re-adapter after fixed adapter.awk
 
================================================================

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