rpms/kernel/devel kernel.spec,1.852,1.853

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6762

Modified Files:
	kernel.spec 
Log Message:
Allow building firmware during arch build (--with firmware).


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.852
retrieving revision 1.853
diff -u -r1.852 -r1.853
--- kernel.spec	5 Aug 2008 16:17:14 -0000	1.852
+++ kernel.spec	5 Aug 2008 20:58:59 -0000	1.853
@@ -75,11 +75,13 @@
 # kernel-headers
 %define with_headers   %{?_without_headers:   0} %{?!_without_headers:   1}
 # kernel-firmware
-%define with_firmware  %{?_without_firmware:  0} %{?!_without_firmware:  1}
+%define with_firmware  %{?_with_firmware:  1} %{?!_with_firmware:  0}
 # kernel-debuginfo
 %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
 # kernel-bootwrapper (for creating zImages from kernel + initrd)
 %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}
 
 # don't build the kernel-doc package
 %define with_doc 0
@@ -188,8 +190,10 @@
 
 %define all_x86 i386 i586 i686
 
+%if %{with_vdso_install}
 # These arches install vdso/ directories.
 %define vdso_arches %{all_x86} x86_64 ppc ppc64
+%endif
 
 # Overrides for generic default options
 
@@ -217,7 +221,6 @@
 # only package docs noarch
 %ifnarch noarch
 %define with_doc 0
-%define with_firmware 0
 %endif
 
 # no need to build headers again for these arches,
@@ -231,6 +234,7 @@
 %define with_up 0
 %define with_headers 0
 %define all_arch_configs kernel-%{version}-*.config
+%define with_firmware  %{?_without_firmware:  0} %{?!_without_firmware:  1}
 %endif
 
 # bootwrapper is only on ppc
@@ -1724,6 +1728,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Aug 05 2008 Chuck Ebbert <cebbert at redhat.com>
+- Allow building firmware during arch build (--with firmware).
+
 * Tue Aug 05 2008 Tom "spot" Callaway <tcallawa at redhat.com>
 - fix license tag of kernel-firmware