rpms/kernel/devel kernel.spec,1.1670,1.1671

[Dave Jones]

Author: davej

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

Modified Files:
	kernel.spec 
Log Message:
Add support for dracut. (Harald Hoyer)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1670
retrieving revision 1.1671
diff -u -p -r1.1670 -r1.1671
--- kernel.spec	29 Jul 2009 05:57:23 -0000	1.1670
+++ kernel.spec	29 Jul 2009 17:24:50 -0000	1.1671
@@ -100,6 +100,8 @@ 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
+%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".
@@ -488,6 +490,10 @@ 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
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
 %define fancy_debuginfo 0
@@ -1693,6 +1699,27 @@ make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib
 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
+    make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install
+%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
 ###
@@ -1864,6 +1891,9 @@ fi
 %endif\
 /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.*\
 %ghost /boot/initrd-%{KVERREL}%{?2:.%{2}}.img\
+%if %{with_dracut}\
+/boot/initrd-generic-%{KVERREL}%{?2:.%{2}}.img\
+%endif\
 %{expand:%%files %{?2:%{2}-}devel}\
 %defattr(-,root,root)\
 %dir /usr/src/kernels\
@@ -1903,6 +1933,9 @@ fi
 # and build.
 
 %changelog
+* Wed Jul 29 2009 Dave Jones <davej at redhat.com>
+- Add support for dracut. (Harald Hoyer)
+
 * Wed Jul 29 2009 Ben Skeggs <bskeggs at redhat.com>
 - drm-nouveau.patch: nv50/nva0 tiled scanout fixes, nv40 kms fixes