ppcrcd/trunk: base.pkgs net.pkgs

sparky cvs at pld-linux.org
Thu Jan 5 22:08:06 CET 2006


Author: sparky
Date: Thu Jan  5 22:08:04 2006
New Revision: 6745

Modified:
   ppcrcd/trunk/base.pkgs
   ppcrcd/trunk/net.pkgs
Log:
- take kernel from LINUX_2_6_14 branch


Modified: ppcrcd/trunk/base.pkgs
==============================================================================
--- ppcrcd/trunk/base.pkgs	(original)
+++ ppcrcd/trunk/base.pkgs	Thu Jan  5 22:08:04 2006
@@ -227,7 +227,7 @@
 
 I +=	kernel-grsecurity kernel-grsecurity-pcmcia
 SPEC-kernel-grsecurity = kernel.spec
-REV-kernel-grsecurity = LINUX_2_6
+REV-kernel-grsecurity = LINUX_2_6_14
 #prep
 BCOND-kernel-grsecurity = --without smp --with grsecurity
 # -smp -up -source -pcmcia -grsecurity -pld_vers
@@ -235,8 +235,8 @@
 # +regparm +em8300 +xen0 +xenU +xendev +abi
 
 REV-gcc = GCC_4_1
-BCOND-gcc = --without ada --without fortran --without java --without objc
-#-ada -fortran -java -objc +multilib -profiling -bootstrap
+BCOND-gcc = --without ada --without fortran --without java --without objc --without objcxx
+#-ada -fortran -java -objc -objcxx +multilib +profiling -bootstrap +tests
 
 
 .module-init-tools_prep:	.module-init-tools_pre
@@ -245,9 +245,9 @@
 	sed -e "/^%patch2/ased -n -e '/insmod_static/!p' -i Makefile.am" -i rpm/SPECS/module-init-tools.spec
 	touch $@
 
-.kernel_prep:		.kernel_pre kernel.config
+.kernel-grsecurity_prep:		.kernel-grsecurity_pre kernel.config
 	rm -f .kerneleq
-	cp kernel.spec rpm/SPECS/kernel.spec
+	cd rpm/SPECS; patch -p0 < ../../kernel.spec-patch
 	cp linux-squashfs2.2_lzma.patch rpm/SOURCES
 	cp kernel.config rpm/SOURCES/kernel-ppc.config
 	cp kernel.config rpm/SOURCES/kernel-ppc-smp.config

Modified: ppcrcd/trunk/net.pkgs
==============================================================================
--- ppcrcd/trunk/net.pkgs	(original)
+++ ppcrcd/trunk/net.pkgs	Thu Jan  5 22:08:04 2006
@@ -8,7 +8,8 @@
 PREP-kernel-fs-shfs = .kerneleq
 BCOND-kernel-fs-shfs = --without smp
 # -dist_kernel -kernel -smp +verbose -userspace
-
+.kernel-fs-shfs_prep:	.kernel-fs-shfs_pre .kerneleq
+	touch $@
 
 #I +=	eagle-usb kernel-usb-eagle
 # -dist_kernel -kernel -smp -userspace +verbose


More information about the pld-cvs-commit mailing list