rpms/kernel/devel Makefile.config, 1.70, 1.71 config-i686-PAE, 1.2, 1.3 config-x86-generic, 1.84, 1.85 kernel.spec, 1.1639, 1.1640

[Dave Jones]

Author: davej

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

Modified Files:
	Makefile.config config-i686-PAE config-x86-generic kernel.spec 
Log Message:
Don't build 586 kernels any more.


Index: Makefile.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- Makefile.config	5 Feb 2009 21:11:18 -0000	1.70
+++ Makefile.config	20 Jul 2009 16:43:59 -0000	1.71
@@ -5,7 +5,7 @@
 CFG		= kernel-$(VERSION)
 
 CONFIGFILES	= \
-	$(CFG)-i586.config $(CFG)-i586-debug.config \
+	$(CFG)-i686.config $(CFG)-i686-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)-i586.config: config-i586 temp-x86-generic
+kernel-$(VERSION)-i686.config: /dev/null temp-x86-generic
 	perl merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-i586-debug.config: config-i586 temp-x86-debug-generic
+kernel-$(VERSION)-i686-debug.config: /dev/null temp-x86-debug-generic
 	perl merge.pl $^ i386 > $@
 
 kernel-$(VERSION)-x86_64.config: /dev/null temp-x86_64-generic


Index: config-i686-PAE
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-i686-PAE,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- config-i686-PAE	18 Jun 2009 19:05:53 -0000	1.2
+++ config-i686-PAE	20 Jul 2009 16:43:59 -0000	1.3
@@ -1,5 +1,3 @@
-CONFIG_M686=y
-# CONFIG_NOHIGHMEM is not set
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
 


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- config-x86-generic	7 Jul 2009 13:31:39 -0000	1.84
+++ config-x86-generic	20 Jul 2009 16:43:59 -0000	1.85
@@ -26,7 +26,7 @@ CONFIG_X86_BIGSMP=y
 # CONFIG_M586 is not set
 # CONFIG_M586TSC is not set
 # CONFIG_M586MMX is not set
-# CONFIG_M686 is not set
+CONFIG_M686=y
 # CONFIG_MPENTIUMII is not set
 # CONFIG_MPENTIUMIII is not set
 # CONFIG_MPENTIUMM is not set
@@ -75,8 +75,13 @@ CONFIG_X86_CPU_DEBUG=m
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 # CONFIG_NUMA is not set
+
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
 CONFIG_HIGHMEM=y
 CONFIG_HIGHPTE=y
+
 # CONFIG_MATH_EMULATION is not set
 CONFIG_MTRR=y
 CONFIG_X86_PAT=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1639
retrieving revision 1.1640
diff -u -p -r1.1639 -r1.1640
--- kernel.spec	20 Jul 2009 02:58:04 -0000	1.1639
+++ kernel.spec	20 Jul 2009 16:44:00 -0000	1.1640
@@ -197,7 +197,6 @@ Summary: The Linux kernel
 
 # We only build -PAE on 686.
 %ifarch i686
-%define with_up 0
 %define with_pae 1
 %else
 %define with_pae 0
@@ -217,7 +216,7 @@ Summary: The Linux kernel
 %define with_debug 0
 %endif
 
-%define all_x86 i386 i586 i686
+%define all_x86 i386 i686
 
 %if %{with_vdso_install}
 # These arches install vdso/ directories.
@@ -520,7 +519,7 @@ Source23: config-generic
 Source24: config-rhel-generic
 
 Source30: config-x86-generic
-Source31: config-i586
+Source31: config-i686
 Source32: config-i686-PAE
 
 Source40: config-x86_64-generic
@@ -1885,6 +1884,9 @@ fi
 # and build.
 
 %changelog
+* Mon Jul 20 2009 Dave Jones <davej at redhat.com> 2.6.31-0.77.rc3.git4
+- Don't build 586 kernels any more.
+
 * Sun Jul 19 2009 Dave Jones <davej at redhat.com> 2.6.31-0.75.rc3.git4
 - build a 'full' package on i686 (Bill Nottingham)