rpms/kernel/devel kernel.spec,1.1784,1.1785

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28084

Modified Files:
	kernel.spec 
Log Message:
* Wed Sep 09 2009 Hans de Goede <hdegoede at redhat.com>
- Move to %post generation of dracut initrd, because of GPL issues surrounding
  shipping a prebuild initrd
- Require grubby >= 7.0.4-1, for %post generation



Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1784
retrieving revision 1.1785
diff -u -p -r1.1784 -r1.1785
--- kernel.spec	9 Sep 2009 19:24:26 -0000	1.1784
+++ kernel.spec	9 Sep 2009 20:00:41 -0000	1.1785
@@ -100,7 +100,7 @@ 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}
-# dracut initrd-generic
+# 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.
@@ -430,7 +430,12 @@ Summary: The Linux kernel
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.61-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, grubby >= 7.0.2-1
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, grubby >= 7.0.4-1
+%if %{with_dracut}
+%define initrd_prereq  dracut-kernel >= 001-7
+%else
+%define initrd_prereq  mkinitrd >= 6.0.61-1
+%endif
 
 #
 # This macro does requires, provides, conflicts, obsoletes for a kernel package.
@@ -446,6 +451,7 @@ Provides: kernel-drm-nouveau = 15\
 Provides: kernel-modeset = 1\
 Provides: kernel-uname-r = %{KVERREL}%{?1:.%{1}}\
 Requires(pre): %{kernel_prereq}\
+Requires(pre): %{initrd_prereq}\
 Requires(post): /sbin/new-kernel-pkg\
 Requires(preun): /sbin/new-kernel-pkg\
 Conflicts: %{kernel_dot_org_conflicts}\
@@ -496,14 +502,6 @@ BuildRequires: sparse >= 0.4.1
 %if %{with_perftool}
 BuildRequires: elfutils-libelf-devel zlib-devel binutils-devel
 %endif
-%if %{with_dracut}
-BuildRequires: dracut-kernel >= 0.7
-BuildRequires: dracut-generic >= 0.7
-%endif
-# For dracut image generation, cannot go in dracut package as its arch specific
-%ifnarch s390 s390x
-BuildRequires: kbd
-%endif
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
 %define fancy_debuginfo 0
@@ -1785,26 +1783,6 @@ rm -f $RPM_BUILD_ROOT/usr/include/asm*/i
 make DESTDIR=$RPM_BUILD_ROOT bootwrapper_install WRAPPER_OBJDIR=%{_libdir}/kernel-wrapper WRAPPER_DTSDIR=%{_libdir}/kernel-wrapper/dts
 %endif
 
-%if %{with_dracut}
-%if !%{with_firmware}
-# dracut needs the firmware files
-    %{build_firmware}
-%endif
-    for i in $RPM_BUILD_ROOT/lib/modules/*; do
-	[ -d $i ] || continue
-	KernelVer=${i##$RPM_BUILD_ROOT/lib/modules/}
-        depmod -b $RPM_BUILD_ROOT $KernelVer
-    	dracut  --strip \
-	    --fwdir $RPM_BUILD_ROOT/lib/firmware:/lib/firmware \
-            -k $i $RPM_BUILD_ROOT/boot/initrd-generic-${KernelVer}.img $KernelVer
-	rm -fr $i/modules.dep
-    done
-%if !%{with_firmware}
-# remove the firmware files, if ! with_firmware
-    rm -fr $RPM_BUILD_ROOT/lib/firmware
-%endif
-%endif
-
 
 ###
 ### clean
@@ -1861,7 +1839,7 @@ if [ `uname -i` == "x86_64" -o `uname -i
 fi}\
 %{expand:\
 %if %{with_dracut}\
-/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --depmod --add-dracut-args --initrdfile=/boot/initrd-generic-%{KVERREL}%{?-v:.%{-v*}}.img --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\
+/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --dracut --depmod --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\
 %else\
 /sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --install %{KVERREL}%{?-v:.%{-v*}} || exit $?\
 %endif}\
@@ -1984,9 +1962,10 @@ fi
 /etc/ld.so.conf.d/kernel-%{KVERREL}%{?2:.%{2}}.conf\
 %endif\
 /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.*\
-%ghost /boot/initrd-%{KVERREL}%{?2:.%{2}}.img\
 %if %{with_dracut}\
-/boot/initrd-generic-%{KVERREL}%{?2:.%{2}}.img\
+%ghost /boot/dracut-%{KVERREL}%{?2:.%{2}}.img\
+%else\
+%ghost /boot/initrd-%{KVERREL}%{?2:.%{2}}.img\
 %endif\
 %{expand:%%files %{?2:%{2}-}devel}\
 %defattr(-,root,root)\
@@ -2027,6 +2006,11 @@ fi
 # and build.
 
 %changelog
+* Wed Sep 09 2009 Hans de Goede <hdegoede at redhat.com>
+- Move to %%post generation of dracut initrd, because of GPL issues surrounding
+  shipping a prebuild initrd
+- Require grubby >= 7.0.4-1, for %%post generation
+
 * Wed Sep  9 2009 Steve Dickson <steved at redhat.com>
 - Updated the NFS4 pseudo root code to the latest release.