packages: kernel-xenU/kernel-xenU.spec - do not create geninitrd - do not t...

[pawelz]

Author: pawelz                       Date: Mon Nov  8 13:47:03 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not create geninitrd
- do not try to configure it in boot loader

---- Files affected:
packages/kernel-xenU:
   kernel-xenU.spec (1.52 -> 1.53) 

---- Diffs:

================================================================
Index: packages/kernel-xenU/kernel-xenU.spec
diff -u packages/kernel-xenU/kernel-xenU.spec:1.52 packages/kernel-xenU/kernel-xenU.spec:1.53
--- packages/kernel-xenU/kernel-xenU.spec:1.52	Thu Nov  4 13:58:59 2010
+++ packages/kernel-xenU/kernel-xenU.spec	Mon Nov  8 14:46:57 2010
@@ -67,11 +67,9 @@
 BuildRequires:	rpmbuild(macros) >= 1.217
 Autoreqprov:	no
 Requires(post):	coreutils
-Requires(post):	geninitrd >= 2.57
 Requires(post):	module-init-tools >= 0.9.9
 Requires:	/sbin/depmod
 Requires:	coreutils
-Requires:	geninitrd >= 2.57
 Requires:	module-init-tools >= 0.9.9
 Obsoletes:	kernel%{_alt_kernel}-isdn-mISDN
 Obsoletes:	kernel-misc-acer_acpi
@@ -532,24 +530,6 @@
 
 %depmod %{kernel_release}
 
-/sbin/geninitrd -f --initrdfs=rom %{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
-ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd-%{alt_kernel}
-
-if [ -x /sbin/new-kernel-pkg ]; then
-	if [ -f /etc/pld-release ]; then
-		title=$(sed 's/^[0-9.]\+ //' < /etc/pld-release)
-	else
-		title='PLD Linux'
-	fi
-
-	title="$title %{alt_kernel}"
-
-	/sbin/new-kernel-pkg --initrdfile=%{initrd_dir}/initrd-%{kernel_release}.gz --install %{kernel_release} --banner "$title"
-elif [ -x /sbin/rc-boot ]; then
-	/sbin/rc-boot 1>&2 || :
-fi
-
 %post vmlinux
 mv -f /boot/vmlinux-%{alt_kernel} /boot/vmlinux-%{alt_kernel}.old 2> /dev/null > /dev/null
 ln -sf vmlinux-%{kernel_release} /boot/vmlinux-%{alt_kernel}
@@ -579,7 +559,6 @@
 %defattr(644,root,root,755)
 /boot/vmlinuz-%{kernel_release}
 /boot/System.map-%{kernel_release}
-%ghost %{initrd_dir}/initrd-%{kernel_release}.gz
 %dir /lib/modules/%{kernel_release}
 %dir /lib/modules/%{kernel_release}/kernel
 /lib/modules/%{kernel_release}/kernel/arch
@@ -691,6 +670,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2010/11/08 13:46:57  pawelz
+- do not create geninitrd
+- do not try to configure it in boot loader
+
 Revision 1.52  2010/11/04 12:58:59  pawelz
 - up to 2.6.35.8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-xenU/kernel-xenU.spec?r1=1.52&r2=1.53&f=u