rpms/kernel/devel Makefile.config, 1.69, 1.70 config-i586, 1.5, 1.6 config-nodebug, 1.30, 1.31 config-x86-generic, 1.63, 1.64 kernel.spec, 1.1265, 1.1266 config-i686, 1.1, NONE

[Dave Jones]

Author: davej

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

Modified Files:
	Makefile.config config-i586 config-nodebug config-x86-generic 
	kernel.spec 
Removed Files:
	config-i686 
Log Message:
Kill off the 686 kernel.
  Users should now use either the 586 kernel, or 686-PAE.


Index: Makefile.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- Makefile.config	26 Jan 2009 07:19:13 -0000	1.69
+++ Makefile.config	5 Feb 2009 21:11:18 -0000	1.70
@@ -5,9 +5,8 @@
 CFG		= kernel-$(VERSION)
 
 CONFIGFILES	= \
-	$(CFG)-i586.config \
-	$(CFG)-i686.config $(CFG)-i686-PAE.config \
-	$(CFG)-i686-debug.config $(CFG)-i686-PAEdebug.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 \
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
@@ -63,12 +62,6 @@
 temp-ia64-generic: config-ia64-generic temp-generic
 	perl merge.pl $^ > $@
 
-kernel-$(VERSION)-i686.config: config-i686 temp-x86-generic
-	perl merge.pl $^ i386 > $@
-
-kernel-$(VERSION)-i686-debug.config: config-i686 temp-x86-debug-generic
-	perl merge.pl $^ i386 > $@
-
 kernel-$(VERSION)-i686-PAE.config: config-i686-PAE temp-x86-generic
 	perl merge.pl $^ i386 > $@
 
@@ -78,6 +71,9 @@
 kernel-$(VERSION)-i586.config: config-i586 temp-x86-generic
 	perl merge.pl $^ i386 > $@
 
+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
 	perl merge.pl $^ x86_64 > $@
 


Index: config-i586
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-i586,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-i586	14 Feb 2008 19:56:06 -0000	1.5
+++ config-i586	5 Feb 2009 21:11:18 -0000	1.6
@@ -6,4 +6,3 @@
 
 CONFIG_X86_POWERNOW_K6=m
 
-# CONFIG_KVM is not set


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- config-nodebug	5 Feb 2009 21:02:42 -0000	1.30
+++ config-nodebug	5 Feb 2009 21:11:18 -0000	1.31
@@ -27,7 +27,7 @@
 
 CONFIG_DEBUG_SG=y
 
-CONFIG_DEBUG_PAGEALLOC=y
+# CONFIG_DEBUG_PAGEALLOC is not set
 
 CONFIG_DEBUG_WRITECOUNT=y
 CONFIG_DEBUG_OBJECTS=y


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- config-x86-generic	30 Jan 2009 00:08:01 -0000	1.63
+++ config-x86-generic	5 Feb 2009 21:11:18 -0000	1.64
@@ -205,9 +205,9 @@
 CONFIG_IBM_ASM=m
 CONFIG_CRYPTO_AES_586=m
 CONFIG_CRYPTO_TWOFISH_586=m
-# CONFIG_CRYPTO_DEV_PADLOCK is not set
-# CONFIG_CRYPTO_DEV_PADLOCK_AES is not set
-# CONFIG_CRYPTO_DEV_PADLOCK_SHA is not set
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
 
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_SCHED_SMT=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1265
retrieving revision 1.1266
diff -u -r1.1265 -r1.1266
--- kernel.spec	5 Feb 2009 21:04:23 -0000	1.1265
+++ kernel.spec	5 Feb 2009 21:11:18 -0000	1.1266
@@ -241,6 +241,11 @@
 %define with_kdump 0
 #endif
 
+# We only build -PAE for 686 as of Fedora 11.
+%ifarch i686
+%define with_up 0
+%endif
+
 # don't do debug builds on anything but i686 and x86_64
 %ifnarch i686 x86_64
 %define with_debug 0
@@ -522,8 +527,7 @@
 
 Source30: config-x86-generic
 Source31: config-i586
-Source32: config-i686
-Source33: config-i686-PAE
+Source32: config-i686-PAE
 
 Source40: config-x86_64-generic
 
@@ -1477,7 +1481,9 @@
 cd linux-%{kversion}.%{_target_cpu}
 
 %if %{with_debug}
+%if !%{with_up}
 BuildKernel %make_target %kernel_image debug
+%endif
 %if %{with_pae}
 BuildKernel %make_target %kernel_image PAEdebug
 %endif
@@ -1778,6 +1784,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Feb 05 2009 Dave Jones <davej at redhat.com>
+- Kill off the 686 kernel.
+  Users should now use either the 586 kernel, or 686-PAE.
+
 * Thu Feb 05 2009 David Woodhouse <David.Woodhouse at intel.com>
 - Import and enable Jörg's DMA API debugging patches
 


--- config-i686 DELETED ---