rpms/kernel/devel Makefile.config, 1.46, 1.47 kernel-2.6.spec, 1.2558, 1.2559

[fedora-cvs-commits redhat com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7103

Modified Files:
	Makefile.config kernel-2.6.spec 
Log Message:
Initial OLPC bits.




Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Makefile.config	22 Jul 2006 14:52:52 -0000	1.46
+++ Makefile.config	14 Aug 2006 02:24:34 -0000	1.47
@@ -13,7 +13,8 @@
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \
 	$(CFG)-i686-xen.config $(CFG)-x86_64-xen.config \
-	$(CFG)-ia64-xen.config
+	$(CFG)-ia64-xen.config \
+	$(CFG)-olpc.config
 
 PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64
 TEMPFILES	= $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
@@ -24,7 +25,8 @@
 	@rm -f temp-generic temp-xen-generic \
 		temp-x86-xen-generic \
 		temp-x86_64-xen-generic temp-x86_64-xen-generic-tmp \
-		temp-ia64-xen-generic temp-ia64-xen-generic-tmp
+		temp-ia64-xen-generic temp-ia64-xen-generic-tmp \
+		temp-olpc-config
 
 # Augment the clean target to clean up our own cruft
 clean ::
@@ -87,6 +89,9 @@
 kernel-$(VERSION)-i686-kdump.config: configs/config-i686-kdump temp-x86-generic
 	perl merge.pl $^ i386 > $@
 
+kernel-$(VERSION)-olpc.config: configs/config-olpc temp-x86-generic
+	perl merge.pl $^ i386 > $@
+
 kernel-$(VERSION)-i586.config: configs/config-i586 temp-x86-generic
 	perl merge.pl $^ i386 > $@
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2558
retrieving revision 1.2559
diff -u -r1.2558 -r1.2559
--- kernel-2.6.spec	12 Aug 2006 22:51:45 -0000	1.2558
+++ kernel-2.6.spec	14 Aug 2006 02:24:34 -0000	1.2559
@@ -1277,6 +1277,9 @@
 BuildKernel %make_target %kernel_image kdump
 %endif
 
+%if %{buildolpc}
+BuildKernel %make_target %kernel_image olpc
+$endif
 
 ###
 ### Special hacks for debuginfo subpackages.