arch fun.

Dave Jones davej at redhat.com
Thu Feb 5 20:28:34 UTC 2009


On Thu, Feb 05, 2009 at 03:11:40PM -0500, Dave Jones wrote:
 > 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.

Better version of the Makefile.config with changes Josh pointed out..

	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:27:40 -0000
@@ -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-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 > $@
-
 kernel-$(VERSION)-i686-PAE.config: config-i686-PAE temp-x86-generic
 	perl merge.pl $^ i386 > $@
 
@@ -78,6 +71,9 @@ kernel-$(VERSION)-i686-PAEdebug.config: 
 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 > $@
 

-- 
http://www.codemonkey.org.uk




More information about the Fedora-kernel-list mailing list