rpms/kernel/devel kernel.spec,1.2013,1.2014

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24663

Modified Files:
	kernel.spec 
Log Message:
Remove mkinitrd ifdefs. Dracut or GTFO.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.2013
retrieving revision 1.2014
diff -u -p -r1.2013 -r1.2014
--- kernel.spec	3 Jun 2010 23:07:03 -0000	1.2013
+++ kernel.spec	8 Jun 2010 18:45:39 -0000	1.2014
@@ -121,8 +121,6 @@ Summary: The Linux kernel
 %define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1}
 # Want to build a the vsdo directories installed
 %define with_vdso_install %{?_without_vdso_install: 0} %{?!_without_vdso_install: 1}
-# Use dracut instead of mkinitrd for initrd image generation
-%define with_dracut       %{?_without_dracut:       0} %{?!_without_dracut:       1}
 
 # Build the kernel-doc package, but don't fail the build if it botches.
 # Here "true" means "continue" and "false" means "fail the build".
@@ -457,11 +455,7 @@ Summary: The Linux kernel
 # scripts use them.
 #
 %define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, grubby >= 7.0.10-1
-%if %{with_dracut}
 %define initrd_prereq  dracut >= 001-7
-%else
-%define initrd_prereq  mkinitrd >= 6.0.61-1
-%endif
 
 #
 # This macro does requires, provides, conflicts, obsoletes for a kernel package.
@@ -1517,13 +1511,11 @@ BuildKernel() {
     mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
     install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
     install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer
-%if %{with_dracut}
+
     # We estimate the size of the initramfs because rpm needs to take this size
     # into consideration when performing disk space calculations. (See bz #530778)
     dd if=/dev/zero of=$RPM_BUILD_ROOT/boot/initramfs-$KernelVer.img bs=1M count=20
-%else
-    dd if=/dev/zero of=$RPM_BUILD_ROOT/boot/initrd-$KernelVer.img bs=1M count=5
-%endif
+
     if [ -f arch/$Arch/boot/zImage.stub ]; then
       cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
     fi
@@ -1856,11 +1848,7 @@ fi\
 %define kernel_variant_posttrans() \
 %{expand:%%posttrans %{?1}}\
 %{expand:\
-%if %{with_dracut}\
 /sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --dracut --depmod --update %{KVERREL}%{?-v:.%{-v*}} || exit $?\
-%else\
-/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --update %{KVERREL}%{?-v:.%{-v*}} || exit $?\
-%endif}\
 /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --rpmposttrans %{KVERREL}%{?1:.%{1}} || exit $?\
 %{nil}
 
@@ -1998,11 +1986,7 @@ fi
 /etc/ld.so.conf.d/kernel-%{KVERREL}%{?2:.%{2}}.conf\
 %endif\
 /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.*\
-%if %{with_dracut}\
 %ghost /boot/initramfs-%{KVERREL}%{?2:.%{2}}.img\
-%else\
-%ghost /boot/initrd-%{KVERREL}%{?2:.%{2}}.img\
-%endif\
 %{expand:%%files %{?2:%{2}-}devel}\
 %defattr(-,root,root)\
 %verify(not mtime) /usr/src/kernels/%{KVERREL}%{?2:.%{2}}\
@@ -2049,6 +2033,9 @@ fi
 #                 ||     ||
 
 %changelog
+* Tue Jun 08 2010 Dave Jones <davej at redhat.com>
+- Remove mkinitrd ifdefs. Dracut or GTFO.
+
 * Thu Jun 03 2010 Kyle McMartin <kyle at redhat.com>
 - Build kernel headers on s390.