arch fun.
As per the discussion in #fedora-meeting today,
we're killing off kernel-i686, and just shipping..
* kernel.i586
* kernel-PAE.686
Patch below seems to dtrt.. comments?
Looking at the generated config files, the biggest difference
seems to be that kernel-PAE enables Xen and all it's related
dependancies.
Dave
Index: Makefile.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile.config
--- Makefile.config 26 Jan 2009 07:19:13 -0000 1.69
+++ Makefile.config 5 Feb 2009 20:09:20 -0000
@@ -6,7 +6,7 @@ CFG = kernel-$(VERSION)
CONFIGFILES = \
$(CFG)-i586.config \
- $(CFG)-i686.config $(CFG)-i686-PAE.config \
+ $(CFG)-i686-PAE.config \
$(CFG)-i686-debug.config $(CFG)-i686-PAEdebug.config \
$(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
$(CFG)-s390x.config $(CFG)-arm.config \
@@ -63,9 +63,6 @@ temp-s390-generic: config-s390x temp-gen
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 > $@
Index: config-i586
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-i586,v
retrieving revision 1.5
diff -u -p -r1.5 config-i586
--- config-i586 14 Feb 2008 19:56:06 -0000 1.5
+++ config-i586 5 Feb 2009 20:09:20 -0000
@@ -6,4 +6,3 @@ CONFIG_HIGHMEM4G=y
CONFIG_X86_POWERNOW_K6=m
-# CONFIG_KVM is not set
Index: config-i686
===================================================================
RCS file: config-i686
diff -N config-i686
--- config-i686 12 Jul 2007 19:15:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-CONFIG_M686=y
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.63
diff -u -p -r1.63 config-x86-generic
--- config-x86-generic 30 Jan 2009 00:08:01 -0000 1.63
+++ config-x86-generic 5 Feb 2009 20:09:20 -0000
@@ -205,9 +205,9 @@ CONFIG_NVRAM=y
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.1263
diff -u -p -r1.1263 kernel.spec
--- kernel.spec 5 Feb 2009 18:55:52 -0000 1.1263
+++ kernel.spec 5 Feb 2009 20:09:20 -0000
@@ -241,6 +241,11 @@ Summary: The Linux kernel
%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 @@ Source24: config-rhel-generic
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 @@ mkdir -p $RPM_BUILD_ROOT/boot
cd linux-%{kversion}.%{_target_cpu}
%if %{with_debug}
+%ifnarch i686
BuildKernel %make_target %kernel_image debug
+%endif
%if %{with_pae}
BuildKernel %make_target %kernel_image PAEdebug
%endif
--
http://www.codemonkey.org.uk