ppcrcd/trunk: Makefile add.pkgs base.pkgs fs.pkgs net.pkgs noinst.pkgs

[sparky]

Author: sparky
Date: Sun Jan  8 15:26:57 2006
New Revision: 6774

Added:
   ppcrcd/trunk/noinst.pkgs
Modified:
   ppcrcd/trunk/Makefile
   ppcrcd/trunk/add.pkgs
   ppcrcd/trunk/base.pkgs
   ppcrcd/trunk/fs.pkgs
   ppcrcd/trunk/net.pkgs
Log:
- put some useful routines in noinst.pkgs
- install blockdev
- fixes


Modified: ppcrcd/trunk/Makefile
==============================================================================
--- ppcrcd/trunk/Makefile	(original)
+++ ppcrcd/trunk/Makefile	Sun Jan  8 15:26:57 2006
@@ -16,6 +16,7 @@
 	
 include base.pkgs
 include add.pkgs
+include noinst.pkgs
 
 ppcrcd_iso = out/ppcrcd.iso
 cdroot = out/cdroot

Modified: ppcrcd/trunk/add.pkgs
==============================================================================
--- ppcrcd/trunk/add.pkgs	(original)
+++ ppcrcd/trunk/add.pkgs	Sun Jan  8 15:26:57 2006
@@ -12,9 +12,12 @@
 
 I +=	libgcc libstdc++
 # will not build it
-$(R)/gcc $(R)/libgcc $(R)/libstdc++:	$(P)/gcc
+$(R)/libgcc $(R)/libstdc++:
 	echo out/rpm/RPMS/$(notdir $@)-4.1.0-0.20060105r109369.1.ppc.rpm > $@
 
+I +=	libjpeg
+$(R)/libjpeg:	$(P)/libjpeg
+
 include fs.pkgs
 
 I +=	openssl openssl-tools openssl-tools-perl
@@ -30,9 +33,6 @@
 I +=	pcre pcregrep
 $(R)/pcre $(R)/pcregrep:	$(P)/pcre
 
-I +=	libjpeg
-$(R)/libjpeg:	$(P)/libjpeg
-
 include net.pkgs
 
 I +=	sysfsutils
@@ -227,5 +227,6 @@
 out/touch/compl_no_mount:
 	$(SU) sed -e '/complet.*mount/s/^/#/' \
 		-i out/root/stripped/etc/bash_completion
+	touch $@
 
 # vim: syntax=make

Modified: ppcrcd/trunk/base.pkgs
==============================================================================
--- ppcrcd/trunk/base.pkgs	(original)
+++ ppcrcd/trunk/base.pkgs	Sun Jan  8 15:26:57 2006
@@ -90,7 +90,7 @@
 I +=	login
 # +uClibc
 $(addprefix $(R)/,util-linux losetup mount tunelp):	$(P)/util-linux
-$(addprefix $(R)/,login agetty rawdevices):	$(P)/util-linux
+$(addprefix $(R)/,login agetty rawdevices blockdev):	$(P)/util-linux
 
 I +=	mailx
 $(R)/mailx:	$(P)/mailx
@@ -212,7 +212,7 @@
 # -static +bash_history
 $(R)/bash:	$(P)/bash
 
-I +=	losetup rawdevices agetty tunelp
+I +=	losetup rawdevices agetty tunelp blockdev
 S +=	rawdevices
 
 I +=	sed
@@ -293,9 +293,6 @@
 # +regparm +em8300 +xen0 +xenU +xendev +abi
 $(R)/kernel-grsecurity $(R)/kernel-grsecurity-pcmcia: $(P)/kernel
 
-REV-gcc = GCC_4_1
-BCOND-gcc = --without ada --without fortran --without java --without objc --without objcxx
-#-ada -fortran -java -objc -objcxx +multilib +profiling -bootstrap +tests
 
 out/rpm/SPECS/module-init-tools.spec:	out/touch/builder_prepared
 	cd $(dir $@) && cvs up $(if $(REV-$(@:out/rpm/SPECS/%.spec=%)),-r \
@@ -309,7 +306,7 @@
 	sleep 1 && touch $@
 
 out/rpm/SPECS/kernel.spec:	out/touch/builder_prepared
-	rm -r $@
+	rm -f $@
 	cd $(dir $@) && cvs up $(if $(REV-$(@:out/rpm/SPECS/%.spec=%)),-r \
 		$(REV-$(@:out/rpm/SPECS/%.spec=%)),-A) $(notdir $@)
 	rm -f $(touch)/kerneleq

Modified: ppcrcd/trunk/fs.pkgs
==============================================================================
--- ppcrcd/trunk/fs.pkgs	(original)
+++ ppcrcd/trunk/fs.pkgs	Sun Jan  8 15:26:57 2006
@@ -26,6 +26,7 @@
 $(R)/magma:	$(P)/magma
 
 I +=	ccs
+S +=	ccs
 $(R)/ccs:	$(P)/ccs
 
 I +=	dmraid

Modified: ppcrcd/trunk/net.pkgs
==============================================================================
--- ppcrcd/trunk/net.pkgs	(original)
+++ ppcrcd/trunk/net.pkgs	Sun Jan  8 15:26:57 2006
@@ -49,7 +49,7 @@
 
 I +=	ppp ppp-plugin-pppoatm
 # -pppoatm
-$(R)/ppp $(R)/ppp-plugin-pppoatm:	$(P)/ppp pppneq
+$(R)/ppp $(R)/ppp-plugin-pppoatm:	$(P)/ppp
 
 I +=	speedtouch
 $(R)/speedtouch:	$(P)/speedtouch
@@ -67,7 +67,7 @@
 I +=	dhcp dhcp-relay dhcp-client
 # +ldap
 S +=	dhcpd dhcp-relay
-$(R)/dhcp $(R)/dhcp-relay $(R)/dhcp-client:	$(P)/dhcp dhcp-relay dhcp-client
+$(R)/dhcp $(R)/dhcp-relay $(R)/dhcp-client:	$(P)/dhcp
 
 I +=	pump
 $(R)/pump:	$(P)/pump
@@ -127,8 +127,8 @@
 $(R)/wget:	$(P)/wget
 
 I +=	libidn
-BCOND-libidn = --without python
-# +java -python
+BCOND-libidn = --without dotnet --without python
+# -dotnet +java -python
 $(R)/libidn:	$(P)/libidn
 
 I +=	js
@@ -175,8 +175,8 @@
 S +=	rwhod
 $(R)/rwho:	$(P)/rwho
 
-I +=	libwrap tcp_wrappers
-$(R)/tcp_wrappers $(R)/libwrap:	$(P)/tcp_wrappers
+I +=	libwrap-libs libwrap tcp_wrappers
+$(R)/tcp_wrappers $(R)/libwrap $(R)/libwrap-libs:	$(P)/tcp_wrappers
 
 I +=	redir
 $(R)/redir:	$(P)/redir
@@ -228,13 +228,10 @@
 $(R)/iptables $(R)/iptables-init:	$(P)/iptables out/touch/kerneleq
 
 
-out/touch/pppeq:
+out/touch/pppeq:	out/rpm/rpms/ppp
 	-$(SU) rpm --erase ppp-plugin-devel
-	$(SU) rpm -Uhv `cat our/rpm/rpms/ppp-plugin-devel`
+	$(SU) rpm -Uhv `cat out/rpm/rpms/ppp-plugin-devel`
 	touch $@
 
-.PHONY: pppneq
-pppneq:
-	rm -f out/touch/pppeq
 
 # vim: syntax=make

Added: ppcrcd/trunk/noinst.pkgs
==============================================================================
--- (empty file)
+++ ppcrcd/trunk/noinst.pkgs	Sun Jan  8 15:26:57 2006
@@ -0,0 +1,10 @@
+# usefull routines
+
+$(R)/libol $(R)/libol-static:	$(P)/libol
+
+REV-gcc = GCC_4_1
+BCOND-gcc = --without ada --without fortran --without java --without objc --without objcxx
+#-ada -fortran -java -objc -objcxx +multilib +profiling -bootstrap +tests
+$(R)/gcc:	$(P)/gcc
+
+# vim: syntax=make