rpms/kernel/F-12 kernel.spec,1.1848,1.1849

Dave Jones davej at fedoraproject.org
Thu Oct 8 00:26:34 UTC 2009


Author: davej

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8587

Modified Files:
	kernel.spec 
Log Message:
Don't mark the initramfs file as a ghost.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1848
retrieving revision 1.1849
diff -u -p -r1.1848 -r1.1849
--- kernel.spec	7 Oct 2009 23:42:37 -0000	1.1848
+++ kernel.spec	8 Oct 2009 00:26:32 -0000	1.1849
@@ -1555,6 +1555,11 @@ EOF
     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}
+    touch $RPM_BUILD_ROOT/boot/initramfs-$KernelVer.img
+%else
+    touch $RPM_BUILD_ROOT/boot/initrd-$KernelVer.img
+%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
@@ -2031,9 +2036,9 @@ fi
 %endif\
 /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.*\
 %if %{with_dracut}\
-%ghost /boot/initramfs-%{KVERREL}%{?2:.%{2}}.img\
+/boot/initramfs-%{KVERREL}%{?2:.%{2}}.img\
 %else\
-%ghost /boot/initrd-%{KVERREL}%{?2:.%{2}}.img\
+/boot/initrd-%{KVERREL}%{?2:.%{2}}.img\
 %endif\
 %{expand:%%files %{?2:%{2}-}devel}\
 %defattr(-,root,root)\
@@ -2075,9 +2080,7 @@ fi
 
 %changelog
 * Wed Oct 07 2009 Dave Jones <davej at redhat.com>
-- Don't touch the initramfs file during %build.
-  It's ghosted because mkinitrd/dracut creates it, so this
-  should be unnecessary.
+- Don't mark the initramfs file as a ghost.
 
 * Wed Oct 07 2009 Dave Jones <davej at redhat.com>
 - Enable FUNCTION_GRAPH_TRACER on x86-64.




More information about the scm-commits mailing list