rpms/kernel/devel kernel.spec,1.1765,1.1766

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	kernel.spec 
Log Message:
Fix kernel build errors when building firmware by removing the
  .config file before that step and restoring it afterward.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1765
retrieving revision 1.1766
diff -u -p -r1.1765 -r1.1766
--- kernel.spec	3 Sep 2009 21:47:33 -0000	1.1765
+++ kernel.spec	5 Sep 2009 00:36:37 -0000	1.1766
@@ -772,7 +772,6 @@ glibc package.
 %package firmware
 Summary: Firmware files used by the Linux kernel
 Group: Development/System
-Buildarch: noarch
 # This is... complicated.
 # Look at the WHENCE file.
 License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
@@ -979,6 +978,12 @@ ApplyOptionalPatch()
   fi
 }
 
+# we don't want a .config file when building firmware: it just confuses the build system
+%define build_firmware \
+   mv .config .config.firmware_save \
+   make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install \
+   mv .config.firmware_save .config
+
 # First we unpack the kernel tarball.
 # If this isn't the first make prep, we use links to the existing clean tarball
 # which speeds things up quite a bit.
@@ -1773,7 +1778,7 @@ rm -f $RPM_BUILD_ROOT/usr/include/asm*/i
 %endif
 
 %if %{with_firmware}
-make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install
+%{build_firmware}
 %endif
 
 %if %{with_bootwrapper}
@@ -1783,7 +1788,7 @@ make DESTDIR=$RPM_BUILD_ROOT bootwrapper
 %if %{with_dracut}
 %if !%{with_firmware}
 # dracut needs the firmware files
-    make INSTALL_FW_PATH=$RPM_BUILD_ROOT/lib/firmware firmware_install
+    %{build_firmware}
 %endif
     for i in $RPM_BUILD_ROOT/lib/modules/*; do
 	[ -d $i ] || continue
@@ -2022,6 +2027,10 @@ fi
 # and build.
 
 %changelog
+* Fri Sep 04 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-0.203.rc8.git2
+- Fix kernel build errors when building firmware by removing the
+  .config file before that step and restoring it afterward.
+
 * Thu Sep 03 2009 Adam Jackson <ajax at redhat.com>
 - drm-ddc-caching-bug.patch: Empty the connector's mode list when it's
   disconnected.