rpms/kernel/F-11 kernel.spec,1.1727,1.1728

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	kernel.spec 
Log Message:
Fix build system getting confused during firmware install.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1727
retrieving revision 1.1728
diff -u -p -r1.1727 -r1.1728
--- kernel.spec	4 Sep 2009 17:47:08 -0000	1.1727
+++ kernel.spec	5 Sep 2009 00:55:06 -0000	1.1728
@@ -1774,7 +1774,10 @@ rm -f $RPM_BUILD_ROOT/usr/include/asm*/i
 %endif
 
 %if %{with_firmware}
+# having a .config file present during firmware install creates confusion
+mv .config .config.firmware_save
 make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install
+mv .config.firmware_save .config
 %endif
 
 %if %{with_bootwrapper}
@@ -1981,6 +1984,9 @@ fi
 # and build.
 
 %changelog
+* Fri Sep 04 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-49
+- Fix build system getting confused during firmware install.
+
 * Fri Sep 04 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.5-48
 - Added additional fixes needed for #514787:
   linux-2.6-ppc64-vs-broadcom-lmb-no-init-*.patch