rpms/kernel/F-11 config-i586, 1.7, 1.8 Makefile.config, 1.71, 1.72 kernel.spec, 1.1803, 1.1804

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	Makefile.config kernel.spec 
Added Files:
	config-i586 
Log Message:
Fix i586 kernel build.


Index: config-i586
===================================================================
RCS file: config-i586
diff -N config-i586
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ config-i586	3 Feb 2010 21:44:36 -0000	1.8
@@ -0,0 +1,8 @@
+CONFIG_M586=y
+
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
+
+CONFIG_X86_POWERNOW_K6=m
+


Index: Makefile.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/Makefile.config,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- Makefile.config	4 Jan 2010 15:25:39 -0000	1.71
+++ Makefile.config	3 Feb 2010 21:44:36 -0000	1.72
@@ -5,7 +5,7 @@
 CFG		= kernel-$(VERSION)
 
 CONFIGFILES	= \
-	$(CFG)-i686.config $(CFG)-i686-debug.config \
+	$(CFG)-i586.config $(CFG)-i586-debug.config \
 	$(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \
 	$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
 	$(CFG)-s390x.config $(CFG)-arm.config \
@@ -68,10 +68,10 @@ kernel-$(VERSION)-i686-PAE.config: confi
 kernel-$(VERSION)-i686-PAEdebug.config: config-i686-PAE temp-x86-debug-generic
 	perl merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-i686.config: /dev/null temp-x86-generic
+kernel-$(VERSION)-i586.config: config-i586 temp-x86-generic
 	perl merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-i686-debug.config: /dev/null temp-x86-debug-generic
+kernel-$(VERSION)-i586-debug.config: config-i586 temp-x86-debug-generic
 	perl merge.pl $^ i386 > $@
 
 kernel-$(VERSION)-x86_64.config: /dev/null temp-x86_64-generic


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1803
retrieving revision 1.1804
diff -u -p -r1.1803 -r1.1804
--- kernel.spec	3 Feb 2010 04:12:11 -0000	1.1803
+++ kernel.spec	3 Feb 2010 21:44:36 -0000	1.1804
@@ -207,6 +207,8 @@ Summary: The Linux kernel
 
 # kernel-PAE is only built on i686.
 %ifarch i686
+# on F-11 the non-PAE kernel is i586 only
+%define with_up 0
 %define with_pae 1
 %else
 %define with_pae 0
@@ -227,9 +229,11 @@ Summary: The Linux kernel
 %endif
 
 # if requested, only build debug kernel
+%define with_up_debug 0
 %if %{with_dbgonly}
 %if %{debugbuildsenabled}
 %define with_up 0
+%define with_up_debug 1
 %endif
 %define with_smp 0
 %define with_pae 0
@@ -238,7 +242,7 @@ Summary: The Linux kernel
 %define with_perftool 0
 %endif
 
-%define all_x86 i386 i686
+%define all_x86 i386 i586 i686
 
 %if %{with_vdso_install}
 # These arches install vdso/ directories.
@@ -252,6 +256,12 @@ Summary: The Linux kernel
 %define with_smp 0
 %endif
 
+# no need to build headers again for these archs
+# they can just use i586 and ppc64 headers
+%ifarch i686 ppc64iseries
+%define with_headers 0
+%endif
+
 # only build kernel-kdump on ppc64
 # (no relocatable kernel support upstream yet)
 #FIXME: Temporarily disabled to speed up builds.
@@ -407,6 +417,10 @@ Summary: The Linux kernel
 %define with_pae_debug %{with_debug}
 %endif
 
+%if %{with_up}
+%define with_up_debug %{with_debug}
+%endif
+
 #
 # Three sets of minimum package version requirements in the form of Conflicts:
 # to versions below the minimum
@@ -542,7 +556,8 @@ Source23: config-generic
 Source24: config-rhel-generic
 
 Source30: config-x86-generic
-Source31: config-i686-PAE
+Source31: config-i586
+Source32: config-i686-PAE
 
 Source40: config-x86_64-generic
 
@@ -1999,7 +2014,7 @@ fi
 
 %kernel_variant_files %{with_up}
 %kernel_variant_files %{with_smp} smp
-%kernel_variant_files %{with_debug} debug
+%kernel_variant_files %{with_up_debug} debug
 %kernel_variant_files %{with_pae} PAE
 %kernel_variant_files %{with_pae_debug} PAEdebug
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
@@ -2008,6 +2023,9 @@ fi
 # and build.
 
 %changelog
+* Wed Feb 03 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.32.7-19
+- Fix i586 kernel build.
+
 * Tue Feb 02 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.32.7-18
 - Update scripts/sort-config from devel
 - Remove obsolete config options