Author: sparky
Date: Wed Jan 11 02:43:03 2006
New Revision: 6791
Modified:
ppcrcd/trunk/Makefile
ppcrcd/trunk/base.pkgs
ppcrcd/trunk/net.pkgs
Log:
- no grsecurity, only grsec_basic
- fixed <pkg>eq touch files
Modified: ppcrcd/trunk/Makefile
==============================================================================
--- ppcrcd/trunk/Makefile (original)
+++ ppcrcd/trunk/Makefile Wed Jan 11 02:43:03 2006
@@ -129,9 +129,9 @@
mv [EMAIL PROTECTED],}
$(vmlinuz): $(vmlinux) $(initrd_sqf) \
- out/rpm/rpms/kernel-grsecurity-libs
- -$(SU) rpm --erase kernel-grsecurity-libs --nodeps
- -$(SU) rpm -Uhv `cat out/rpm/rpms/kernel-grsecurity-libs` --nodeps
+ out/rpm/rpms/kernel-libs
+ -$(SU) rpm --erase kernel-libs --nodeps
+ -$(SU) rpm -Uhv `cat out/rpm/rpms/kernel-libs` --nodeps
$(PWD)/mkvmlinuz $@ \
-v $(vmlinux) \
-i $(initrd_sqf) \
@@ -216,6 +216,8 @@
sed -e '[EMAIL PROTECTED]/@@g' -e
's/-[^-]*-[^-]*$$//'`; \
done
rm buildout EXIT
+ $(if $(NOTEQ-$(notdir $(firstword $^))), rm -f \
+ out/touch/$(NOTEQ-$(notdir $(firstword $^))),#)
sleep 1 && touch $@
out/rpm/prep/%: out/rpm/sources/%
Modified: ppcrcd/trunk/base.pkgs
==============================================================================
--- ppcrcd/trunk/base.pkgs (original)
+++ ppcrcd/trunk/base.pkgs Wed Jan 11 02:43:03 2006
@@ -284,14 +284,15 @@
I += yaboot
$(R)/yaboot: $(P)/yaboot
-I += kernel-grsecurity kernel-grsecurity-pcmcia
+I += kernel kernel-pcmcia
REV-kernel = LINUX_2_6_14
#prep
-BCOND-kernel = --without smp --with grsecurity
+BCOND-kernel = --without smp --without grsecurity --with grsec_basic
+NOTEQ-kernel = kerneleq
# -smp -up -source -pcmcia -grsecurity -pld_vers
# +grsec_basic +pax +omosix +vserver +verbose +preemptive
# +regparm +em8300 +xen0 +xenU +xendev +abi
-$(R)/kernel-grsecurity $(R)/kernel-grsecurity-pcmcia: $(P)/kernel
+$(R)/kernel $(R)/kernel-pcmcia $(R)/kernel-libs: $(P)/kernel
out/rpm/SPECS/module-init-tools.spec: out/touch/builder_prepared
@@ -316,14 +317,7 @@
cp kernel.config out/rpm/SOURCES/kernel-ppc-smp.config
sleep 1 && touch $@
-out/rpm/SPECS/busybox.spec: out/touch/builder_prepared
- cd $(dir $@) && cvs up $(if $(REV-$(@:out/rpm/SPECS/%.spec=%)),-r \
- $(REV-$(@:out/rpm/SPECS/%.spec=%)),-A) $(notdir $@)
- sed -e '/ifnarch/s/$$/ ppc/' \
- -i $@
- sleep 1 && touch $@
-
-out/touch/kerneleq:
+out/touch/kerneleq: out/rpm/rpms/kernel
-$(SU) rpm --erase kernel-grsecurity-source
-$(SU) rpm --erase kernel-grsecurity-module-build
-$(SU) rpm --erase kernel-grsecurity-headers
@@ -331,7 +325,7 @@
-$(SU) rpm --erase kernel-module-build
-$(SU) rpm --erase kernel-headers
$(SU) rpm -Uhv \
- `cat $(R)/kernel-grsecurity-{source,module-build,headers}`
+ `cat $(R)/kernel-{source,module-build,headers}`
sleep 1 && touch $@
out/rpm/installed/virtual-mount-proc:
Modified: ppcrcd/trunk/net.pkgs
==============================================================================
--- ppcrcd/trunk/net.pkgs (original)
+++ ppcrcd/trunk/net.pkgs Wed Jan 11 02:43:03 2006
@@ -48,6 +48,7 @@
$(R)/linux-atm $(R)/linux-atm-rc-scripts: $(P)/linux-atm
I += ppp ppp-plugin-pppoatm
+NOTEQ-ppp = pppeq
# -pppoatm
$(R)/ppp $(R)/ppp-plugin-pppoatm: $(P)/ppp
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
