454 files changed, 1214 insertions, 1530 deletions

diff --git a/Makefile b/Makefile
index b0f39a732..770e154af 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.110 2004/08/26 15:22:21 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2002 by Robert Schwebel <r.schwebel@pengutronix.de>
 # Copyright (C) 2002 by Jochen Striepe <ptxdist@tolot.escape.de>
@@ -207,90 +207,17 @@ oldconfig: ptx_kconfig scripts/kconfig/conf
 
 # Config Targets -------------------------------------------------------------
 
-i386-ratio-uno-2053-1_config:
-	@echo "copying ratio UNO-2053-1 configuration"
-	@cp config/i386-ratio-uno-2053-1.ptxconfig .config
-
-i386-frako_config:
-	@echo "copying frako configuration"
-	@cp config/i386-frako.ptxconfig .config
-
-i386-generic-glibc_config: 
-	@echo "copying i386-generic-glibc configuration"
-	@cp config/i386-generic-glibc.ptxconfig .config
-
-i386-generic-uclibc_config: 
-	@echo "copying i386-generic-uclibc configuration"
-	@cp config/i386-generic-uclibc.ptxconfig .config
-
-c3-abbcc_config:
-	@echo "copying abbcc configuration"
-	@cp config/c3-abbcc.ptxconfig .config
-
-innokom-2.4-2.95_config:
-	@echo "copying innokom-2.4-2.95 configuration"
-	@cp config/innokom-2.4-2.95.ptxconfig .config
-
-innokom-2.4-3.3.2_config:
-	@echo "copying innokom-2.4-3.3.2 configuration"
-	@cp config/innokom-2.4-3.3.2.ptxconfig .config
-
-innokom-2.6-3.3.2_config:
-	@echo "copying innokom-2.6-3.3.2 configuration"
-	@cp config/innokom-2.6-3.3.2.ptxconfig .config
-
-mx1fs2_config:
-	@echo "copying mx1fs2 configuration"
-	@cp config/mx1fs2.ptxconfig .config
-
-pii_nge_config:
-	@echo "copying pii_nge configuration"
-	@cp config/pii_nge.ptxconfig .config
-
-i586-rayonic_config:
-	@echo "copying 586 rayonic configuration"
-	@cp config/i586-rayonic.ptxconfig .config
-	@cp config/rtaiconfig-rayonic .rtaiconfig
-
-i386-rayonic_config:
-	@echo "copying 386 rayonic configuration"
-	@cp config/i386-rayonic.ptxconfig .config
-	@cp config/rtaiconfig-rayonic .rtaiconfig
-
-roi-eics_config:
-	@echo "copying ROI EICS configuration"
-	@cp config/geode-roi_eics.ptxconfig .config
-	@cp config/rtaiconfig-roi .rtaiconfig
-
-i386-scII-bmwm_config:
-	@echo "copying solidcard-bmw configuration"
-	@cp config/i386-scII-bmwm.ptxconfig .config
-
-scIII-cameron_config:
-	@echo "copying scIII-cameron configuration"
-	@cp config/ppc405-cameron.ptxconfig .config
-
-wystup_config:
-	@echo "copying wystup configuration"
-	@cp config/wystup.ptxconfig .config
-
-h7202_config:
-	@echo "copying HMS7202 Evalboard configuration"
-	@cp config/h7202.ptxconfig .config
-
-# Toolchain Config Targets ---------------------------------------------------
-
-toolchain-powerpc-405-linux_config:
-	@echo "copying toolchain-powerpc-405-linux configuration"
-	@cp config/toolchain-powerpc-405-linux .config
-
-toolchain-arm-linux-3.3.2_config:
-	@echo "copying toolchain-arm-linux configuration"
-	@cp config/toolchain-arm-linux-3.3.2 .config
-
-toolchain-arm-linux-2.95_config:
-	@echo "copying toolchain-arm-linux-2.95 configuration"
-	@cp config/toolchain-arm-linux-2.95 .config
+%_config:
+	@echo; \
+	echo "[Searching for Config File:]"; \
+	CFG=`find projects -name $(subst _config,.ptxconfig,$@)`; \
+	if [ -n "$$CFG" ]; then \
+		echo "using config file \"$$CFG\""; \
+		cp $$CFG $(TOPDIR)/.config; \
+	else \
+		echo "could not find config file \"$$CFG\""; \
+	fi; \
+	echo
 
 # Cuckoo Test ----------------------------------------------------------------
 cuckoo-test: world
@@ -387,7 +314,9 @@ configs:
 	@echo
 	@echo "Available configs: "
 	@echo
-	@grep "_config" Makefile | grep -v grep | sed -e "s/://g"
+	@for i in `find projects -name "*.ptxconfig"`; do \
+		basename `echo $$i | perl -p -e "s/.ptxconfig/_config/g"`; \
+	done
 	@echo
 
 $(INSTALL_LOG): 
diff --git a/config/Config.in b/config/Config.in
index 05d369e90..2ef36fb1c 100644
--- a/config/Config.in
+++ b/config/Config.in
@@ -27,7 +27,7 @@ comment	"General Options ---    "
 
 source "rules/experimental.in"
 source "rules/target.in"
-source "rules/cross-toolchain.in"
+source "rules/crosstool.in"
 source "rules/rootfs.in"
 source "rules/debug.in"
 source "rules/hosttools.in"
diff --git a/etc/bmwm-cid_internet/dropbear/JUST_FOR_CVS b/etc/bmwm-cid_internet/dropbear/JUST_FOR_CVS
deleted file mode 100644
index e69de29bb..000000000
--- a/etc/bmwm-cid_internet/dropbear/JUST_FOR_CVS
+++ /dev/null
diff --git a/etc/bmwm-cid_internet/ld.so.cache b/etc/bmwm-cid_internet/ld.so.cache
deleted file mode 100644
index 7160279c1..000000000
--- a/etc/bmwm-cid_internet/ld.so.cache
+++ /dev/null
diff --git a/etc/cameron-efco/boottime.kmap b/etc/cameron-efco/boottime.kmap
deleted file mode 100644
index bbf91154e..000000000
--- a/etc/cameron-efco/boottime.kmap
+++ /dev/null
diff --git a/etc/frako/boottime.kmap b/etc/frako/boottime.kmap
deleted file mode 100644
index bbf91154e..000000000
--- a/etc/frako/boottime.kmap
+++ /dev/null
diff --git a/etc/ratio-uno-2053-1/boottime.kmap b/etc/ratio-uno-2053-1/boottime.kmap
deleted file mode 100644
index bbf91154e..000000000
--- a/etc/ratio-uno-2053-1/boottime.kmap
+++ /dev/null
diff --git a/etc/rayonic-20030625/ld.so.cache b/etc/rayonic-20030625/ld.so.cache
deleted file mode 100644
index 7160279c1..000000000
--- a/etc/rayonic-20030625/ld.so.cache
+++ /dev/null
diff --git a/etc/scII-bmwm-20030913-1/ld.so.cache b/etc/scII-bmwm-20030913-1/ld.so.cache
deleted file mode 100644
index 7160279c1..000000000
--- a/etc/scII-bmwm-20030913-1/ld.so.cache
+++ /dev/null
diff --git a/feature-patches/JUST_FOR_CVS b/feature-patches/JUST_FOR_CVS
deleted file mode 100644
index e69de29bb..000000000
--- a/feature-patches/JUST_FOR_CVS
+++ /dev/null
diff --git a/images/JUST_FOR_CVS b/images/JUST_FOR_CVS
deleted file mode 100644
index e69de29bb..000000000
--- a/images/JUST_FOR_CVS
+++ /dev/null
diff --git a/config/c3-abbcc.ptxconfig b/projects/abbcc/abbcc-viac3.ptxconfig
index 1b6f91220..1b6f91220 100644
--- a/config/c3-abbcc.ptxconfig
+++ b/projects/abbcc/abbcc-viac3.ptxconfig
diff --git a/etc/abbcc/init.d/latency b/projects/abbcc/etc/init.d/latency
index 6835a2f6a..6835a2f6a 100755
--- a/etc/abbcc/init.d/latency
+++ b/projects/abbcc/etc/init.d/latency
diff --git a/etc/abbcc/init.d/rtai b/projects/abbcc/etc/init.d/rtai
index 109e8020d..109e8020d 100755
--- a/etc/abbcc/init.d/rtai
+++ b/projects/abbcc/etc/init.d/rtai
diff --git a/etc/abbcc/init.d/rtnet b/projects/abbcc/etc/init.d/rtnet
index 58a074521..58a074521 100755
--- a/etc/abbcc/init.d/rtnet
+++ b/projects/abbcc/etc/init.d/rtnet
diff --git a/etc/abbcc/menu.lst b/projects/abbcc/etc/menu.lst
index b99d7b7ed..9ba9a7083 100644
--- a/etc/abbcc/menu.lst
+++ b/projects/abbcc/etc/menu.lst
@@ -1,7 +1,7 @@
 #
 # file: /boot/menu.lst
 #
-# $Id: menu.lst,v 1.3 2004/08/23 08:11:38 rsc Exp $
+# $Id$
 #
 
 # Boot automatically after 3 secs.
diff --git a/etc/abbcc/system.menu b/projects/abbcc/etc/system.menu
index e5c996407..2d9e1467c 100755
--- a/etc/abbcc/system.menu
+++ b/projects/abbcc/etc/system.menu
@@ -2,7 +2,7 @@
 #
 # /usr/lib/flash/system.menu
 # 
-# $Id: system.menu,v 1.1 2004/08/23 08:12:15 rsc Exp $
+# $Id$
 #
 
 Menu Color Top Left Offset 1 1 Main
diff --git a/projects/cameron-efco/etc/boottime.kmap b/projects/cameron-efco/etc/boottime.kmap
new file mode 100644
index 000000000..f4c3f7da0
--- /dev/null
+++ b/projects/cameron-efco/etc/boottime.kmap
diff --git a/etc/bmwm-cid_internet/busybox.conf b/projects/cameron-efco/etc/busybox.conf
index e69de29bb..e69de29bb 100644
--- a/etc/bmwm-cid_internet/busybox.conf
+++ b/projects/cameron-efco/etc/busybox.conf
diff --git a/etc/cameron-efco/fstab b/projects/cameron-efco/etc/fstab
index 022f51ada..022f51ada 100644
--- a/etc/cameron-efco/fstab
+++ b/projects/cameron-efco/etc/fstab
diff --git a/etc/bmwm-cid_internet/group b/projects/cameron-efco/etc/group
index ab9f480e1..ab9f480e1 100644
--- a/etc/bmwm-cid_internet/group
+++ b/projects/cameron-efco/etc/group
diff --git a/etc/bmwm-cid_internet/gshadow b/projects/cameron-efco/etc/gshadow
index 43a083cca..43a083cca 100644
--- a/etc/bmwm-cid_internet/gshadow
+++ b/projects/cameron-efco/etc/gshadow
diff --git a/etc/bmwm-cid_internet/init.d/banner b/projects/cameron-efco/etc/init.d/banner
index 900d9f01a..900d9f01a 100755
--- a/etc/bmwm-cid_internet/init.d/banner
+++ b/projects/cameron-efco/etc/init.d/banner
diff --git a/etc/cameron-efco/init.d/rcS b/projects/cameron-efco/etc/init.d/rcS
index f58ac1ea2..f58ac1ea2 100755
--- a/etc/cameron-efco/init.d/rcS
+++ b/projects/cameron-efco/etc/init.d/rcS
diff --git a/etc/cameron-efco/inittab b/projects/cameron-efco/etc/inittab
index 0b12e3210..0b12e3210 100644
--- a/etc/cameron-efco/inittab
+++ b/projects/cameron-efco/etc/inittab
diff --git a/etc/cameron-efco/nsswitch.conf b/projects/cameron-efco/etc/nsswitch.conf
index 6b22df544..6b22df544 100644
--- a/etc/cameron-efco/nsswitch.conf
+++ b/projects/cameron-efco/etc/nsswitch.conf
diff --git a/etc/cameron-efco/passwd b/projects/cameron-efco/etc/passwd
index 4282df104..4282df104 100644
--- a/etc/cameron-efco/passwd
+++ b/projects/cameron-efco/etc/passwd
diff --git a/etc/cameron-efco/profile b/projects/cameron-efco/etc/profile
index 7fef6dab1..7fef6dab1 100644
--- a/etc/cameron-efco/profile
+++ b/projects/cameron-efco/etc/profile
diff --git a/etc/cameron-efco/resolv.conf b/projects/cameron-efco/etc/resolv.conf
index 228b594f4..228b594f4 100644
--- a/etc/cameron-efco/resolv.conf
+++ b/projects/cameron-efco/etc/resolv.conf
diff --git a/etc/cameron-efco/shadow b/projects/cameron-efco/etc/shadow
index df9e826ac..df9e826ac 100644
--- a/etc/cameron-efco/shadow
+++ b/projects/cameron-efco/etc/shadow
diff --git a/etc/cameron-efco/shadow- b/projects/cameron-efco/etc/shadow-
index d362715e8..d362715e8 100644
--- a/etc/cameron-efco/shadow-
+++ b/projects/cameron-efco/etc/shadow-
diff --git a/config/ppc405-cameron.ptxconfig b/projects/cameron-efco/ppc405-cameron.ptxconfig
index 83afbae05..83afbae05 100644
--- a/config/ppc405-cameron.ptxconfig
+++ b/projects/cameron-efco/ppc405-cameron.ptxconfig
diff --git a/projects/frako/etc/boottime.kmap b/projects/frako/etc/boottime.kmap
new file mode 100644
index 000000000..f4c3f7da0
--- /dev/null
+++ b/projects/frako/etc/boottime.kmap
diff --git a/etc/frako/fstab b/projects/frako/etc/fstab
index 9303f1830..9303f1830 100644
--- a/etc/frako/fstab
+++ b/projects/frako/etc/fstab
diff --git a/etc/frako/group b/projects/frako/etc/group
index bd5e1baf0..bd5e1baf0 100644
--- a/etc/frako/group
+++ b/projects/frako/etc/group
diff --git a/etc/cameron-efco/gshadow b/projects/frako/etc/gshadow
index 43a083cca..43a083cca 100644
--- a/etc/cameron-efco/gshadow
+++ b/projects/frako/etc/gshadow
diff --git a/etc/frako/hostname b/projects/frako/etc/hostname
index a9b4feb1e..a9b4feb1e 100644
--- a/etc/frako/hostname
+++ b/projects/frako/etc/hostname
diff --git a/etc/frako/hosts b/projects/frako/etc/hosts
index 03e148d16..03e148d16 100644
--- a/etc/frako/hosts
+++ b/projects/frako/etc/hosts
diff --git a/etc/cameron-efco/init.d/banner b/projects/frako/etc/init.d/banner
index 900d9f01a..900d9f01a 100755
--- a/etc/cameron-efco/init.d/banner
+++ b/projects/frako/etc/init.d/banner
diff --git a/etc/frako/init.d/rcS b/projects/frako/etc/init.d/rcS
index 908e02666..908e02666 100755
--- a/etc/frako/init.d/rcS
+++ b/projects/frako/etc/init.d/rcS
diff --git a/etc/frako/inittab b/projects/frako/etc/inittab
index 507b62253..507b62253 100644
--- a/etc/frako/inittab
+++ b/projects/frako/etc/inittab
diff --git a/etc/frako/mgetty+sendfax/dialin.config b/projects/frako/etc/mgetty+sendfax/dialin.config
index 74c893050..74c893050 100644
--- a/etc/frako/mgetty+sendfax/dialin.config
+++ b/projects/frako/etc/mgetty+sendfax/dialin.config
diff --git a/etc/frako/mgetty+sendfax/faxrunq.config b/projects/frako/etc/mgetty+sendfax/faxrunq.config
index 532f152a8..532f152a8 100644
--- a/etc/frako/mgetty+sendfax/faxrunq.config
+++ b/projects/frako/etc/mgetty+sendfax/faxrunq.config
diff --git a/etc/frako/mgetty+sendfax/login.config b/projects/frako/etc/mgetty+sendfax/login.config
index 8f162ed02..8f162ed02 100644
--- a/etc/frako/mgetty+sendfax/login.config
+++ b/projects/frako/etc/mgetty+sendfax/login.config
diff --git a/etc/frako/mgetty+sendfax/mgetty.config b/projects/frako/etc/mgetty+sendfax/mgetty.config
index 72a4d67b5..72a4d67b5 100644
--- a/etc/frako/mgetty+sendfax/mgetty.config
+++ b/projects/frako/etc/mgetty+sendfax/mgetty.config
diff --git a/etc/frako/mgetty+sendfax/sendfax.config b/projects/frako/etc/mgetty+sendfax/sendfax.config
index 33a79ca90..33a79ca90 100644
--- a/etc/frako/mgetty+sendfax/sendfax.config
+++ b/projects/frako/etc/mgetty+sendfax/sendfax.config
diff --git a/etc/frako/nsswitch.conf b/projects/frako/etc/nsswitch.conf
index 168493364..168493364 100644
--- a/etc/frako/nsswitch.conf
+++ b/projects/frako/etc/nsswitch.conf
diff --git a/etc/frako/passwd b/projects/frako/etc/passwd
index ea00fe9c2..ea00fe9c2 100644
--- a/etc/frako/passwd
+++ b/projects/frako/etc/passwd
diff --git a/etc/frako/ppp/chap-secrets b/projects/frako/etc/ppp/chap-secrets
index 18fc30fe4..18fc30fe4 100644
--- a/etc/frako/ppp/chap-secrets
+++ b/projects/frako/etc/ppp/chap-secrets
diff --git a/etc/frako/ppp/filters b/projects/frako/etc/ppp/filters
index 526b2d26f..526b2d26f 100644
--- a/etc/frako/ppp/filters
+++ b/projects/frako/etc/ppp/filters
diff --git a/etc/frako/ppp/options b/projects/frako/etc/ppp/options
index ca2a18d38..ca2a18d38 100644
--- a/etc/frako/ppp/options
+++ b/projects/frako/etc/ppp/options
diff --git a/etc/frako/ppp/pap-secrets b/projects/frako/etc/ppp/pap-secrets
index 52a7a65b5..52a7a65b5 100644
--- a/etc/frako/ppp/pap-secrets
+++ b/projects/frako/etc/ppp/pap-secrets
diff --git a/etc/frako/profile b/projects/frako/etc/profile
index b5d5cb3c7..b5d5cb3c7 100644
--- a/etc/frako/profile
+++ b/projects/frako/etc/profile
diff --git a/etc/frako/proftpd.conf b/projects/frako/etc/proftpd.conf
index 4337a3db3..4337a3db3 100644
--- a/etc/frako/proftpd.conf
+++ b/projects/frako/etc/proftpd.conf
diff --git a/etc/frako/ptx_permissions.unconfigured b/projects/frako/etc/ptx_permissions.unconfigured
index 47b78bda6..47b78bda6 100644
--- a/etc/frako/ptx_permissions.unconfigured
+++ b/projects/frako/etc/ptx_permissions.unconfigured
diff --git a/etc/frako/resolv.conf b/projects/frako/etc/resolv.conf
index 9538ad5e0..9538ad5e0 100644
--- a/etc/frako/resolv.conf
+++ b/projects/frako/etc/resolv.conf
diff --git a/etc/frako/shadow b/projects/frako/etc/shadow
index 1416bac7a..1416bac7a 100644
--- a/etc/frako/shadow
+++ b/projects/frako/etc/shadow
diff --git a/etc/frako/shadow- b/projects/frako/etc/shadow-
index 1416bac7a..1416bac7a 100644
--- a/etc/frako/shadow-
+++ b/projects/frako/etc/shadow-
diff --git a/config/i386-frako.ptxconfig b/projects/frako/frako.ptxconfig
index 1bea18b0a..1bea18b0a 100644
--- a/config/i386-frako.ptxconfig
+++ b/projects/frako/frako.ptxconfig
diff --git a/etc/generic/fstab b/projects/generic/etc/fstab
index 7b92351fd..b91f5e0cf 100644
--- a/etc/generic/fstab
+++ b/projects/generic/etc/fstab
@@ -1,7 +1,7 @@
 #
 # /etc/fstab
 #
-# $Id: fstab,v 1.2 2004/08/23 08:10:43 rsc Exp $
+# $Id$
 #
 
 proc    /proc           proc    defaults        0       0
diff --git a/etc/generic/group b/projects/generic/etc/group
index b5f2e0e74..b5f2e0e74 100644
--- a/etc/generic/group
+++ b/projects/generic/etc/group
diff --git a/etc/generic/gshadow b/projects/generic/etc/gshadow
index f215519e9..f215519e9 100644
--- a/etc/generic/gshadow
+++ b/projects/generic/etc/gshadow
diff --git a/etc/generic/hostname b/projects/generic/etc/hostname
index 775158876..775158876 100644
--- a/etc/generic/hostname
+++ b/projects/generic/etc/hostname
diff --git a/etc/flowscreen2/hosts b/projects/generic/etc/hosts
index ba712fe03..ba712fe03 100644
--- a/etc/flowscreen2/hosts
+++ b/projects/generic/etc/hosts
diff --git a/etc/generic/init.d/banner b/projects/generic/etc/init.d/banner
index bb87b251b..bb87b251b 100644
--- a/etc/generic/init.d/banner
+++ b/projects/generic/etc/init.d/banner
diff --git a/etc/generic/init.d/net2flash b/projects/generic/etc/init.d/net2flash
index 943336cdb..943336cdb 100644
--- a/etc/generic/init.d/net2flash
+++ b/projects/generic/etc/init.d/net2flash
diff --git a/etc/generic/init.d/networking b/projects/generic/etc/init.d/networking
index ebccb9fe6..ebccb9fe6 100644
--- a/etc/generic/init.d/networking
+++ b/projects/generic/etc/init.d/networking
diff --git a/etc/generic/init.d/proftpd b/projects/generic/etc/init.d/proftpd
index 940cefef4..bb3c0c1f2 100644
--- a/etc/generic/init.d/proftpd
+++ b/projects/generic/etc/init.d/proftpd
@@ -2,7 +2,7 @@
 #
 # /etc/init.d/proftpd
 #
-# $Id: proftpd,v 1.1 2004/08/26 06:21:12 rsc Exp $
+# $Id$
 #
 
 echo Starting proftpd...
diff --git a/etc/generic/init.d/rcS b/projects/generic/etc/init.d/rcS
index b0e178494..7c6ccf40d 100644
--- a/etc/generic/init.d/rcS
+++ b/projects/generic/etc/init.d/rcS
@@ -2,7 +2,7 @@
 #
 # /etc/init.d/rcS
 #
-# $Id: rcS,v 1.5 2004/08/23 08:10:43 rsc Exp $
+# $Id$
 #
 
 echo -n "mounting filesystems..."
diff --git a/etc/generic/init.d/utelnetd b/projects/generic/etc/init.d/utelnetd
index c9b60bf6b..fc686e86f 100644
--- a/etc/generic/init.d/utelnetd
+++ b/projects/generic/etc/init.d/utelnetd
@@ -2,7 +2,7 @@
 #
 # /etc/init.d/utelnetd
 #
-# $Id: utelnetd,v 1.1 2004/08/23 17:19:09 rsc Exp $
+# $Id$
 #
 
 echo Starting utelnetd...
diff --git a/etc/generic/inittab b/projects/generic/etc/inittab
index 9cf5c444b..3ba682fbd 100644
--- a/etc/generic/inittab
+++ b/projects/generic/etc/inittab
@@ -1,7 +1,7 @@
 # 
 # /etc/inittab
 #
-# $Id: inittab,v 1.6 2004/08/23 08:10:43 rsc Exp $
+# $Id$
 #
 
 console::sysinit:/etc/init.d/rcS
diff --git a/etc/generic/passwd b/projects/generic/etc/passwd
index a81ca355c..a81ca355c 100644
--- a/etc/generic/passwd
+++ b/projects/generic/etc/passwd
diff --git a/etc/generic/profile b/projects/generic/etc/profile
index 331699d45..45ff3599a 100644
--- a/etc/generic/profile
+++ b/projects/generic/etc/profile
@@ -1,7 +1,7 @@
 #
 # /etc/profile
 #
-# $Id: profile,v 1.4 2004/08/23 08:10:43 rsc Exp $
+# $Id$
 #
 
 export PATH="$PATH:/usr/bin:/bin:/sbin"
diff --git a/etc/generic/proftpd.conf b/projects/generic/etc/proftpd.conf
index 4337a3db3..4337a3db3 100644
--- a/etc/generic/proftpd.conf
+++ b/projects/generic/etc/proftpd.conf
diff --git a/etc/generic/protocols b/projects/generic/etc/protocols
index 04135041a..04135041a 100644
--- a/etc/generic/protocols
+++ b/projects/generic/etc/protocols
diff --git a/etc/generic/ptx_permissions.unconfigured b/projects/generic/etc/ptx_permissions.unconfigured
index fc96d460c..fc96d460c 100644
--- a/etc/generic/ptx_permissions.unconfigured
+++ b/projects/generic/etc/ptx_permissions.unconfigured
diff --git a/etc/generic/resolv.conf b/projects/generic/etc/resolv.conf
index bdf2b466d..bdf2b466d 100644
--- a/etc/generic/resolv.conf
+++ b/projects/generic/etc/resolv.conf
diff --git a/etc/generic/shadow b/projects/generic/etc/shadow
index eb45e76be..eb45e76be 100644
--- a/etc/generic/shadow
+++ b/projects/generic/etc/shadow
diff --git a/etc/generic/shadow- b/projects/generic/etc/shadow-
index 40b25ab0e..40b25ab0e 100644
--- a/etc/generic/shadow-
+++ b/projects/generic/etc/shadow-
diff --git a/etc/generic/udhcpc.script b/projects/generic/etc/udhcpc.script
index 6991e2ae4..130c37e0c 100644
--- a/etc/generic/udhcpc.script
+++ b/projects/generic/etc/udhcpc.script
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: udhcpc.script,v 1.2 2004/08/23 08:10:43 rsc Exp $
+# $Id$
 
 [ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
 
diff --git a/config/h7202.ptxconfig b/projects/h7202/h7202.ptxconfig
index 8cf51edcc..8cf51edcc 100644
--- a/config/h7202.ptxconfig
+++ b/projects/h7202/h7202.ptxconfig
diff --git a/config/i386-generic-glibc.ptxconfig b/projects/i386-generic-glibc/i386-generic-glibc.ptxconfig
index 13b558b9a..13b558b9a 100644
--- a/config/i386-generic-glibc.ptxconfig
+++ b/projects/i386-generic-glibc/i386-generic-glibc.ptxconfig
diff --git a/config/i386-generic-uclibc.ptxconfig b/projects/i386-generic-uclibc/i386-generic-uclibc.ptxconfig
index 6681712fc..6681712fc 100644
--- a/config/i386-generic-uclibc.ptxconfig
+++ b/projects/i386-generic-uclibc/i386-generic-uclibc.ptxconfig
diff --git a/etc/innokom/exports b/projects/innokom/etc/exports
index f777f2c3d..f777f2c3d 100644
--- a/etc/innokom/exports
+++ b/projects/innokom/etc/exports
diff --git a/etc/innokom/fstab b/projects/innokom/etc/fstab
index e6053006a..e6053006a 100644
--- a/etc/innokom/fstab
+++ b/projects/innokom/etc/fstab
diff --git a/etc/innokom/group b/projects/innokom/etc/group
index b5f2e0e74..b5f2e0e74 100644
--- a/etc/innokom/group
+++ b/projects/innokom/etc/group
diff --git a/etc/innokom/gshadow b/projects/innokom/etc/gshadow
index f215519e9..f215519e9 100644
--- a/etc/innokom/gshadow
+++ b/projects/innokom/etc/gshadow
diff --git a/etc/generic/hosts b/projects/innokom/etc/hosts
index ba712fe03..ba712fe03 100644
--- a/etc/generic/hosts
+++ b/projects/innokom/etc/hosts
diff --git a/etc/frako/init.d/banner b/projects/innokom/etc/init.d/banner
index 900d9f01a..900d9f01a 100755..100644
--- a/etc/frako/init.d/banner
+++ b/projects/innokom/etc/init.d/banner
diff --git a/etc/innokom/init.d/cleanup-logs b/projects/innokom/etc/init.d/cleanup-logs
index 4d1a2a7fc..4d1a2a7fc 100644
--- a/etc/innokom/init.d/cleanup-logs
+++ b/projects/innokom/etc/init.d/cleanup-logs
diff --git a/etc/innokom/init.d/mount-local b/projects/innokom/etc/init.d/mount-local
index 129f904e4..129f904e4 100644
--- a/etc/innokom/init.d/mount-local
+++ b/projects/innokom/etc/init.d/mount-local
diff --git a/etc/innokom/init.d/mount-nfs b/projects/innokom/etc/init.d/mount-nfs
index 0b48faeca..0b48faeca 100644
--- a/etc/innokom/init.d/mount-nfs
+++ b/projects/innokom/etc/init.d/mount-nfs
diff --git a/etc/innokom/init.d/mount-proc b/projects/innokom/etc/init.d/mount-proc
index 87bf0016a..87bf0016a 100644
--- a/etc/innokom/init.d/mount-proc
+++ b/projects/innokom/etc/init.d/mount-proc
diff --git a/etc/innokom/init.d/net-servers b/projects/innokom/etc/init.d/net-servers
index 4da3ccb38..4da3ccb38 100644
--- a/etc/innokom/init.d/net-servers
+++ b/projects/innokom/etc/init.d/net-servers
diff --git a/etc/innokom/init.d/network-eth b/projects/innokom/etc/init.d/network-eth
index 8fd0160a5..8fd0160a5 100644
--- a/etc/innokom/init.d/network-eth
+++ b/projects/innokom/etc/init.d/network-eth
diff --git a/etc/innokom/init.d/network-ppp b/projects/innokom/etc/init.d/network-ppp
index cd97a5dfc..cd97a5dfc 100644
--- a/etc/innokom/init.d/network-ppp
+++ b/projects/innokom/etc/init.d/network-ppp
diff --git a/etc/innokom/init.d/network-usb b/projects/innokom/etc/init.d/network-usb
index 5ebd3ceb4..5ebd3ceb4 100644
--- a/etc/innokom/init.d/network-usb
+++ b/projects/innokom/etc/init.d/network-usb
diff --git a/etc/innokom/init.d/read-hwclock b/projects/innokom/etc/init.d/read-hwclock
index 2cbb59860..2cbb59860 100644
--- a/etc/innokom/init.d/read-hwclock
+++ b/projects/innokom/etc/init.d/read-hwclock
diff --git a/etc/innokom/init.d/root-remount b/projects/innokom/etc/init.d/root-remount
index bede8ae63..bede8ae63 100644
--- a/etc/innokom/init.d/root-remount
+++ b/projects/innokom/etc/init.d/root-remount
diff --git a/etc/innokom/init.d/sys-config b/projects/innokom/etc/init.d/sys-config
index 1041e9939..1041e9939 100644
--- a/etc/innokom/init.d/sys-config
+++ b/projects/innokom/etc/init.d/sys-config
diff --git a/etc/innokom/init.d/syslog b/projects/innokom/etc/init.d/syslog
index c2910a694..c2910a694 100644
--- a/etc/innokom/init.d/syslog
+++ b/projects/innokom/etc/init.d/syslog
diff --git a/etc/innokom/init.d/unlock-flash b/projects/innokom/etc/init.d/unlock-flash
index c182d7a49..c182d7a49 100644
--- a/etc/innokom/init.d/unlock-flash
+++ b/projects/innokom/etc/init.d/unlock-flash
diff --git a/etc/innokom/inittab b/projects/innokom/etc/inittab
index f920650a4..f920650a4 100644
--- a/etc/innokom/inittab
+++ b/projects/innokom/etc/inittab
diff --git a/etc/innokom/mtab b/projects/innokom/etc/mtab
index 9da808e5a..9da808e5a 100644
--- a/etc/innokom/mtab
+++ b/projects/innokom/etc/mtab
diff --git a/etc/innokom/nsswitch.conf b/projects/innokom/etc/nsswitch.conf
index a8f4984cf..a8f4984cf 100644
--- a/etc/innokom/nsswitch.conf
+++ b/projects/innokom/etc/nsswitch.conf
diff --git a/etc/innokom/passwd b/projects/innokom/etc/passwd
index be4a06ca2..be4a06ca2 100644
--- a/etc/innokom/passwd
+++ b/projects/innokom/etc/passwd
diff --git a/etc/innokom/ppp/options b/projects/innokom/etc/ppp/options
index 65d750a1e..65d750a1e 100644
--- a/etc/innokom/ppp/options
+++ b/projects/innokom/etc/ppp/options
diff --git a/etc/innokom/profile b/projects/innokom/etc/profile
index 6cec47962..6cec47962 100644
--- a/etc/innokom/profile
+++ b/projects/innokom/etc/profile
diff --git a/etc/innokom/proftpd.conf b/projects/innokom/etc/proftpd.conf
index 8c52cee5a..8c52cee5a 100644
--- a/etc/innokom/proftpd.conf
+++ b/projects/innokom/etc/proftpd.conf
diff --git a/etc/innokom/shadow b/projects/innokom/etc/shadow
index 817b8ad0e..817b8ad0e 100644
--- a/etc/innokom/shadow
+++ b/projects/innokom/etc/shadow
diff --git a/etc/innokom/shadow- b/projects/innokom/etc/shadow-
index 214420cea..214420cea 100644
--- a/etc/innokom/shadow-
+++ b/projects/innokom/etc/shadow-
diff --git a/etc/innokom/udhcpd.conf b/projects/innokom/etc/udhcpd.conf
index ffcda417b..ffcda417b 100644
--- a/etc/innokom/udhcpd.conf
+++ b/projects/innokom/etc/udhcpd.conf
diff --git a/config/innokom-2.4-2.95.ptxconfig b/projects/innokom/innokom-2.4-2.95.ptxconfig
index a81f52944..f1a7f5865 100644
--- a/config/innokom-2.4-2.95.ptxconfig
+++ b/projects/innokom/innokom-2.4-2.95.ptxconfig
@@ -70,21 +70,30 @@ PTXCONF_TARGET_CONFIG_FILE="arm.dat"
 PTXCONF_ARCH="arm"
 PTXCONF_ARCH_USERSPACE="arm"
 PTXCONF_ARM_PROC="armv"
-PTXCONF_GNU_TARGET="arm-softfloat-linux-gnu"
 PTXCONF_PREFIX="$(TOPDIR)/local"
 PTXCONF_ROOT=""
 
 #
-# Cross Toolchain     
+# Toolchain/Crosstool 
+#
+# PTXCONF_CROSSTOOL is not set
+
+#
+# Generic Options
 #
-# PTXCONF_BUILD_CROSSCHAIN is not set
 PTXCONF_CROSSCHAIN_CHECK="2.95.3"
+PTXCONF_GNU_TARGET="arm-softfloat-linux-gnu"
+
+#
+# Non-Crosstool Tools
+#
 # PTXCONF_XCHAIN-DISTCC is not set
 # PTXCONF_XCHAIN-SCONS is not set
 
 #
 # Root Filesystem     
 #
+PTXCONF_ROOTFS=y
 PTXCONF_ROOTFS_DEV=y
 # PTXCONF_ROOTFS_ETC is not set
 PTXCONF_ROOTFS_FLOPPY=y
@@ -202,6 +211,7 @@ PTXCONF_KERNEL_PATCH6_URL=""
 #
 # C Library           
 #
+PTXCONF_LIBC=y
 PTXCONF_GLIBC=y
 # PTXCONF_UCLIBC is not set
 
@@ -1036,7 +1046,7 @@ PTXCONF_NTP_NTPDATE=y
 # OpenAFS             
 #
 # PTXCONF_OPENAFS is not set
-PTXCONF_OPENAFS_1_2_11=y
+# PTXCONF_OPENAFS_1_2_11 is not set
 
 #
 # Portmapper          
diff --git a/config/innokom-2.4-3.3.2.ptxconfig b/projects/innokom/innokom-2.4-3.3.2.ptxconfig
index 186a5939f..18a98c2e2 100644
--- a/config/innokom-2.4-3.3.2.ptxconfig
+++ b/projects/innokom/innokom-2.4-3.3.2.ptxconfig
@@ -70,29 +70,39 @@ PTXCONF_TARGET_CONFIG_FILE="arm.dat"
 PTXCONF_ARCH="arm"
 PTXCONF_ARCH_USERSPACE="arm"
 PTXCONF_ARM_PROC="armv"
-PTXCONF_GNU_TARGET="arm-softfloat-linux-gnu"
 PTXCONF_PREFIX="$(TOPDIR)/local"
 PTXCONF_ROOT=""
 
 #
-# Cross Toolchain     
+# Toolchain/Crosstool 
+#
+# PTXCONF_CROSSTOOL is not set
+
+#
+# Generic Options
 #
-# PTXCONF_BUILD_CROSSCHAIN is not set
 PTXCONF_CROSSCHAIN_CHECK="3.3.2"
+PTXCONF_GNU_TARGET="arm-softfloat-linux-gnu"
+
+#
+# Non-Crosstool Tools
+#
 # PTXCONF_XCHAIN-DISTCC is not set
 # PTXCONF_XCHAIN-SCONS is not set
 
 #
 # Root Filesystem     
 #
-PTXCONF_ROOTFS_PROC=y
+PTXCONF_ROOTFS=y
 PTXCONF_ROOTFS_DEV=y
-PTXCONF_ROOTFS_MNT=y
+# PTXCONF_ROOTFS_ETC is not set
 PTXCONF_ROOTFS_FLOPPY=y
-PTXCONF_ROOTFS_TMP=y
 PTXCONF_ROOTFS_HOME=y
-PTXCONF_ROOTFS_VAR=y
+PTXCONF_ROOTFS_MNT=y
+PTXCONF_ROOTFS_PROC=y
 PTXCONF_ROOTFS_SYS=y
+PTXCONF_ROOTFS_TMP=y
+PTXCONF_ROOTFS_VAR=y
 PTXCONF_VENDORTWEAKS="innokom.make"
 
 #
@@ -113,9 +123,9 @@ PTXCONF_STRACE_SHARED=y
 #
 # Host Tools          
 #
-# PTXCONF_GENEXT2FS is not set
-# PTXCONF_HOSTTOOL_E2FSPROGS is not set
-# PTXCONF_FAKEROOT is not set
+# PTXCONF_HOSTTOOLS_GENEXT2FS is not set
+# PTXCONF_HOSTTOOLS_E2FSPROGS is not set
+PTXCONF_HOSTTOOLS_FAKEROOT=y
 
 #
 # Core System ---    
@@ -183,21 +193,7 @@ PTXCONF_KERNEL_PATCH5_NAME="2.4.26-vrs1-pxa1-mtd20040502-usb20040607-ptx3"
 #
 # 
 #
-PTXCONF_KERNEL_PATCH6_URL="http://www.pengutronix.de/software/linux-arm/linux-gcc-3.3.2/linux-gcc-3.3.2.patch"
-PTXCONF_KERNEL_PATCH6_NAME="linux-gcc-3"
-# PTXCONF_KERNEL_PATCH6_XCHAIN is not set
-
-#
-# 
-#
-PTXCONF_KERNEL_PATCH7_URL="http://www.pengutronix.de/software/ltt/linux-2.4.26-vrs1-pxa1-mtd20040502-usb20040607-ptx3-ltt.diff"
-PTXCONF_KERNEL_PATCH7_NAME="LTT"
-# PTXCONF_KERNEL_PATCH7_XCHAIN is not set
-
-#
-# 
-#
-PTXCONF_KERNEL_PATCH8_URL=""
+PTXCONF_KERNEL_PATCH6_URL=""
 
 #
 # Extentions
@@ -215,6 +211,7 @@ PTXCONF_KERNEL_PATCH8_URL=""
 #
 # C Library           
 #
+PTXCONF_LIBC=y
 PTXCONF_GLIBC=y
 # PTXCONF_UCLIBC is not set
 
@@ -252,6 +249,67 @@ PTXCONF_GLIBC_NSS_FILES=y
 PTXCONF_GLIBC_RESOLV=y
 PTXCONF_GLIBC_NSL=y
 # PTXCONF_GLIBC_GCONV is not set
+
+#
+# Timezone Files
+#
+PTXCONF_GLIBC_ZONEINFO=y
+# PTXCONF_GLIBC_ZONEINFO_AFRICA is not set
+# PTXCONF_GLIBC_ZONEINFO_ATLANTIC is not set
+PTXCONF_GLIBC_ZONEINFO_EUROPE=y
+# PTXCONF_GLIBC_ZONEINFO_EST5EDT is not set
+# PTXCONF_GLIBC_ZONEINFO_CANADA is not set
+# PTXCONF_GLIBC_ZONEINFO_FACTORY is not set
+# PTXCONF_GLIBC_ZONEINFO_GMT0 is not set
+# PTXCONF_GLIBC_ZONEINFO_ICELAND is not set
+# PTXCONF_GLIBC_ZONEINFO_JAPAN is not set
+# PTXCONF_GLIBC_ZONEINFO_MST7MDT is not set
+# PTXCONF_GLIBC_ZONEINFO_NAVAJO is not set
+# PTXCONF_GLIBC_ZONEINFO_WSU is not set
+# PTXCONF_GLIBC_ZONEINFO_AMERICA is not set
+# PTXCONF_GLIBC_ZONEINFO_AUSTRALIA is not set
+# PTXCONF_GLIBC_ZONEINFO_CHILE is not set
+# PTXCONF_GLIBC_ZONEINFO_EGYPT is not set
+# PTXCONF_GLIBC_ZONEINFO_GB is not set
+# PTXCONF_GLIBC_ZONEINFO_INDIAN is not set
+# PTXCONF_GLIBC_ZONEINFO_KWAJALEIN is not set
+# PTXCONF_GLIBC_ZONEINFO_MEXICO is not set
+# PTXCONF_GLIBC_ZONEINFO_PRC is not set
+# PTXCONF_GLIBC_ZONEINFO_ROC is not set
+# PTXCONF_GLIBC_ZONEINFO_UCT is not set
+# PTXCONF_GLIBC_ZONEINFO_WET is not set
+# PTXCONF_GLIBC_ZONEINFO_ANTARCTICA is not set
+# PTXCONF_GLIBC_ZONEINFO_BRAZIL is not set
+# PTXCONF_GLIBC_ZONEINFO_CUBA is not set
+# PTXCONF_GLIBC_ZONEINFO_EIRE is not set
+# PTXCONF_GLIBC_ZONEINFO_IRAN is not set
+# PTXCONF_GLIBC_ZONEINFO_LIBYA is not set
+# PTXCONF_GLIBC_ZONEINFO_MIDEAST is not set
+# PTXCONF_GLIBC_ZONEINFO_PST8PDT is not set
+# PTXCONF_GLIBC_ZONEINFO_ROK is not set
+# PTXCONF_GLIBC_ZONEINFO_US is not set
+# PTXCONF_GLIBC_ZONEINFO_ZULU is not set
+# PTXCONF_GLIBC_ZONEINFO_ARCTIC is not set
+# PTXCONF_GLIBC_ZONEINFO_CET is not set
+# PTXCONF_GLIBC_ZONEINFO_EET is not set
+# PTXCONF_GLIBC_ZONEINFO_ETC is not set
+# PTXCONF_GLIBC_ZONEINFO_GMT is not set
+# PTXCONF_GLIBC_ZONEINFO_HST is not set
+# PTXCONF_GLIBC_ZONEINFO_ISRAEL is not set
+# PTXCONF_GLIBC_ZONEINFO_MET is not set
+# PTXCONF_GLIBC_ZONEINFO_NZ is not set
+# PTXCONF_GLIBC_ZONEINFO_PACIFIC is not set
+# PTXCONF_GLIBC_ZONEINFO_SINGAPORE is not set
+# PTXCONF_GLIBC_ZONEINFO_UTC is not set
+# PTXCONF_GLIBC_ZONEINFO_ASIA is not set
+# PTXCONF_GLIBC_ZONEINFO_CST6CDT is not set
+# PTXCONF_GLIBC_ZONEINFO_EST is not set
+# PTXCONF_GLIBC_ZONEINFO_HONGKONG is not set
+# PTXCONF_GLIBC_ZONEINFO_JAMAICA is not set
+# PTXCONF_GLIBC_ZONEINFO_MST is not set
+# PTXCONF_GLIBC_ZONEINFO_NZ-CHAT is not set
+# PTXCONF_GLIBC_ZONEINFO_SYSTEMV is not set
+# PTXCONF_GLIBC_ZONEINFO_UNIVERSAL is not set
 PTXCONF_UC_TARGET_arm=y
 
 #
@@ -819,7 +877,11 @@ PTXCONF_PDKSH_BRACE_EXPAND=y
 #
 # iptables            
 #
-# PTXCONF_IPTABLES is not set
+PTXCONF_IPTABLES=y
+# PTXCONF_IPTABLES_INSTALL_IP6TABLES is not set
+PTXCONF_IPTABLES_INSTALL_IPTABLES=y
+# PTXCONF_IPTABLES_INSTALL_IPTABLES_RESTORE is not set
+# PTXCONF_IPTABLES_INSTALL_IPTABLES_SAVE is not set
 
 #
 # LSH                 
@@ -888,7 +950,7 @@ PTXCONF_PDKSH_BRACE_EXPAND=y
 #
 # libpcap             
 #
-PTXCONF_LIBPCAP=y
+# PTXCONF_LIBPCAP is not set
 
 #
 # netcat              
@@ -984,7 +1046,7 @@ PTXCONF_NTP_NTPDATE=y
 # OpenAFS             
 #
 # PTXCONF_OPENAFS is not set
-PTXCONF_OPENAFS_1_2_11=y
+# PTXCONF_OPENAFS_1_2_11 is not set
 
 #
 # Portmapper          
@@ -1015,8 +1077,7 @@ PTXCONF_PPP_PLUGINS=y
 #
 # tcpdump             
 #
-PTXCONF_TCPDUMP=y
-PTXCONF_TCPDUMP_DISABLE_CRYPTO=y
+# PTXCONF_TCPDUMP is not set
 
 #
 # tcpwrapper          
diff --git a/config/innokom-2.6-3.3.2.ptxconfig b/projects/innokom/innokom-2.6-3.3.2.ptxconfig
index d28340dc2..d28340dc2 100644
--- a/config/innokom-2.6-3.3.2.ptxconfig
+++ b/projects/innokom/innokom-2.6-3.3.2.ptxconfig
diff --git a/etc/flowscreen2/fstab b/projects/mx1fs2/etc/fstab
index 53c58485d..53c58485d 100644
--- a/etc/flowscreen2/fstab
+++ b/projects/mx1fs2/etc/fstab
diff --git a/etc/cameron-efco/group b/projects/mx1fs2/etc/group
index ab9f480e1..ab9f480e1 100644
--- a/etc/cameron-efco/group
+++ b/projects/mx1fs2/etc/group
diff --git a/etc/flowscreen2/gshadow b/projects/mx1fs2/etc/gshadow
index 43a083cca..43a083cca 100644
--- a/etc/flowscreen2/gshadow
+++ b/projects/mx1fs2/etc/gshadow
diff --git a/etc/innokom/hosts b/projects/mx1fs2/etc/hosts
index ba712fe03..ba712fe03 100644
--- a/etc/innokom/hosts
+++ b/projects/mx1fs2/etc/hosts
diff --git a/etc/flowscreen2/init.d/banner b/projects/mx1fs2/etc/init.d/banner
index 2d5422925..2d5422925 100755
--- a/etc/flowscreen2/init.d/banner
+++ b/projects/mx1fs2/etc/init.d/banner
diff --git a/etc/flowscreen2/init.d/mount-proc b/projects/mx1fs2/etc/init.d/mount-proc
index ec84d0f6f..ec84d0f6f 100755
--- a/etc/flowscreen2/init.d/mount-proc
+++ b/projects/mx1fs2/etc/init.d/mount-proc
diff --git a/etc/flowscreen2/init.d/mount-tmp b/projects/mx1fs2/etc/init.d/mount-tmp
index 44cce5324..44cce5324 100755
--- a/etc/flowscreen2/init.d/mount-tmp
+++ b/projects/mx1fs2/etc/init.d/mount-tmp
diff --git a/etc/flowscreen2/init.d/rcS b/projects/mx1fs2/etc/init.d/rcS
index a4c787070..a4c787070 100755
--- a/etc/flowscreen2/init.d/rcS
+++ b/projects/mx1fs2/etc/init.d/rcS
diff --git a/etc/bmwm-cid_internet/init.d/root-remount b/projects/mx1fs2/etc/init.d/root-remount
index cb0e77efa..cb0e77efa 100755
--- a/etc/bmwm-cid_internet/init.d/root-remount
+++ b/projects/mx1fs2/etc/init.d/root-remount
diff --git a/etc/flowscreen2/init.d/syslog b/projects/mx1fs2/etc/init.d/syslog
index 84abb36a0..84abb36a0 100755
--- a/etc/flowscreen2/init.d/syslog
+++ b/projects/mx1fs2/etc/init.d/syslog
diff --git a/etc/flowscreen2/inittab b/projects/mx1fs2/etc/inittab
index bd0b2d48d..bd0b2d48d 100644
--- a/etc/flowscreen2/inittab
+++ b/projects/mx1fs2/etc/inittab
diff --git a/etc/flowscreen2/mtab b/projects/mx1fs2/etc/mtab
index 186207d28..186207d28 100644
--- a/etc/flowscreen2/mtab
+++ b/projects/mx1fs2/etc/mtab
diff --git a/etc/flowscreen2/nsswitch.conf b/projects/mx1fs2/etc/nsswitch.conf
index e5058be09..e5058be09 100644
--- a/etc/flowscreen2/nsswitch.conf
+++ b/projects/mx1fs2/etc/nsswitch.conf
diff --git a/etc/flowscreen2/passwd b/projects/mx1fs2/etc/passwd
index 5befc8e8b..5befc8e8b 100644
--- a/etc/flowscreen2/passwd
+++ b/projects/mx1fs2/etc/passwd
diff --git a/etc/flowscreen2/profile b/projects/mx1fs2/etc/profile
index 71c60a4cc..71c60a4cc 100644
--- a/etc/flowscreen2/profile
+++ b/projects/mx1fs2/etc/profile
diff --git a/etc/flowscreen2/shadow b/projects/mx1fs2/etc/shadow
index 2e28df9ef..2e28df9ef 100644
--- a/etc/flowscreen2/shadow
+++ b/projects/mx1fs2/etc/shadow
diff --git a/etc/flowscreen2/shadow- b/projects/mx1fs2/etc/shadow-
index 2e28df9ef..2e28df9ef 100644
--- a/etc/flowscreen2/shadow-
+++ b/projects/mx1fs2/etc/shadow-
diff --git a/config/mx1fs2.ptxconfig b/projects/mx1fs2/mx1fs2.ptxconfig
index bdddc3950..bdddc3950 100644
--- a/config/mx1fs2.ptxconfig
+++ b/projects/mx1fs2/mx1fs2.ptxconfig
diff --git a/etc/pii_nge/proftpd.conf b/projects/pii_nge/etc/proftpd.conf
index 4337a3db3..4337a3db3 100644
--- a/etc/pii_nge/proftpd.conf
+++ b/projects/pii_nge/etc/proftpd.conf
diff --git a/config/pii_nge.ptxconfig b/projects/pii_nge/pii_nge.ptxconfig
index 3281b9d5f..3281b9d5f 100644
--- a/config/pii_nge.ptxconfig
+++ b/projects/pii_nge/pii_nge.ptxconfig
diff --git a/projects/ratio-uno/etc/boottime.kmap b/projects/ratio-uno/etc/boottime.kmap
new file mode 100644
index 000000000..f4c3f7da0
--- /dev/null
+++ b/projects/ratio-uno/etc/boottime.kmap
diff --git a/etc/ratio-uno-2053-1/fstab b/projects/ratio-uno/etc/fstab
index 9addb3f8e..9addb3f8e 100644
--- a/etc/ratio-uno-2053-1/fstab
+++ b/projects/ratio-uno/etc/fstab
diff --git a/etc/ratio-uno-2053-1/group b/projects/ratio-uno/etc/group
index bd5e1baf0..bd5e1baf0 100644
--- a/etc/ratio-uno-2053-1/group
+++ b/projects/ratio-uno/etc/group
diff --git a/etc/frako/gshadow b/projects/ratio-uno/etc/gshadow
index 43a083cca..43a083cca 100644
--- a/etc/frako/gshadow
+++ b/projects/ratio-uno/etc/gshadow
diff --git a/etc/ratio-uno-2053-1/hostname b/projects/ratio-uno/etc/hostname
index c3c316621..c3c316621 100644
--- a/etc/ratio-uno-2053-1/hostname
+++ b/projects/ratio-uno/etc/hostname
diff --git a/etc/ratio-uno-2053-1/hosts b/projects/ratio-uno/etc/hosts
index 4a3c46aa4..4a3c46aa4 100644
--- a/etc/ratio-uno-2053-1/hosts
+++ b/projects/ratio-uno/etc/hosts
diff --git a/etc/innokom/init.d/banner b/projects/ratio-uno/etc/init.d/banner
index 900d9f01a..900d9f01a 100644..100755
--- a/etc/innokom/init.d/banner
+++ b/projects/ratio-uno/etc/init.d/banner
diff --git a/etc/ratio-uno-2053-1/init.d/rcS b/projects/ratio-uno/etc/init.d/rcS
index f2c134da1..f2c134da1 100755
--- a/etc/ratio-uno-2053-1/init.d/rcS
+++ b/projects/ratio-uno/etc/init.d/rcS
diff --git a/etc/ratio-uno-2053-1/inittab b/projects/ratio-uno/etc/inittab
index 5795984d5..5795984d5 100644
--- a/etc/ratio-uno-2053-1/inittab
+++ b/projects/ratio-uno/etc/inittab
diff --git a/etc/ratio-uno-2053-1/passwd b/projects/ratio-uno/etc/passwd
index b7567fe57..b7567fe57 100644
--- a/etc/ratio-uno-2053-1/passwd
+++ b/projects/ratio-uno/etc/passwd
diff --git a/etc/ratio-uno-2053-1/profile b/projects/ratio-uno/etc/profile
index b5d5cb3c7..b5d5cb3c7 100644
--- a/etc/ratio-uno-2053-1/profile
+++ b/projects/ratio-uno/etc/profile
diff --git a/etc/ratio-uno-2053-1/proftpd.conf b/projects/ratio-uno/etc/proftpd.conf
index 0c94b725b..0c94b725b 100644
--- a/etc/ratio-uno-2053-1/proftpd.conf
+++ b/projects/ratio-uno/etc/proftpd.conf
diff --git a/etc/ratio-uno-2053-1/ptx_permissions.unconfigured b/projects/ratio-uno/etc/ptx_permissions.unconfigured
index 47b78bda6..47b78bda6 100644
--- a/etc/ratio-uno-2053-1/ptx_permissions.unconfigured
+++ b/projects/ratio-uno/etc/ptx_permissions.unconfigured
diff --git a/etc/ratio-uno-2053-1/rc.d/networking b/projects/ratio-uno/etc/rc.d/networking
index 02ba0be5e..02ba0be5e 100755
--- a/etc/ratio-uno-2053-1/rc.d/networking
+++ b/projects/ratio-uno/etc/rc.d/networking
diff --git a/etc/ratio-uno-2053-1/resolv.conf b/projects/ratio-uno/etc/resolv.conf
index 689000be4..689000be4 100644
--- a/etc/ratio-uno-2053-1/resolv.conf
+++ b/projects/ratio-uno/etc/resolv.conf
diff --git a/etc/ratio-uno-2053-1/shadow b/projects/ratio-uno/etc/shadow
index aa5146e25..aa5146e25 100644
--- a/etc/ratio-uno-2053-1/shadow
+++ b/projects/ratio-uno/etc/shadow
diff --git a/etc/ratio-uno-2053-1/shadow- b/projects/ratio-uno/etc/shadow-
index 40b25ab0e..40b25ab0e 100644
--- a/etc/ratio-uno-2053-1/shadow-
+++ b/projects/ratio-uno/etc/shadow-
diff --git a/etc/ratio-uno-2053-1/udhcpc.script b/projects/ratio-uno/etc/udhcpc.script
index a52a7f812..a52a7f812 100644
--- a/etc/ratio-uno-2053-1/udhcpc.script
+++ b/projects/ratio-uno/etc/udhcpc.script
diff --git a/config/i386-ratio-uno-2053-1.ptxconfig b/projects/ratio-uno/i386-ratio-uno-2053-1.ptxconfig
index 7f2889ae9..7f2889ae9 100644
--- a/config/i386-ratio-uno-2053-1.ptxconfig
+++ b/projects/ratio-uno/i386-ratio-uno-2053-1.ptxconfig
diff --git a/etc/cameron-efco/busybox.conf b/projects/rayonic-i386/etc/busybox.conf
index e69de29bb..e69de29bb 100644
--- a/etc/cameron-efco/busybox.conf
+++ b/projects/rayonic-i386/etc/busybox.conf
diff --git a/etc/rayonic-20030625/fstab b/projects/rayonic-i386/etc/fstab
index fd4be94cc..fd4be94cc 100644
--- a/etc/rayonic-20030625/fstab
+++ b/projects/rayonic-i386/etc/fstab
diff --git a/etc/flowscreen2/group b/projects/rayonic-i386/etc/group
index ab9f480e1..ab9f480e1 100644
--- a/etc/flowscreen2/group
+++ b/projects/rayonic-i386/etc/group
diff --git a/etc/ratio-uno-2053-1/gshadow b/projects/rayonic-i386/etc/gshadow
index 43a083cca..43a083cca 100644
--- a/etc/ratio-uno-2053-1/gshadow
+++ b/projects/rayonic-i386/etc/gshadow
diff --git a/etc/rayonic-20030625/init.d/rcS b/projects/rayonic-i386/etc/init.d/rcS
index 2dfcc6370..2dfcc6370 100755
--- a/etc/rayonic-20030625/init.d/rcS
+++ b/projects/rayonic-i386/etc/init.d/rcS
diff --git a/etc/flowscreen2/init.d/root-remount b/projects/rayonic-i386/etc/init.d/root-remount
index cb0e77efa..cb0e77efa 100755
--- a/etc/flowscreen2/init.d/root-remount
+++ b/projects/rayonic-i386/etc/init.d/root-remount
diff --git a/etc/rayonic-20030625/inittab b/projects/rayonic-i386/etc/inittab
index 861dd530f..861dd530f 100644
--- a/etc/rayonic-20030625/inittab
+++ b/projects/rayonic-i386/etc/inittab
diff --git a/projects/rayonic-i386/etc/ld.so.cache b/projects/rayonic-i386/etc/ld.so.cache
new file mode 100644
index 000000000..768eabadd
--- /dev/null
+++ b/projects/rayonic-i386/etc/ld.so.cache
diff --git a/etc/rayonic-20030625/ld.so.conf b/projects/rayonic-i386/etc/ld.so.conf
index 58f9d88af..58f9d88af 100644
--- a/etc/rayonic-20030625/ld.so.conf
+++ b/projects/rayonic-i386/etc/ld.so.conf
diff --git a/etc/bmwm-cid_internet/mtab b/projects/rayonic-i386/etc/mtab
index e69de29bb..e69de29bb 100644
--- a/etc/bmwm-cid_internet/mtab
+++ b/projects/rayonic-i386/etc/mtab
diff --git a/etc/bmwm-cid_internet/nsswitch.conf b/projects/rayonic-i386/etc/nsswitch.conf
index 15b01d2f9..15b01d2f9 100644
--- a/etc/bmwm-cid_internet/nsswitch.conf
+++ b/projects/rayonic-i386/etc/nsswitch.conf
diff --git a/etc/rayonic-20030625/passwd b/projects/rayonic-i386/etc/passwd
index d2e15b310..d2e15b310 100644
--- a/etc/rayonic-20030625/passwd
+++ b/projects/rayonic-i386/etc/passwd
diff --git a/etc/rayonic-20030625/profile b/projects/rayonic-i386/etc/profile
index 60bf1d5e0..60bf1d5e0 100644
--- a/etc/rayonic-20030625/profile
+++ b/projects/rayonic-i386/etc/profile
diff --git a/etc/bmwm-cid_internet/proftpd.conf b/projects/rayonic-i386/etc/proftpd.conf
index 6cf1b566f..6cf1b566f 100644
--- a/etc/bmwm-cid_internet/proftpd.conf
+++ b/projects/rayonic-i386/etc/proftpd.conf
diff --git a/etc/rayonic-20030625/resolv.conf b/projects/rayonic-i386/etc/resolv.conf
index 5bf7846e2..5bf7846e2 100644
--- a/etc/rayonic-20030625/resolv.conf
+++ b/projects/rayonic-i386/etc/resolv.conf
diff --git a/etc/rayonic-20030625/shadow b/projects/rayonic-i386/etc/shadow
index baac092c0..baac092c0 100644
--- a/etc/rayonic-20030625/shadow
+++ b/projects/rayonic-i386/etc/shadow
diff --git a/etc/rayonic-20030625/shadow- b/projects/rayonic-i386/etc/shadow-
index 2e28df9ef..2e28df9ef 100644
--- a/etc/rayonic-20030625/shadow-
+++ b/projects/rayonic-i386/etc/shadow-
diff --git a/etc/bmwm-cid_internet/xmodmap b/projects/rayonic-i386/etc/xmodmap
index 4cad8feca..4cad8feca 100644
--- a/etc/bmwm-cid_internet/xmodmap
+++ b/projects/rayonic-i386/etc/xmodmap
diff --git a/config/i386-rayonic.ptxconfig b/projects/rayonic-i386/i386-rayonic.ptxconfig
index 0963c80ed..0963c80ed 100644
--- a/config/i386-rayonic.ptxconfig
+++ b/projects/rayonic-i386/i386-rayonic.ptxconfig
diff --git a/config/i586-rayonic.ptxconfig b/projects/rayonic-i386/i586-rayonic.ptxconfig
index 17af67d5b..17af67d5b 100644
--- a/config/i586-rayonic.ptxconfig
+++ b/projects/rayonic-i386/i586-rayonic.ptxconfig
diff --git a/config/geode-roi_eics.ptxconfig b/projects/roi-eics/roi-eics.ptxconfig
index 8f7e94319..8f7e94319 100644
--- a/config/geode-roi_eics.ptxconfig
+++ b/projects/roi-eics/roi-eics.ptxconfig
diff --git a/etc/rayonic-20030625/busybox.conf b/projects/scII-bmwm/etc-20030913-1/busybox.conf
index e69de29bb..e69de29bb 100644
--- a/etc/rayonic-20030625/busybox.conf
+++ b/projects/scII-bmwm/etc-20030913-1/busybox.conf
diff --git a/etc/bmwm-cid_internet/components/MOZILLA_FIVE_HOME b/projects/scII-bmwm/etc-20030913-1/components/MOZILLA_FIVE_HOME
index e69de29bb..e69de29bb 100644
--- a/etc/bmwm-cid_internet/components/MOZILLA_FIVE_HOME
+++ b/projects/scII-bmwm/etc-20030913-1/components/MOZILLA_FIVE_HOME
diff --git a/etc/scII-bmwm-20030913-1/fstab b/projects/scII-bmwm/etc-20030913-1/fstab
index fd4be94cc..fd4be94cc 100644
--- a/etc/scII-bmwm-20030913-1/fstab
+++ b/projects/scII-bmwm/etc-20030913-1/fstab
diff --git a/etc/rayonic-20030625/group b/projects/scII-bmwm/etc-20030913-1/group
index ab9f480e1..ab9f480e1 100644
--- a/etc/rayonic-20030625/group
+++ b/projects/scII-bmwm/etc-20030913-1/group
diff --git a/etc/rayonic-20030625/gshadow b/projects/scII-bmwm/etc-20030913-1/gshadow
index 43a083cca..43a083cca 100644
--- a/etc/rayonic-20030625/gshadow
+++ b/projects/scII-bmwm/etc-20030913-1/gshadow
diff --git a/etc/bmwm-cid_internet/gtk-2.0/DUMMY b/projects/scII-bmwm/etc-20030913-1/gtk-2.0/DUMMY
index e69de29bb..e69de29bb 100644
--- a/etc/bmwm-cid_internet/gtk-2.0/DUMMY
+++ b/projects/scII-bmwm/etc-20030913-1/gtk-2.0/DUMMY
diff --git a/etc/scII-bmwm-20030913-1/init.d/rcS b/projects/scII-bmwm/etc-20030913-1/init.d/rcS
index 2dfcc6370..2dfcc6370 100755
--- a/etc/scII-bmwm-20030913-1/init.d/rcS
+++ b/projects/scII-bmwm/etc-20030913-1/init.d/rcS
diff --git a/etc/rayonic-20030625/init.d/root-remount b/projects/scII-bmwm/etc-20030913-1/init.d/root-remount
index cb0e77efa..cb0e77efa 100755
--- a/etc/rayonic-20030625/init.d/root-remount
+++ b/projects/scII-bmwm/etc-20030913-1/init.d/root-remount
diff --git a/etc/scII-bmwm-20030913-1/init.d/startx b/projects/scII-bmwm/etc-20030913-1/init.d/startx
index 84e879961..84e879961 100644
--- a/etc/scII-bmwm-20030913-1/init.d/startx
+++ b/projects/scII-bmwm/etc-20030913-1/init.d/startx
diff --git a/etc/scII-bmwm-20030913-1/inittab b/projects/scII-bmwm/etc-20030913-1/inittab
index 3ccef5ffe..3ccef5ffe 100644
--- a/etc/scII-bmwm-20030913-1/inittab
+++ b/projects/scII-bmwm/etc-20030913-1/inittab
diff --git a/projects/scII-bmwm/etc-20030913-1/ld.so.cache b/projects/scII-bmwm/etc-20030913-1/ld.so.cache
new file mode 100644
index 000000000..768eabadd
--- /dev/null
+++ b/projects/scII-bmwm/etc-20030913-1/ld.so.cache
diff --git a/etc/bmwm-cid_internet/ld.so.conf b/projects/scII-bmwm/etc-20030913-1/ld.so.conf
index 2ba16d19a..2ba16d19a 100644
--- a/etc/bmwm-cid_internet/ld.so.conf
+++ b/projects/scII-bmwm/etc-20030913-1/ld.so.conf
diff --git a/etc/rayonic-20030625/mtab b/projects/scII-bmwm/etc-20030913-1/mtab
index e69de29bb..e69de29bb 100644
--- a/etc/rayonic-20030625/mtab
+++ b/projects/scII-bmwm/etc-20030913-1/mtab
diff --git a/etc/rayonic-20030625/nsswitch.conf b/projects/scII-bmwm/etc-20030913-1/nsswitch.conf
index 15b01d2f9..15b01d2f9 100644
--- a/etc/rayonic-20030625/nsswitch.conf
+++ b/projects/scII-bmwm/etc-20030913-1/nsswitch.conf
diff --git a/etc/scII-bmwm-20030913-1/passwd b/projects/scII-bmwm/etc-20030913-1/passwd
index d2e15b310..d2e15b310 100644
--- a/etc/scII-bmwm-20030913-1/passwd
+++ b/projects/scII-bmwm/etc-20030913-1/passwd
diff --git a/etc/bmwm-cid_internet/ppp/chap-secrets b/projects/scII-bmwm/etc-20030913-1/ppp/chap-secrets
index 7d1c3cd7c..7d1c3cd7c 100644
--- a/etc/bmwm-cid_internet/ppp/chap-secrets
+++ b/projects/scII-bmwm/etc-20030913-1/ppp/chap-secrets
diff --git a/etc/bmwm-cid_internet/ppp/options b/projects/scII-bmwm/etc-20030913-1/ppp/options
index 4b67b6a0d..4b67b6a0d 100644
--- a/etc/bmwm-cid_internet/ppp/options
+++ b/projects/scII-bmwm/etc-20030913-1/ppp/options
diff --git a/etc/scII-bmwm-20030913-1/ppp/pap-secrets b/projects/scII-bmwm/etc-20030913-1/ppp/pap-secrets
index 826769c5a..826769c5a 100644
--- a/etc/scII-bmwm-20030913-1/ppp/pap-secrets
+++ b/projects/scII-bmwm/etc-20030913-1/ppp/pap-secrets
diff --git a/etc/scII-bmwm-20030913-1/ppp/peers/freenet b/projects/scII-bmwm/etc-20030913-1/ppp/peers/freenet
index d2cf47b27..d2cf47b27 100644
--- a/etc/scII-bmwm-20030913-1/ppp/peers/freenet
+++ b/projects/scII-bmwm/etc-20030913-1/ppp/peers/freenet
diff --git a/etc/scII-bmwm-20030913-1/ppp/peers/freenet.chat b/projects/scII-bmwm/etc-20030913-1/ppp/peers/freenet.chat
index 4b6cc609a..4b6cc609a 100644
--- a/etc/scII-bmwm-20030913-1/ppp/peers/freenet.chat
+++ b/projects/scII-bmwm/etc-20030913-1/ppp/peers/freenet.chat
diff --git a/etc/scII-bmwm-20030913-1/ppp/peers/gprs b/projects/scII-bmwm/etc-20030913-1/ppp/peers/gprs
index bf3bf7748..bf3bf7748 100644
--- a/etc/scII-bmwm-20030913-1/ppp/peers/gprs
+++ b/projects/scII-bmwm/etc-20030913-1/ppp/peers/gprs
diff --git a/etc/scII-bmwm-20030913-1/ppp/peers/gprs-connect-chat b/projects/scII-bmwm/etc-20030913-1/ppp/peers/gprs-connect-chat
index 8f2fafebf..8f2fafebf 100644
--- a/etc/scII-bmwm-20030913-1/ppp/peers/gprs-connect-chat
+++ b/projects/scII-bmwm/etc-20030913-1/ppp/peers/gprs-connect-chat
diff --git a/etc/bmwm-cid_internet/ppp/peers/gprs-disconnect-chat b/projects/scII-bmwm/etc-20030913-1/ppp/peers/gprs-disconnect-chat
index 76be14703..76be14703 100755..100644
--- a/etc/bmwm-cid_internet/ppp/peers/gprs-disconnect-chat
+++ b/projects/scII-bmwm/etc-20030913-1/ppp/peers/gprs-disconnect-chat
diff --git a/etc/scII-bmwm-20030913-1/profile b/projects/scII-bmwm/etc-20030913-1/profile
index 60bf1d5e0..60bf1d5e0 100644
--- a/etc/scII-bmwm-20030913-1/profile
+++ b/projects/scII-bmwm/etc-20030913-1/profile
diff --git a/etc/rayonic-20030625/proftpd.conf b/projects/scII-bmwm/etc-20030913-1/proftpd.conf
index 6cf1b566f..6cf1b566f 100644
--- a/etc/rayonic-20030625/proftpd.conf
+++ b/projects/scII-bmwm/etc-20030913-1/proftpd.conf
diff --git a/etc/scII-bmwm-20030913-1/resolv.conf b/projects/scII-bmwm/etc-20030913-1/resolv.conf
index 5bf7846e2..5bf7846e2 100644
--- a/etc/scII-bmwm-20030913-1/resolv.conf
+++ b/projects/scII-bmwm/etc-20030913-1/resolv.conf
diff --git a/etc/scII-bmwm-20030913-1/shadow b/projects/scII-bmwm/etc-20030913-1/shadow
index baac092c0..baac092c0 100644
--- a/etc/scII-bmwm-20030913-1/shadow
+++ b/projects/scII-bmwm/etc-20030913-1/shadow
diff --git a/etc/scII-bmwm-20030913-1/shadow- b/projects/scII-bmwm/etc-20030913-1/shadow-
index 2e28df9ef..2e28df9ef 100644
--- a/etc/scII-bmwm-20030913-1/shadow-
+++ b/projects/scII-bmwm/etc-20030913-1/shadow-
diff --git a/etc/rayonic-20030625/xmodmap b/projects/scII-bmwm/etc-20030913-1/xmodmap
index 4cad8feca..4cad8feca 100644
--- a/etc/rayonic-20030625/xmodmap
+++ b/projects/scII-bmwm/etc-20030913-1/xmodmap
diff --git a/etc/scII-bmwm-20030913-1/busybox.conf b/projects/scII-bmwm/etc/busybox.conf
index e69de29bb..e69de29bb 100644
--- a/etc/scII-bmwm-20030913-1/busybox.conf
+++ b/projects/scII-bmwm/etc/busybox.conf
diff --git a/etc/scII-bmwm-20030913-1/components/MOZILLA_FIVE_HOME b/projects/scII-bmwm/etc/components/MOZILLA_FIVE_HOME
index e69de29bb..e69de29bb 100644
--- a/etc/scII-bmwm-20030913-1/components/MOZILLA_FIVE_HOME
+++ b/projects/scII-bmwm/etc/components/MOZILLA_FIVE_HOME
diff --git a/build/JUST_FOR_CVS b/projects/scII-bmwm/etc/dropbear/JUST_FOR_CVS
index e69de29bb..e69de29bb 100644
--- a/build/JUST_FOR_CVS
+++ b/projects/scII-bmwm/etc/dropbear/JUST_FOR_CVS
diff --git a/etc/bmwm-cid_internet/fstab b/projects/scII-bmwm/etc/fstab
index e1c142427..e1c142427 100644
--- a/etc/bmwm-cid_internet/fstab
+++ b/projects/scII-bmwm/etc/fstab
diff --git a/etc/scII-bmwm-20030913-1/group b/projects/scII-bmwm/etc/group
index ab9f480e1..ab9f480e1 100644
--- a/etc/scII-bmwm-20030913-1/group
+++ b/projects/scII-bmwm/etc/group
diff --git a/etc/scII-bmwm-20030913-1/gshadow b/projects/scII-bmwm/etc/gshadow
index 43a083cca..43a083cca 100644
--- a/etc/scII-bmwm-20030913-1/gshadow
+++ b/projects/scII-bmwm/etc/gshadow
diff --git a/etc/scII-bmwm-20030913-1/gtk-2.0/DUMMY b/projects/scII-bmwm/etc/gtk-2.0/DUMMY
index e69de29bb..e69de29bb 100644
--- a/etc/scII-bmwm-20030913-1/gtk-2.0/DUMMY
+++ b/projects/scII-bmwm/etc/gtk-2.0/DUMMY
diff --git a/etc/ratio-uno-2053-1/init.d/banner b/projects/scII-bmwm/etc/init.d/banner
index 900d9f01a..900d9f01a 100755
--- a/etc/ratio-uno-2053-1/init.d/banner
+++ b/projects/scII-bmwm/etc/init.d/banner
diff --git a/etc/bmwm-cid_internet/init.d/dropbear b/projects/scII-bmwm/etc/init.d/dropbear
index 2b4593281..2b4593281 100755
--- a/etc/bmwm-cid_internet/init.d/dropbear
+++ b/projects/scII-bmwm/etc/init.d/dropbear
diff --git a/etc/bmwm-cid_internet/init.d/penguzilla b/projects/scII-bmwm/etc/init.d/penguzilla
index 9a3aeb10b..9a3aeb10b 100755
--- a/etc/bmwm-cid_internet/init.d/penguzilla
+++ b/projects/scII-bmwm/etc/init.d/penguzilla
diff --git a/etc/bmwm-cid_internet/init.d/ppp-daemon b/projects/scII-bmwm/etc/init.d/ppp-daemon
index 17ea3b9a3..17ea3b9a3 100755
--- a/etc/bmwm-cid_internet/init.d/ppp-daemon
+++ b/projects/scII-bmwm/etc/init.d/ppp-daemon
diff --git a/etc/bmwm-cid_internet/init.d/ppp-drivers b/projects/scII-bmwm/etc/init.d/ppp-drivers
index a926bdaf9..a926bdaf9 100755
--- a/etc/bmwm-cid_internet/init.d/ppp-drivers
+++ b/projects/scII-bmwm/etc/init.d/ppp-drivers
diff --git a/etc/bmwm-cid_internet/init.d/ppp-link b/projects/scII-bmwm/etc/init.d/ppp-link
index 2ee5783d7..2ee5783d7 100755
--- a/etc/bmwm-cid_internet/init.d/ppp-link
+++ b/projects/scII-bmwm/etc/init.d/ppp-link
diff --git a/etc/bmwm-cid_internet/init.d/ppp-update b/projects/scII-bmwm/etc/init.d/ppp-update
index ea2ac48e2..ea2ac48e2 100755
--- a/etc/bmwm-cid_internet/init.d/ppp-update
+++ b/projects/scII-bmwm/etc/init.d/ppp-update
diff --git a/etc/bmwm-cid_internet/init.d/rcS b/projects/scII-bmwm/etc/init.d/rcS
index 141415476..141415476 100755
--- a/etc/bmwm-cid_internet/init.d/rcS
+++ b/projects/scII-bmwm/etc/init.d/rcS
diff --git a/etc/scII-bmwm-20030913-1/init.d/root-remount b/projects/scII-bmwm/etc/init.d/root-remount
index cb0e77efa..cb0e77efa 100755
--- a/etc/scII-bmwm-20030913-1/init.d/root-remount
+++ b/projects/scII-bmwm/etc/init.d/root-remount
diff --git a/etc/bmwm-cid_internet/init.d/serial b/projects/scII-bmwm/etc/init.d/serial
index b7d4af8b1..b7d4af8b1 100755
--- a/etc/bmwm-cid_internet/init.d/serial
+++ b/projects/scII-bmwm/etc/init.d/serial
diff --git a/etc/bmwm-cid_internet/init.d/startx b/projects/scII-bmwm/etc/init.d/startx
index 819b4bafb..819b4bafb 100644
--- a/etc/bmwm-cid_internet/init.d/startx
+++ b/projects/scII-bmwm/etc/init.d/startx
diff --git a/etc/bmwm-cid_internet/init.d/syslog b/projects/scII-bmwm/etc/init.d/syslog
index 53b408d74..53b408d74 100755
--- a/etc/bmwm-cid_internet/init.d/syslog
+++ b/projects/scII-bmwm/etc/init.d/syslog
diff --git a/etc/bmwm-cid_internet/init.d/xfree86 b/projects/scII-bmwm/etc/init.d/xfree86
index 202511a19..202511a19 100755
--- a/etc/bmwm-cid_internet/init.d/xfree86
+++ b/projects/scII-bmwm/etc/init.d/xfree86
diff --git a/etc/bmwm-cid_internet/inittab b/projects/scII-bmwm/etc/inittab
index 26b42c221..26b42c221 100644
--- a/etc/bmwm-cid_internet/inittab
+++ b/projects/scII-bmwm/etc/inittab
diff --git a/projects/scII-bmwm/etc/ld.so.cache b/projects/scII-bmwm/etc/ld.so.cache
new file mode 100644
index 000000000..768eabadd
--- /dev/null
+++ b/projects/scII-bmwm/etc/ld.so.cache
diff --git a/etc/scII-bmwm-20030913-1/ld.so.conf b/projects/scII-bmwm/etc/ld.so.conf
index 2ba16d19a..2ba16d19a 100644
--- a/etc/scII-bmwm-20030913-1/ld.so.conf
+++ b/projects/scII-bmwm/etc/ld.so.conf
diff --git a/etc/scII-bmwm-20030913-1/mtab b/projects/scII-bmwm/etc/mtab
index e69de29bb..e69de29bb 100644
--- a/etc/scII-bmwm-20030913-1/mtab
+++ b/projects/scII-bmwm/etc/mtab
diff --git a/etc/scII-bmwm-20030913-1/nsswitch.conf b/projects/scII-bmwm/etc/nsswitch.conf
index 15b01d2f9..15b01d2f9 100644
--- a/etc/scII-bmwm-20030913-1/nsswitch.conf
+++ b/projects/scII-bmwm/etc/nsswitch.conf
diff --git a/etc/bmwm-cid_internet/passwd b/projects/scII-bmwm/etc/passwd
index daed619d5..daed619d5 100644
--- a/etc/bmwm-cid_internet/passwd
+++ b/projects/scII-bmwm/etc/passwd
diff --git a/etc/bmwm-cid_internet/penguzilla_settings b/projects/scII-bmwm/etc/penguzilla_settings
index 7e19c8d44..7e19c8d44 100644
--- a/etc/bmwm-cid_internet/penguzilla_settings
+++ b/projects/scII-bmwm/etc/penguzilla_settings
diff --git a/etc/scII-bmwm-20030913-1/ppp/chap-secrets b/projects/scII-bmwm/etc/ppp/chap-secrets
index 7d1c3cd7c..7d1c3cd7c 100644
--- a/etc/scII-bmwm-20030913-1/ppp/chap-secrets
+++ b/projects/scII-bmwm/etc/ppp/chap-secrets
diff --git a/etc/scII-bmwm-20030913-1/ppp/options b/projects/scII-bmwm/etc/ppp/options
index 4b67b6a0d..4b67b6a0d 100644
--- a/etc/scII-bmwm-20030913-1/ppp/options
+++ b/projects/scII-bmwm/etc/ppp/options
diff --git a/etc/bmwm-cid_internet/ppp/pap-secrets.in b/projects/scII-bmwm/etc/ppp/pap-secrets.in
index c79378b68..c79378b68 100644
--- a/etc/bmwm-cid_internet/ppp/pap-secrets.in
+++ b/projects/scII-bmwm/etc/ppp/pap-secrets.in
diff --git a/etc/bmwm-cid_internet/ppp/peers/gprs-connect-chat.in b/projects/scII-bmwm/etc/ppp/peers/gprs-connect-chat.in
index 9d767d223..9d767d223 100755
--- a/etc/bmwm-cid_internet/ppp/peers/gprs-connect-chat.in
+++ b/projects/scII-bmwm/etc/ppp/peers/gprs-connect-chat.in
diff --git a/etc/scII-bmwm-20030913-1/ppp/peers/gprs-disconnect-chat b/projects/scII-bmwm/etc/ppp/peers/gprs-disconnect-chat
index 76be14703..76be14703 100644..100755
--- a/etc/scII-bmwm-20030913-1/ppp/peers/gprs-disconnect-chat
+++ b/projects/scII-bmwm/etc/ppp/peers/gprs-disconnect-chat
diff --git a/etc/bmwm-cid_internet/ppp/peers/gprs.in b/projects/scII-bmwm/etc/ppp/peers/gprs.in
index d4b15f5bc..d4b15f5bc 100644
--- a/etc/bmwm-cid_internet/ppp/peers/gprs.in
+++ b/projects/scII-bmwm/etc/ppp/peers/gprs.in
diff --git a/etc/bmwm-cid_internet/profile b/projects/scII-bmwm/etc/profile
index 997f9860f..997f9860f 100644
--- a/etc/bmwm-cid_internet/profile
+++ b/projects/scII-bmwm/etc/profile
diff --git a/etc/scII-bmwm-20030913-1/proftpd.conf b/projects/scII-bmwm/etc/proftpd.conf
index 6cf1b566f..6cf1b566f 100644
--- a/etc/scII-bmwm-20030913-1/proftpd.conf
+++ b/projects/scII-bmwm/etc/proftpd.conf
diff --git a/etc/bmwm-cid_internet/protocols b/projects/scII-bmwm/etc/protocols
index fead70a5e..fead70a5e 100644
--- a/etc/bmwm-cid_internet/protocols
+++ b/projects/scII-bmwm/etc/protocols
diff --git a/etc/bmwm-cid_internet/resolv.conf b/projects/scII-bmwm/etc/resolv.conf
index 8ee178f03..8ee178f03 100644
--- a/etc/bmwm-cid_internet/resolv.conf
+++ b/projects/scII-bmwm/etc/resolv.conf
diff --git a/etc/bmwm-cid_internet/shadow b/projects/scII-bmwm/etc/shadow
index 13e290264..13e290264 100644
--- a/etc/bmwm-cid_internet/shadow
+++ b/projects/scII-bmwm/etc/shadow
diff --git a/etc/bmwm-cid_internet/shadow- b/projects/scII-bmwm/etc/shadow-
index d12144263..d12144263 100644
--- a/etc/bmwm-cid_internet/shadow-
+++ b/projects/scII-bmwm/etc/shadow-
diff --git a/etc/scII-bmwm-20030913-1/xmodmap b/projects/scII-bmwm/etc/xmodmap
index 4cad8feca..4cad8feca 100644
--- a/etc/scII-bmwm-20030913-1/xmodmap
+++ b/projects/scII-bmwm/etc/xmodmap
diff --git a/config/i386-scII-bmwm.ptxconfig b/projects/scII-bmwm/i386-scII-bmwm.ptxconfig
index c7890da3d..c7890da3d 100644
--- a/config/i386-scII-bmwm.ptxconfig
+++ b/projects/scII-bmwm/i386-scII-bmwm.ptxconfig
diff --git a/config/toolchain-arm-linux-2.95 b/projects/toolchain-arm-linux-2.95.3/toolchain-arm-linux-2.95.3.ptxconfig
index 41b84ed34..5f00b7faa 100644
--- a/config/toolchain-arm-linux-2.95
+++ b/projects/toolchain-arm-linux-2.95.3/toolchain-arm-linux-2.95.3.ptxconfig
@@ -1,8 +1,9 @@
 #
 # Automatically generated make config: don't edit
 #
+PTXCONF_MODULES=y
 PTXCONF_PTXCONF=y
-PTXCONF_PROJECT="toolchain-arm-linux-2.95"
+PTXCONF_PROJECT="toolchain-arm-linux-2.95.3"
 
 #
 # General Options ---    
@@ -68,41 +69,50 @@ PTXCONF_TARGET_CONFIG_FILE="arm.dat"
 PTXCONF_ARCH="arm"
 PTXCONF_ARCH_USERSPACE="arm"
 PTXCONF_ARM_PROC="armv"
-PTXCONF_GNU_TARGET="arm-unknown-linux-gnu"
-PTXCONF_PREFIX="/opt/ptxdist/arm-linux-2.95"
+PTXCONF_PREFIX="/opt/ptxdist"
 PTXCONF_ROOT=""
 
 #
-# Cross Toolchain     
+# Toolchain/Crosstool 
 #
-PTXCONF_BUILD_CROSSCHAIN=y
-PTXCONF_BINUTILS_2_13_2_1=y
-# PTXCONF_BINUTILS_2_14 is not set
+
+#
+# Crosstool Options
+#
+PTXCONF_CROSSTOOL=y
 PTXCONF_GCC_2_95_3=y
 # PTXCONF_GCC_3_2_3 is not set
 # PTXCONF_GCC_3_3_2 is not set
-PTXCONF_GCC_2=y
-PTXCONF_GCC_SHARED=y
-PTXCONF_GCC_MULTILIB=y
+# PTXCONF_GCC_3_4_0 is not set
+# PTXCONF_GCC_3_4_1 is not set
+PTXCONF_GCC_VERSION="2.95.3"
+PTXCONF_CROSSTOOL_GCCLANG_CC=y
+PTXCONF_BINUTILS_2_14=y
+# PTXCONF_BINUTILS_2_15 is not set
+PTXCONF_BINUTILS_VERSION="2.14"
+
+#
+# Generic Options
+#
+# PTXCONF_GCC_MULTILIB is not set
+PTXCONF_GNU_TARGET="arm-softfloat-linux-gnu"
+
+#
+# Non-Crosstool Tools
+#
 # PTXCONF_XCHAIN-DISTCC is not set
 # PTXCONF_XCHAIN-SCONS is not set
 
 #
 # Root Filesystem     
 #
-# PTXCONF_ROOTFS_PROC is not set
-# PTXCONF_ROOTFS_DEV is not set
-# PTXCONF_ROOTFS_MNT is not set
-# PTXCONF_ROOTFS_FLOPPY is not set
-# PTXCONF_ROOTFS_TMP is not set
-# PTXCONF_ROOTFS_HOME is not set
-# PTXCONF_ROOTFS_VAR is not set
+# PTXCONF_ROOTFS is not set
 PTXCONF_VENDORTWEAKS=""
 
 #
 # Debugging Tools     
 #
-PTXCONF_XGDB=y
+# PTXCONF_XGDB is not set
 # PTXCONF_GDBSERVER is not set
 # PTXCONF_GDB is not set
 # PTXCONF_GDB_WRAPPERS is not set
@@ -116,9 +126,9 @@ PTXCONF_XGDB=y
 #
 # Host Tools          
 #
-# PTXCONF_GENEXT2FS is not set
-# PTXCONF_HOSTTOOL_E2FSPROGS is not set
-# PTXCONF_FAKEROOT is not set
+# PTXCONF_HOSTTOOLS_GENEXT2FS is not set
+# PTXCONF_HOSTTOOLS_E2FSPROGS is not set
+# PTXCONF_HOSTTOOLS_FAKEROOT is not set
 
 #
 # Core System ---    
@@ -127,7 +137,7 @@ PTXCONF_XGDB=y
 #
 # Kernel              
 #
-PTXCONF_KERNEL_CONFIG=""
+PTXCONF_KERNEL_CONFIG="kernel-2.6.8"
 # PTXCONF_KERNEL_2_4_18 is not set
 # PTXCONF_KERNEL_2_4_19 is not set
 # PTXCONF_KERNEL_2_4_20 is not set
@@ -135,9 +145,12 @@ PTXCONF_KERNEL_CONFIG=""
 # PTXCONF_KERNEL_2_4_22 is not set
 # PTXCONF_KERNEL_2_4_23 is not set
 # PTXCONF_KERNEL_2_4_25 is not set
+# PTXCONF_KERNEL_2_4_26 is not set
 # PTXCONF_KERNEL_2_6_0 is not set
 # PTXCONF_KERNEL_2_6_1 is not set
-PTXCONF_KERNEL_2_6_6=y
+# PTXCONF_KERNEL_2_6_6 is not set
+# PTXCONF_KERNEL_2_6_7 is not set
+PTXCONF_KERNEL_2_6_8=y
 PTXCONF_DONT_COMPILE_KERNEL=y
 
 #
@@ -151,7 +164,7 @@ PTXCONF_KERNEL_PATCH1_NAME=""
 #
 
 #
-# RTAI/epoll should be ported to patchstack mechanism, please send patch! :-)
+# epoll should be ported to patchstack mechanism, please send patch! :-)
 #
 
 #
@@ -162,6 +175,7 @@ PTXCONF_KERNEL_PATCH1_NAME=""
 #
 # C Library           
 #
+# PTXCONF_LIBC is not set
 PTXCONF_GLIBC=y
 # PTXCONF_UCLIBC is not set
 
@@ -173,51 +187,18 @@ PTXCONF_GLIBC_2_2_5=y
 # PTXCONF_GLIBC_2_2_4 is not set
 # PTXCONF_GLIBC_2_2_3 is not set
 # PTXCONF_UCLIBC_0_9_26 is not set
-PTXCONF_GLIBC_PTHREADS=y
-# PTXCONF_GLIBC_LIBIO is not set
-PTXCONF_GLIBC_SHARED=y
-PTXCONF_GLIBC_PROFILED=y
-PTXCONF_GLIBC_OMITFP=y
-# PTXCONF_GLIBC_BOUNDED is not set
-# PTXCONF_GLIBC_OPTKERNEL is not set
-# PTXCONF_GLIBC_DEBUG is not set
-
-#
-# Install options
-#
-# PTXCONF_GLIBC_THREAD_DB is not set
-# PTXCONF_GLIBC_DL is not set
-# PTXCONF_GLIBC_CRYPT is not set
-# PTXCONF_GLIBC_UTIL is not set
-# PTXCONF_GLIBC_LIBM is not set
-PTXCONF_GLIBC_NSS_DNS=y
-PTXCONF_GLIBC_NSS_FILES=y
-PTXCONF_GLIBC_NSS_HESIOD=y
-PTXCONF_GLIBC_NSS_NIS=y
-PTXCONF_GLIBC_NSS_NISPLUS=y
-PTXCONF_GLIBC_NSS_COMPAT=y
-PTXCONF_GLIBC_RESOLV=y
-PTXCONF_GLIBC_NSL=y
-# PTXCONF_GLIBC_GCONV is not set
 PTXCONF_UC_TARGET_arm=y
 
 #
 # C++ Library         
 #
-PTXCONF_CXX=y
-PTXCONF_LIBSTDCXX=y
-PTXCONF_LIBSTDCXX_SHARED=y
+# PTXCONF_CXX is not set
 
 #
 # Core Tools ---  
 #
 
 #
-# Pdksh               
-#
-# PTXCONF_PDKSH is not set
-
-#
 # Bash                
 #
 # PTXCONF_BASH is not set
@@ -229,9 +210,9 @@ PTXCONF_LIBSTDCXX_SHARED=y
 PTXCONF_BB_HAVE_DOT_CONFIG=y
 
 #
-# mgetty & sendfax    
+# GNU coreutils       
 #
-# PTXCONF_MGETTY is not set
+# PTXCONF_COREUTILS is not set
 
 #
 # Gawk                
@@ -239,21 +220,34 @@ PTXCONF_BB_HAVE_DOT_CONFIG=y
 # PTXCONF_GAWK is not set
 
 #
+# Hotplug             
+#
+# PTXCONF_HOTPLUG is not set
+
+#
+# hotplug scripts
+#
+
+#
+# mgetty & sendfax    
+#
+# PTXCONF_MGETTY is not set
+
+#
 # MTD Tools           
 #
 # PTXCONF_MTD_XCHAIN is not set
 # PTXCONF_MTD_UTILS is not set
 
 #
-# GNU coreutils       
+# PCMCIA Tools        
 #
-# PTXCONF_COREUTILS is not set
+# PTXCONF_PCMCIA_TOOLS is not set
 
 #
-# util-linux          
+# Pdksh               
 #
-# PTXCONF_UTLNX is not set
-# PTXCONF_CLOCK is not set
+# PTXCONF_PDKSH is not set
 
 #
 # procps              
@@ -261,17 +255,23 @@ PTXCONF_BB_HAVE_DOT_CONFIG=y
 # PTXCONF_PROCPS is not set
 
 #
-# VHLL Support        
+# sysutils            
 #
+# PTXCONF_SYSUTILS is not set
 
 #
-# Python requires libdl on the target (see C Library)
+# util-linux          
 #
+# PTXCONF_UTLNX is not set
+# PTXCONF_CLOCK is not set
 
 #
-# PCMCIA Tools        
+# VHLL Support        
+#
+
+#
+# Python requires libdl on the target (see C Library)
 #
-# PTXCONF_PCMCIA_TOOLS is not set
 
 #
 # Network Tools --- 
@@ -282,9 +282,14 @@ PTXCONF_BB_HAVE_DOT_CONFIG=y
 #
 
 #
-# shorewall firewall  
+# Dropbear SSH-Server 
 #
-# PTXCONF_SHOREWALL is not set
+# PTXCONF_DROPBEAR is not set
+
+#
+# iptables            
+#
+# PTXCONF_IPTABLES is not set
 
 #
 # LSH                 
@@ -302,33 +307,43 @@ PTXCONF_BB_HAVE_DOT_CONFIG=y
 # PTXCONF_OPENSSH is not set
 
 #
-# Dropbear SSH-Server 
+# shorewall firewall  
 #
-# PTXCONF_DROPBEAR is not set
+# PTXCONF_SHOREWALL is not set
 
 #
 # Networking Apps     
 #
 
 #
+# betaftpd            
+#
+# PTXCONF_BETAFTPD is not set
+
+#
+# Bind                
+#
+# PTXCONF_BIND is not set
+
+#
 # bing                
 #
 # PTXCONF_BING is not set
 
 #
-# ppp                 
+# dhcp                
 #
-# PTXCONF_PPP is not set
+# PTXCONF_DHCP is not set
 
 #
-# nmap                
+# dnsmasq             
 #
-# PTXCONF_NMAP is not set
+# PTXCONF_DNSMASQ is not set
 
 #
-# utelnetd            
+# ethereal            
 #
-# PTXCONF_UTELNETD is not set
+# PTXCONF_ETHEREAL is not set
 
 #
 # inetutils           
@@ -336,54 +351,75 @@ PTXCONF_BB_HAVE_DOT_CONFIG=y
 # PTXCONF_INETUTILS is not set
 
 #
-# netcat              
+# libnet              
 #
-# PTXCONF_NETCAT is not set
+# PTXCONF_LIBNET is not set
 
 #
-# proftpd             
+# libpcap             
 #
-# PTXCONF_PROFTPD is not set
+# PTXCONF_LIBPCAP is not set
 
 #
-# betaftpd            
+# netcat              
 #
-# PTXCONF_BETAFTPD is not set
+# PTXCONF_NETCAT is not set
 
 #
 # nfs-utils           
 #
+
+#
+# compile options
+#
 # PTXCONF_NFSUTILS is not set
 
 #
-# Portmapper          
+# install options
 #
-# PTXCONF_PORTMAP is not set
 
 #
-# tcpwrapper          
+# nmap                
 #
-# PTXCONF_TCPWRAPPER is not set
+# PTXCONF_NMAP is not set
 
 #
-# Wireless Tools      
+# NTP                 
 #
-# PTXCONF_WIRELESS is not set
+# PTXCONF_NTP is not set
 
 #
-# GNU Zebra           
+# Compile Options
 #
-# PTXCONF_ZEBRA is not set
 
 #
-# libnet              
+# crypto needs openssl
 #
-# PTXCONF_LIBNET is not set
 
 #
-# libpcap             
+# Install Options
 #
-# PTXCONF_LIBPCAP is not set
+
+#
+# OpenAFS             
+#
+# PTXCONF_OPENAFS is not set
+# PTXCONF_OPENAFS_1_2_11 is not set
+
+#
+# Portmapper          
+#
+# PTXCONF_PORTMAP is not set
+
+#
+# ppp                 
+#
+# PTXCONF_PPP is not set
+
+#
+# proftpd             
+#
+# PTXCONF_PROFTPD is not set
 
 #
 # rsync               
@@ -391,34 +427,46 @@ PTXCONF_BB_HAVE_DOT_CONFIG=y
 # PTXCONF_RSYNC is not set
 
 #
+# tcpdump             
+#
+# PTXCONF_TCPDUMP is not set
+
+#
+# tcpwrapper          
+#
+# PTXCONF_TCPWRAPPER is not set
+
+#
 # thttpd              
 #
 # PTXCONF_THTTPD is not set
 
 #
-# NTP                 
+# utelnetd            
 #
-# PTXCONF_NTP is not set
+# PTXCONF_UTELNETD is not set
 
 #
-# Bind                
+# Wireless Tools      
 #
-# PTXCONF_BIND is not set
+# PTXCONF_WIRELESS is not set
 
 #
-# dhcp                
+# GNU Zebra           
 #
-# PTXCONF_DHCP is not set
+# PTXCONF_ZEBRA is not set
 
 #
-# dnsmasq             
+# Realtime Networking 
 #
-# PTXCONF_DNSMASQ is not set
 
 #
-# tcpdump             
+# Optional Features
+#
+
+#
+# Network Card Support
 #
-# PTXCONF_TCPDUMP is not set
 
 #
 # Disk and file ---   
@@ -436,7 +484,20 @@ PTXCONF_BB_HAVE_DOT_CONFIG=y
 #
 # grub                
 #
+
+#
+# Config Options
+#
+
+#
+# File System Support
+#
+
+#
+# Network Card Support
+#
 # PTXCONF_CRAMFS is not set
+# PTXCONF_BONNIE is not set
 
 #
 # Applications ---    
@@ -463,13 +524,22 @@ PTXCONF_BB_HAVE_DOT_CONFIG=y
 # PTXCONF_SETMIXER is not set
 
 #
+# Tools               
+#
+# PTXCONF_FIGLET is not set
+
+#
+# Editors             
+#
+# PTXCONF_NANO is not set
+
+#
 # System Libraries    
 #
 
 #
 # gettext          
 #
-# PTXCONF_GETTEXT is not set
 
 #
 # popt             
@@ -533,6 +603,20 @@ PTXCONF_BB_HAVE_DOT_CONFIG=y
 #
 
 #
+# Blackbox WM         
+#
+# PTXCONF_BLACKBOX is not set
+
+#
+# Scientific Apps     
+#
+
+#
+# gnuplot          
+#
+# PTXCONF_GNUPLOT is not set
+
+#
 # Web Applications    
 #
 
diff --git a/config/toolchain-arm-linux-3.3.2 b/projects/toolchain-arm-linux-3.3.2/toolchain-arm-linux-3.3.2.ptxconfig
index 198724094..42689ad12 100644
--- a/config/toolchain-arm-linux-3.3.2
+++ b/projects/toolchain-arm-linux-3.3.2/toolchain-arm-linux-3.3.2.ptxconfig
@@ -1,6 +1,7 @@
 #
 # Automatically generated make config: don't edit
 #
+PTXCONF_MODULES=y
 PTXCONF_PTXCONF=y
 PTXCONF_PROJECT="toolchain-arm-linux-3.3.2"
 
@@ -31,6 +32,7 @@ PTXCONF_ARM_ARCH_PXA=y
 # PTXCONF_ARM_ARCH_IXP2000 is not set
 # PTXCONF_ARM_ARCH_NETARM is not set
 # PTXCONF_ARM_ARCH_ATMEL is not set
+# PTXCONF_ARM_ARCH_IMX is not set
 PTXCONF_ARM_ARCH="pxa"
 PTXCONF_ARM_ARCH_LE=y
 PTXCONF_OPT_ARM=y
@@ -67,55 +69,66 @@ PTXCONF_TARGET_CONFIG_FILE="arm.dat"
 PTXCONF_ARCH="arm"
 PTXCONF_ARCH_USERSPACE="arm"
 PTXCONF_ARM_PROC="armv"
-PTXCONF_GNU_TARGET="arm-unknown-linux-gnu"
-PTXCONF_PREFIX="/opt/ptxdist/arm-linux-3.3.2"
+PTXCONF_PREFIX="/opt/ptxdist"
 PTXCONF_ROOT=""
 
 #
-# Cross Toolchain     
+# Toolchain/Crosstool 
 #
-PTXCONF_BUILD_CROSSCHAIN=y
-# PTXCONF_BINUTILS_2_13_2_1 is not set
-PTXCONF_BINUTILS_2_14=y
+
+#
+# Crosstool Options
+#
+PTXCONF_CROSSTOOL=y
 # PTXCONF_GCC_2_95_3 is not set
 # PTXCONF_GCC_3_2_3 is not set
 PTXCONF_GCC_3_3_2=y
-PTXCONF_GCC_3=y
-PTXCONF_GCC_SHARED=y
-PTXCONF_GCC_MULTILIB=y
+# PTXCONF_GCC_3_4_0 is not set
+# PTXCONF_GCC_3_4_1 is not set
+PTXCONF_GCC_VERSION="3.3.2"
+PTXCONF_CROSSTOOL_GCCLANG_CC=y
+PTXCONF_BINUTILS_2_14=y
+# PTXCONF_BINUTILS_2_15 is not set
+PTXCONF_BINUTILS_VERSION="2.14"
+
+#
+# Generic Options
+#
+# PTXCONF_GCC_MULTILIB is not set
+PTXCONF_GNU_TARGET="arm-softfloat-linux-gnu"
+
+#
+# Non-Crosstool Tools
+#
 # PTXCONF_XCHAIN-DISTCC is not set
 # PTXCONF_XCHAIN-SCONS is not set
 
 #
 # Root Filesystem     
 #
-# PTXCONF_ROOTFS_PROC is not set
-# PTXCONF_ROOTFS_DEV is not set
-# PTXCONF_ROOTFS_MNT is not set
-# PTXCONF_ROOTFS_FLOPPY is not set
-# PTXCONF_ROOTFS_TMP is not set
-# PTXCONF_ROOTFS_HOME is not set
-# PTXCONF_ROOTFS_VAR is not set
+# PTXCONF_ROOTFS is not set
 PTXCONF_VENDORTWEAKS=""
 
 #
 # Debugging Tools     
 #
-PTXCONF_XGDB=y
+# PTXCONF_XGDB is not set
 # PTXCONF_GDBSERVER is not set
 # PTXCONF_GDB is not set
 # PTXCONF_GDB_WRAPPERS is not set
 # PTXCONF_KSYMOOPS is not set
 # PTXCONF_LTT is not set
 # PTXCONF_LIBBFD is not set
+# PTXCONF_MEMTEST is not set
 # PTXCONF_OPROFILE is not set
 # PTXCONF_STRACE is not set
 
 #
 # Host Tools          
 #
-# PTXCONF_GENEXT2FS is not set
-# PTXCONF_FAKEROOT is not set
+# PTXCONF_HOSTTOOLS_GENEXT2FS is not set
+# PTXCONF_HOSTTOOLS_E2FSPROGS is not set
+# PTXCONF_HOSTTOOLS_FAKEROOT is not set
 
 #
 # Core System ---    
@@ -124,59 +137,34 @@ PTXCONF_XGDB=y
 #
 # Kernel              
 #
-PTXCONF_KERNEL_CONFIG="kernel-2.6.0-"
+PTXCONF_KERNEL_CONFIG="kernel-2.6.8"
 # PTXCONF_KERNEL_2_4_18 is not set
 # PTXCONF_KERNEL_2_4_19 is not set
 # PTXCONF_KERNEL_2_4_20 is not set
 # PTXCONF_KERNEL_2_4_21 is not set
 # PTXCONF_KERNEL_2_4_22 is not set
 # PTXCONF_KERNEL_2_4_23 is not set
+# PTXCONF_KERNEL_2_4_25 is not set
+# PTXCONF_KERNEL_2_4_26 is not set
 # PTXCONF_KERNEL_2_6_0 is not set
-PTXCONF_KERNEL_2_6_1=y
-# PTXCONF_KERNEL_RMK is not set
-PTXCONF_KERNEL_RMK_PXA=y
-# PTXCONF_KERNEL_RMK_DS is not set
-# PTXCONF_KERNEL_RMK_PXA_PTX is not set
-# PTXCONF_KERNEL_RMK_PXA_PTX_LTT is not set
-# PTXCONF_KERNEL_UC is not set
-# PTXCONF_KERNEL_BEN is not set
-# PTXCONF_KERNEL_VANILLA is not set
-# PTXCONF_KERNEL_2_4_19_rmk7 is not set
-# PTXCONF_KERNEL_2_4_21_rmk1 is not set
-# PTXCONF_KERNEL_2_6_0_rmk1 is not set
-# PTXCONF_KERNEL_2_4_19_rmk7_ds3 is not set
-# PTXCONF_KERNEL_2_4_19_rmk7_ds2 is not set
-# PTXCONF_KERNEL_2_4_19_rmk7_ds1 is not set
-# PTXCONF_KERNEL_2_4_21_rmk1_ds1 is not set
-# PTXCONF_KERNEL_2_4_19_rmk7_pxa2 is not set
-# PTXCONF_KERNEL_2_4_21_rmk1_pxa1 is not set
-# PTXCONF_KERNEL_2_4_19_rmk7_pxa2_mtd20030728_ptx10 is not set
-# PTXCONF_KERNEL_2_4_19_rmk7_pxa2_mtd20030728_ptx7 is not set
-# PTXCONF_KERNEL_2_4_19_rmk7_pxa2_mtd20030728_ptx6 is not set
-# PTXCONF_KERNEL_2_6_0_rmk1_ptx1 is not set
-# PTXCONF_KERNEL_2_4_19_rmk7_pxa2_mtd20030728_ptx10_ltt1 is not set
-# PTXCONF_KERNEL_2_4_19_rmk7_pxa2_mtd20030728_ptx7_ltt1 is not set
-# PTXCONF_KERNEL_2_4_19_rmk7_pxa2_mtd20030728_ptx6_ltt1 is not set
-# PTXCONF_KERNEL_2_4_19_uc2 is not set
-# PTXCONF_KERNEL_2_4_19_uc1 is not set
-# PTXCONF_KERNEL_2_4_19_uc0 is not set
-# PTXCONF_KERNEL_2_4_20_uc1 is not set
-# PTXCONF_KERNEL_2_4_20_uc0 is not set
-# PTXCONF_KERNEL_2_4_21_uc0 is not set
-# PTXCONF_KERNEL_2_4_22_uc0 is not set
-# PTXCONF_KERNEL_2_4_20_ben10 is not set
-# PTXCONF_KERNEL_2_4_21_ben3 is not set
-# PTXCONF_KERNEL_2_4_22_ben2 is not set
+# PTXCONF_KERNEL_2_6_1 is not set
+# PTXCONF_KERNEL_2_6_6 is not set
+# PTXCONF_KERNEL_2_6_7 is not set
+PTXCONF_KERNEL_2_6_8=y
+PTXCONF_DONT_COMPILE_KERNEL=y
+
+#
+# 
+#
 PTXCONF_KERNEL_PATCH1_URL=""
 PTXCONF_KERNEL_PATCH1_NAME=""
-PTXCONF_DONT_COMPILE_KERNEL=y
 
 #
 # Extentions
 #
 
 #
-# epoll               
+# epoll should be ported to patchstack mechanism, please send patch! :-)
 #
 
 #
@@ -187,7 +175,9 @@ PTXCONF_DONT_COMPILE_KERNEL=y
 #
 # C Library           
 #
+# PTXCONF_LIBC is not set
 PTXCONF_GLIBC=y
+# PTXCONF_UCLIBC is not set
 
 #
 # C Library options
@@ -196,94 +186,78 @@ PTXCONF_GLIBC_2_3_2=y
 # PTXCONF_GLIBC_2_2_5 is not set
 # PTXCONF_GLIBC_2_2_4 is not set
 # PTXCONF_GLIBC_2_2_3 is not set
-PTXCONF_GLIBC_PTHREADS=y
-# PTXCONF_GLIBC_LIBIO is not set
-PTXCONF_GLIBC_SHARED=y
-# PTXCONF_GLIBC_PROFILED is not set
-PTXCONF_GLIBC_OMITFP=y
-# PTXCONF_GLIBC_BOUNDED is not set
-# PTXCONF_GLIBC_OPTKERNEL is not set
-# PTXCONF_GLIBC_DEBUG is not set
-
-#
-# Install options
-#
-# PTXCONF_GLIBC_THREAD_DB is not set
-# PTXCONF_GLIBC_DL is not set
-# PTXCONF_GLIBC_CRYPT is not set
-# PTXCONF_GLIBC_UTIL is not set
-# PTXCONF_GLIBC_LIBM is not set
+# PTXCONF_UCLIBC_0_9_26 is not set
+PTXCONF_UC_TARGET_arm=y
 
 #
-# libnss_dns depends on libresolv
+# C++ Library         
 #
-# PTXCONF_GLIBC_NSS_FILES is not set
+# PTXCONF_CXX is not set
 
 #
-# libnss_hesiod depends on libreslov and libnss_files
+# Core Tools ---  
 #
 
 #
-# libnss_nis depends on libnsl and libnss_files
+# Bash                
 #
+# PTXCONF_BASH is not set
 
 #
-# libnss_nisplus depends on libnsl
+# BusyBox             
 #
+# PTXCONF_BUSYBOX is not set
+PTXCONF_BB_HAVE_DOT_CONFIG=y
 
 #
-# libnss_compat depends on libnsl
+# GNU coreutils       
 #
-# PTXCONF_GLIBC_RESOLV is not set
-# PTXCONF_GLIBC_NSL is not set
+# PTXCONF_COREUTILS is not set
 
 #
-# C++ Library         
+# Gawk                
 #
-PTXCONF_CXX=y
-PTXCONF_LIBSTDCXX=y
-PTXCONF_LIBSTDCXX_SHARED=y
+# PTXCONF_GAWK is not set
 
 #
-# Core Tools ---  
+# Hotplug             
 #
+# PTXCONF_HOTPLUG is not set
 
 #
-# Pdksh               
+# hotplug scripts
 #
-# PTXCONF_PDKSH is not set
 
 #
-# Bash                
+# mgetty & sendfax    
 #
-# PTXCONF_BASH is not set
+# PTXCONF_MGETTY is not set
 
 #
-# BusyBox             
+# MTD Tools           
 #
-# PTXCONF_BUSYBOX is not set
-PTXCONF_BB_HAVE_DOT_CONFIG=y
+# PTXCONF_MTD_XCHAIN is not set
+# PTXCONF_MTD_UTILS is not set
 
 #
-# mgetty & sendfax      
+# PCMCIA Tools        
 #
-# PTXCONF_MGETTY is not set
+# PTXCONF_PCMCIA_TOOLS is not set
 
 #
-# Gawk                
+# Pdksh               
 #
-# PTXCONF_GAWK is not set
+# PTXCONF_PDKSH is not set
 
 #
-# MTD Tools           
+# procps              
 #
-# PTXCONF_MTD_XCHAIN is not set
-# PTXCONF_MTD_UTILS is not set
+# PTXCONF_PROCPS is not set
 
 #
-# GNU coreutils       
+# sysutils            
 #
-# PTXCONF_COREUTILS is not set
+# PTXCONF_SYSUTILS is not set
 
 #
 # util-linux          
@@ -292,11 +266,6 @@ PTXCONF_BB_HAVE_DOT_CONFIG=y
 # PTXCONF_CLOCK is not set
 
 #
-# procps              
-#
-# PTXCONF_PROCPS is not set
-
-#
 # VHLL Support        
 #
 
@@ -305,22 +274,22 @@ PTXCONF_BB_HAVE_DOT_CONFIG=y
 #
 
 #
-# PCMCIA Tools        
+# Network Tools --- 
 #
-# PTXCONF_PCMCIA_TOOLS is not set
 
 #
-# Network Tools --- 
+# Network Security    
 #
 
 #
-# Network Security    
+# Dropbear SSH-Server 
 #
+# PTXCONF_DROPBEAR is not set
 
 #
-# shorewall firewall  
+# iptables            
 #
-# PTXCONF_SHOREWALL is not set
+# PTXCONF_IPTABLES is not set
 
 #
 # LSH                 
@@ -338,28 +307,43 @@ PTXCONF_BB_HAVE_DOT_CONFIG=y
 # PTXCONF_OPENSSH is not set
 
 #
-# Dropbear SSH-Server 
+# shorewall firewall  
 #
-# PTXCONF_DROPBEAR is not set
+# PTXCONF_SHOREWALL is not set
 
 #
 # Networking Apps     
 #
 
 #
-# ppp                 
+# betaftpd            
 #
-# PTXCONF_PPP is not set
+# PTXCONF_BETAFTPD is not set
 
 #
-# nmap                
+# Bind                
 #
-# PTXCONF_NMAP is not set
+# PTXCONF_BIND is not set
 
 #
-# utelnetd            
+# bing                
 #
-# PTXCONF_UTELNETD is not set
+# PTXCONF_BING is not set
+
+#
+# dhcp                
+#
+# PTXCONF_DHCP is not set
+
+#
+# dnsmasq             
+#
+# PTXCONF_DNSMASQ is not set
+
+#
+# ethereal            
+#
+# PTXCONF_ETHEREAL is not set
 
 #
 # inetutils           
@@ -367,54 +351,75 @@ PTXCONF_BB_HAVE_DOT_CONFIG=y
 # PTXCONF_INETUTILS is not set
 
 #
-# netcat              
+# libnet              
 #
-# PTXCONF_NETCAT is not set
+# PTXCONF_LIBNET is not set
 
 #
-# proftpd             
+# libpcap             
 #
-# PTXCONF_PROFTPD is not set
+# PTXCONF_LIBPCAP is not set
 
 #
-# betaftpd            
+# netcat              
 #
-# PTXCONF_BETAFTPD is not set
+# PTXCONF_NETCAT is not set
 
 #
 # nfs-utils           
 #
+
+#
+# compile options
+#
 # PTXCONF_NFSUTILS is not set
 
 #
-# Portmapper          
+# install options
 #
-# PTXCONF_PORTMAP is not set
 
 #
-# tcpwrapper          
+# nmap                
 #
-# PTXCONF_TCPWRAPPER is not set
+# PTXCONF_NMAP is not set
 
 #
-# Wireless Tools      
+# NTP                 
 #
-# PTXCONF_WIRELESS is not set
+# PTXCONF_NTP is not set
 
 #
-# GNU Zebra           
+# Compile Options
 #
-# PTXCONF_ZEBRA is not set
 
 #
-# libnet              
+# crypto needs openssl
 #
-# PTXCONF_LIBNET is not set
 
 #
-# libpcap             
+# Install Options
 #
-# PTXCONF_LIBPCAP is not set
+
+#
+# OpenAFS             
+#
+# PTXCONF_OPENAFS is not set
+# PTXCONF_OPENAFS_1_2_11 is not set
+
+#
+# Portmapper          
+#
+# PTXCONF_PORTMAP is not set
+
+#
+# ppp                 
+#
+# PTXCONF_PPP is not set
+
+#
+# proftpd             
+#
+# PTXCONF_PROFTPD is not set
 
 #
 # rsync               
@@ -422,29 +427,46 @@ PTXCONF_BB_HAVE_DOT_CONFIG=y
 # PTXCONF_RSYNC is not set
 
 #
+# tcpdump             
+#
+# PTXCONF_TCPDUMP is not set
+
+#
+# tcpwrapper          
+#
+# PTXCONF_TCPWRAPPER is not set
+
+#
 # thttpd              
 #
 # PTXCONF_THTTPD is not set
 
 #
-# NTP                 
+# utelnetd            
 #
-# PTXCONF_NTP is not set
+# PTXCONF_UTELNETD is not set
 
 #
-# Bind                
+# Wireless Tools      
 #
-# PTXCONF_BIND is not set
+# PTXCONF_WIRELESS is not set
 
 #
-# dhcp                
+# GNU Zebra           
 #
-# PTXCONF_DHCP is not set
+# PTXCONF_ZEBRA is not set
 
 #
-# dnsmasq             
+# Realtime Networking 
+#
+
+#
+# Optional Features
+#
+
+#
+# Network Card Support
 #
-# PTXCONF_DNSMASQ is not set
 
 #
 # Disk and file ---   
@@ -462,7 +484,20 @@ PTXCONF_BB_HAVE_DOT_CONFIG=y
 #
 # grub                
 #
+
+#
+# Config Options
+#
+
+#
+# File System Support
+#
+
+#
+# Network Card Support
+#
 # PTXCONF_CRAMFS is not set
+# PTXCONF_BONNIE is not set
 
 #
 # Applications ---    
@@ -489,13 +524,22 @@ PTXCONF_BB_HAVE_DOT_CONFIG=y
 # PTXCONF_SETMIXER is not set
 
 #
+# Tools               
+#
+# PTXCONF_FIGLET is not set
+
+#
+# Editors             
+#
+# PTXCONF_NANO is not set
+
+#
 # System Libraries    
 #
 
 #
 # gettext          
 #
-# PTXCONF_GETTEXT is not set
 
 #
 # popt             
@@ -523,12 +567,12 @@ PTXCONF_BB_HAVE_DOT_CONFIG=y
 # PTXCONF_DB is not set
 
 #
-# rn                  
+# rn               
 #
 # PTXCONF_RN is not set
 
 #
-# libxml2             
+# libxml2          
 #
 # PTXCONF_LIBXML2 is not set
 
@@ -559,6 +603,20 @@ PTXCONF_BB_HAVE_DOT_CONFIG=y
 #
 
 #
+# Blackbox WM         
+#
+# PTXCONF_BLACKBOX is not set
+
+#
+# Scientific Apps     
+#
+
+#
+# gnuplot          
+#
+# PTXCONF_GNUPLOT is not set
+
+#
 # Web Applications    
 #
 
diff --git a/config/toolchain-powerpc-405-linux b/projects/toolchain-powerpc-405/toolchain-powerpc-405.ptxconfig
index 09f1696a9..09f1696a9 100644
--- a/config/toolchain-powerpc-405-linux
+++ b/projects/toolchain-powerpc-405/toolchain-powerpc-405.ptxconfig
diff --git a/config/wystup.ptxconfig b/projects/wystup/wystup.ptxconfig
index 0f1776920..0f1776920 100644
--- a/config/wystup.ptxconfig
+++ b/projects/wystup/wystup.ptxconfig
diff --git a/root/JUST_FOR_CVS b/root/JUST_FOR_CVS
deleted file mode 100644
index e69de29bb..000000000
--- a/root/JUST_FOR_CVS
+++ /dev/null
diff --git a/rules/Definitions.make b/rules/Definitions.make
new file mode 100644
index 000000000..739e08a5c
--- /dev/null
+++ b/rules/Definitions.make
@@ -0,0 +1,9 @@
+#
+# Some definitions for stuff which even kicks vim's syntax highlighting
+# off the corner...
+#
+
+comma=,
+space= 
+quote="
+
diff --git a/rules/Rules.make b/rules/Rules.make
index 1691c7686..fcbc59b51 100644
--- a/rules/Rules.make
+++ b/rules/Rules.make
@@ -16,7 +16,7 @@ DEP_TREE_PS	= deptree.ps
 # some convenience functions
 #
 
-ifneq (y, $(PTXCONF_BUILD_CROSSCHAIN))
+ifneq (y, $(PTXCONF_CROSSTOOL))
 compilercheck =								\
 	echo -n "compiler check...";					\
 	which $(PTXCONF_GNU_TARGET)-gcc > /dev/null 2>&1 || {		\
@@ -636,7 +636,7 @@ TARGET_LDFLAGS		+= $(PTXCONF_TARGET_EXTRA_LDFLAGS)
 #
 # if we use an external crosschain set include and lib dirs correctly
 #
-ifndef $(PTXCONF_BUILD_CROSSCHAIN)
+ifndef $(PTXCONF_CROSSTOOL)
 TARGET_CFLAGS		+= -idirafter$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include
 TARGET_CXXFLAGS		+= -idirafter$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include
 TARGET_CPPFLAGS		+= -idirafter$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include
diff --git a/rules/Version.make b/rules/Version.make
index 0647e13d2..57254f264 100644
--- a/rules/Version.make
+++ b/rules/Version.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: Version.make,v 1.7 2004/07/28 01:13:09 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
 # See CREDITS for details about who has contributed to this project. 
diff --git a/rules/Virtual.make b/rules/Virtual.make
index ea6b5d9d9..133f5cc72 100644
--- a/rules/Virtual.make
+++ b/rules/Virtual.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: Virtual.make,v 1.4 2003/10/23 15:08:11 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
 # See CREDITS for details about who has contributed to this project. 
@@ -14,10 +14,10 @@
 
 virtual-xchain_install: $(STATEDIR)/virtual-xchain.install
 
-ifdef PTXCONF_BUILD_CROSSCHAIN
-virtual-xchain_install_deps	= $(STATEDIR)/xchain-gccstage2.install
+ifdef PTXCONF_CROSSTOOL
+virtual-xchain_install_deps	= $(STATEDIR)/crosstool.install
 endif 
 
 $(STATEDIR)/virtual-xchain.install: $(virtual-xchain_install_deps)
 	@$(call targetinfo, $@)
-	touch $@
\ No newline at end of file
+	touch $@
diff --git a/rules/addons.make b/rules/addons.make
index 9d25c843c..0d408770d 100644
--- a/rules/addons.make
+++ b/rules/addons.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: addons.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #          
diff --git a/rules/at-spi.make b/rules/at-spi.make
index d96cef64d..279e443e0 100644
--- a/rules/at-spi.make
+++ b/rules/at-spi.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: at-spi.make,v 1.1 2004/02/25 06:20:08 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2003 by BSP
 #          
diff --git a/rules/atk124.make b/rules/atk124.make
index 757d001e5..ba39f0029 100644
--- a/rules/atk124.make
+++ b/rules/atk124.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: atk124.make,v 1.7 2004/02/25 09:51:29 robert Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #                       Pengutronix <info@pengutronix.de>, Germany
diff --git a/rules/autoconf-2.13.make b/rules/autoconf-2.13.make
index fa298d2c7..532769173 100644
--- a/rules/autoconf-2.13.make
+++ b/rules/autoconf-2.13.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: autoconf-2.13.make,v 1.6 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project. 
diff --git a/rules/autoconf-2.57.make b/rules/autoconf-2.57.make
index 3157b3a7b..85962e0e3 100644
--- a/rules/autoconf-2.57.make
+++ b/rules/autoconf-2.57.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: autoconf-2.57.make,v 1.4 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project. 
diff --git a/rules/automake-1.5.make b/rules/automake-1.5.make
index 33567bbf4..93220d7b2 100644
--- a/rules/automake-1.5.make
+++ b/rules/automake-1.5.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: automake-1.5.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #          
diff --git a/rules/automake-1.7.6.make b/rules/automake-1.7.6.make
index 8651effff..f0a8230a7 100644
--- a/rules/automake-1.7.6.make
+++ b/rules/automake-1.7.6.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: automake-1.7.6.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #          
diff --git a/rules/bash.make b/rules/bash.make
index 522005cb8..f1e14f5ab 100644
--- a/rules/bash.make
+++ b/rules/bash.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: bash.make,v 1.8 2004/06/21 13:35:03 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project. 
diff --git a/rules/betaftpd.make b/rules/betaftpd.make
index 50d7df9c9..dbb97d46c 100644
--- a/rules/betaftpd.make
+++ b/rules/betaftpd.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: betaftpd.make,v 1.1 2003/11/05 00:56:58 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Ixia Corporation, by Milan Bobde
 #          
diff --git a/rules/bind.make b/rules/bind.make
index 3ad464af2..d2f4a48c0 100644
--- a/rules/bind.make
+++ b/rules/bind.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: bind.make,v 1.3 2004/08/30 10:32:24 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Benedikt Spranger
 #          
diff --git a/rules/bing.make b/rules/bing.make
index 251f89a73..15e0eade9 100644
--- a/rules/bing.make
+++ b/rules/bing.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: bing.make,v 1.3 2004/06/22 06:52:13 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel
 #          
diff --git a/rules/binutils.make b/rules/binutils.make
index 1a07784b9..c64299365 100644
--- a/rules/binutils.make
+++ b/rules/binutils.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: binutils.make,v 1.6 2003/11/20 10:09:39 robert Exp $
+# $Id$
 #
 # Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project. 
diff --git a/rules/blackbox.make b/rules/blackbox.make
index b67b95085..c4930e5c6 100644
--- a/rules/blackbox.make
+++ b/rules/blackbox.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: blackbox.make,v 1.1 2004/06/10 10:33:01 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marco Cavallini <m.cavallini@koansoftware.com>
 #          
diff --git a/rules/bonnie++.make b/rules/bonnie++.make
index 55980e5c8..da22204ec 100644
--- a/rules/bonnie++.make
+++ b/rules/bonnie++.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: bonnie++.make,v 1.1 2004/07/28 01:11:18 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2004 by Robert Schwebel
 #          
diff --git a/rules/bootdisk.make b/rules/bootdisk.make
index c3bb9b2b0..c50ab8c2c 100644
--- a/rules/bootdisk.make
+++ b/rules/bootdisk.make
@@ -1,5 +1,5 @@
 # -*-makefile-*- 
-# $Id: bootdisk.make,v 1.15 2004/03/22 09:02:43 bbu Exp $
+# $Id$
 #
 # Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project. 
diff --git a/rules/busybox.make b/rules/busybox.make
index acf7e3b62..913c598fe 100644
--- a/rules/busybox.make
+++ b/rules/busybox.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: busybox.make,v 1.27 2004/08/09 08:55:40 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #          
diff --git a/rules/clementine.make b/rules/clementine.make
index f08162ff2..760e3798c 100644
--- a/rules/clementine.make
+++ b/rules/clementine.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: clementine.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #          
diff --git a/rules/clock.make b/rules/clock.make
index 6202a2cd8..2399ace12 100644
--- a/rules/clock.make
+++ b/rules/clock.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: clock.make,v 1.1 2004/02/12 09:26:40 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2003 by BSP
 #          
diff --git a/rules/coreutils.make b/rules/coreutils.make
index 62d2e8ace..9815eb0fd 100644
--- a/rules/coreutils.make
+++ b/rules/coreutils.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: coreutils.make,v 1.5 2004/08/17 09:42:50 sha Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project. 
diff --git a/rules/cramfs.make b/rules/cramfs.make
index 32dc34bad..4f159ef27 100644
--- a/rules/cramfs.make
+++ b/rules/cramfs.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: cramfs.make,v 1.5 2004/01/22 00:47:07 robert Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
 #          
diff --git a/rules/crosstool.in b/rules/crosstool.in
new file mode 100644
index 000000000..bac31f09b
--- /dev/null
+++ b/rules/crosstool.in
@@ -0,0 +1,173 @@
+#
+# rules/crosstool.in
+#
+
+menu	"Toolchain/Crosstool "
+
+comment "Crosstool Options"
+	depends on CROSSTOOL
+
+config CROSSTOOL
+	bool
+	prompt "Build Cross Toolchain with Crosstool"
+	default n
+
+choice
+	prompt "GCC Version"
+		depends on CROSSTOOL
+
+	config GCC_2_95_3
+		bool
+		prompt "2.95.3"
+
+	config GCC_3_2_3
+		bool
+		prompt "3.2.3"
+
+	config GCC_3_3_2
+		bool
+		prompt "3.3.2"
+
+	config GCC_3_4_0
+		bool
+		prompt "3.4.0"
+
+
+	config GCC_3_4_1
+		bool
+		prompt "3.4.1"
+
+endchoice
+
+config GCC_VERSION
+	string 
+	default "2.95.3"	if GCC_2_95_3
+	default "3.2.3"		if GCC_3_2_3
+	default "3.3.2"		if GCC_3_3_2
+	default "3.4.0"		if GCC_3_4_0
+	default "3.4.1"		if GCC_3_4_1
+
+config CROSSTOOL_GCCLANG_CC
+	depends on CROSSTOOL
+	bool
+	prompt "C++ language support"
+	default y
+
+choice
+	prompt "binutils"
+		depends on CROSSTOOL
+
+	config BINUTILS_2_14
+		bool
+		prompt "2.14"
+
+	config BINUTILS_2_15
+		bool
+		prompt "2.15"
+
+endchoice
+
+config BINUTILS_VERSION
+	string
+	default "2.14"		if BINUTILS_2_14
+	default "2.15"		if BINUTILS_2_15
+
+comment "Generic Options"
+
+config CROSSCHAIN_CHECK
+	string
+	prompt "Check for specific gcc version"
+	default "2.95.3"
+	depends on !CROSSTOOL
+	help
+	  PTXdist calls your cross compiler with -dumpversion and
+	  compares the output with this string. This should help
+	  to avoid compilation with the wrong compiler version 
+	  when you use your own external toolchain. 
+
+#config GCC_2
+#	bool
+#	default y if GCC_2_95_3
+#
+#config GCC_3
+#	bool
+#	default y if GCC_3_2_3
+#	default y if GCC_3_3_2
+#	default y if GCC_3_4_1
+#
+#config GCC_SHARE
+#	bool
+#	prompt "  build gcc shared"
+#	default y
+#	depends on CROSSTOOL
+#	help
+#	  FIXME: is this working and being used? [RSC]
+
+config GCC_MULTILIB
+	bool
+	prompt "build gcc with multilib support"
+	default n
+	depends on CROSSTOOL
+	help
+	  FIXME: is this working and being used? [RSC]
+
+config GNU_TARGET
+	string
+	prompt "Compiler Prefix"
+	default "arm-softfloat-linux-gnu"       if ARM_ARCH_LE          && GLIBC
+	default "armb-unknown-linux-gnu"        if ARM_ARCH_BE          && GLIBC
+	default "arm-elf"                       if ARCH_ARM_NOMMU       && GLIBC
+	default "i386-unknown-linux-gnu"        if OPT_I386             && GLIBC
+	default "i486-unknown-linux-gnu"        if OPT_I486             && GLIBC
+	default "i586-unknown-linux-gnu"        if OPT_I586             && GLIBC
+	default "i686-unknown-linux-gnu"        if OPT_I686             && GLIBC
+	default "powerpc-unknown-linux-gnu"     if OPT_PPC              && GLIBC
+	default "powerpc-405-linux-gnu"         if OPT_PPC405           && GLIBC
+	default "powerpc-750-linux-gnu"         if OPT_PPC750           && GLIBC
+	default "powerpc-7450-linux-gnu"        if OPT_PPC7450          && GLIBC
+	default "sparc-unknown-linux-gnu"       if OPT_SPARC            && GLIBC
+	default "mips-unknown-linux-gnu"        if MIPS_ARCH_BE         && GLIBC
+	default "mipsel-unknown-linux-gnu"      if MIPS_ARCH_LE         && GLIBC
+	default "cris-unknown-linux-gnu"        if ARCH_CRIS            && GLIBC
+	default "hppa-unknown-linux-gnu"        if ARCH_PARISC          && GLIBC
+	default "sh3-unknown-linux-gnu"         if SH_ARCH_SH3          && GLIBC
+	default "sh4-unknown-linux-gnu"         if SH_ARCH_SH4          && GLIBC
+
+	default "arm-uclibc-linux-gnu"          if ARM_ARCH_LE          && UCLIBC
+	default "armb-uclibc-linux-gnu"         if ARM_ARCH_BE          && UCLIBC
+	default "arm-elf"                       if ARCH_ARM_NOMMU       && UCLIBC
+	default "i386-uclibc-linux-gnu"         if OPT_I386             && UCLIBC
+	default "i486-uclibc-linux-gnu"         if OPT_I486             && UCLIBC
+	default "i586-uclibc-linux-gnu"         if OPT_I586             && UCLIBC
+	default "i686-uclibc-linux-gnu"         if OPT_I686             && UCLIBC
+	default "powerpc-uclibc-linux-gnu"      if OPT_PPC              && UCLIBC
+	default "powerpc-405_uclibc-linux-gnu"  if OPT_PPC405           && UCLIBC
+	default "powerpc-750_uclibc-linux-gnu"  if OPT_PPC750           && UCLIBC
+	default "powerpc-7450_uclibc-linux-gnu" if OPT_PPC7450          && UCLIBC
+	default "sparc-uclibc-linux-gnu"        if OPT_SPARC            && UCLIBC
+	default "mips-uclibc-linux-gnu"         if MIPS_ARCH_BE         && UCLIBC
+	default "mipsel-uclibc-linux-gnu"       if MIPS_ARCH_LE         && UCLIBC
+	default "cris-uclibc-linux-gnu"         if ARCH_CRIS            && UCLIBC
+	default "hppa-uclibc-linux-gnu"         if ARCH_PARISC          && UCLIBC
+	default "sh3-uclibc-linux-gnu"          if SH_ARCH_SH3          && UCLIBC
+	default "sh4-uclibc-linux-gnu"          if SH_ARCH_SH4          && UCLIBC
+
+comment "Non-Crosstool Tools"
+
+config XCHAIN-DISTCC
+	bool
+	prompt "Build distcc"
+	default n
+
+config NASM
+	bool
+	prompt "x86 NASM"
+	depends on ARCH_X86
+
+config XCHAIN-SCONS
+	bool
+	prompt "Build scons (see help)"
+	help
+		Requires Python-1.6 or later and Python distutils on the Host,
+		these tools are not (yet) part of ptxdist
+endmenu
diff --git a/rules/crosstool.make b/rules/crosstool.make
new file mode 100644
index 000000000..6affc78e9
--- /dev/null
+++ b/rules/crosstool.make
@@ -0,0 +1,182 @@
+# -*-makefile-*-
+# $Id: template,v 1.14 2004/07/01 16:08:08 rsc Exp $
+#
+# Copyright (C) 2004 by Robert Schwebel
+#          
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+ifdef PTXCONF_CROSSTOOL
+PACKAGES += crosstool
+endif
+
+#
+# Paths and names
+#
+CROSSTOOL_VERSION	= 0.28-rc34
+CROSSTOOL		= crosstool-$(CROSSTOOL_VERSION)
+CROSSTOOL_SUFFIX	= tar.gz
+CROSSTOOL_URL		= http://www.kegel.com/crosstool/$(CROSSTOOL).$(CROSSTOOL_SUFFIX)
+CROSSTOOL_SOURCE	= $(SRCDIR)/$(CROSSTOOL).$(CROSSTOOL_SUFFIX)
+CROSSTOOL_DIR		= $(BUILDDIR)/$(CROSSTOOL)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+crosstool_get: $(STATEDIR)/crosstool.get
+
+crosstool_get_deps = $(CROSSTOOL_SOURCE)
+
+$(STATEDIR)/crosstool.get: $(crosstool_get_deps)
+	@$(call targetinfo, $@)
+	@$(call get_patches, $(CROSSTOOL))
+	touch $@
+
+$(CROSSTOOL_SOURCE):
+	@$(call targetinfo, $@)
+	@$(call get, $(CROSSTOOL_URL))
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+crosstool_extract: $(STATEDIR)/crosstool.extract
+
+crosstool_extract_deps = $(STATEDIR)/crosstool.get
+
+$(STATEDIR)/crosstool.extract: $(crosstool_extract_deps)
+	@$(call targetinfo, $@)
+	@$(call clean, $(CROSSTOOL_DIR))
+	@$(call extract, $(CROSSTOOL_SOURCE))
+	@$(call patchin, $(CROSSTOOL))
+	touch $@
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+crosstool_prepare: $(STATEDIR)/crosstool.prepare
+
+#
+# dependencies
+#
+crosstool_prepare_deps = $(STATEDIR)/crosstool.extract
+
+CROSSTOOL_PATH	=  PATH=$(CROSS_PATH)
+CROSSTOOL_ENV 	=  $(CROSS_ENV)
+#CROSSTOOL_ENV	+= PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig
+#CROSSTOOL_ENV	+=
+
+#
+# Configuration
+#
+
+ifdef PTXCONF_ARCH_ARM
+CROSSTOOL_KERNELCONFIG = arm.dat
+else
+# AAAARRRRRGGGGHHHHH! FIXME!
+endif
+
+# FIXME: where do we get this from? 
+CROSSTOOL_TARGET_CFLAGS		=  -O
+CROSSTOOL_GCC_EXTRA_CONFIG	=  "--with-float=soft --with-cpu=strongarm"
+
+CROSSTOOL_GCCLANG		=  c
+ifdef PTXCONF_CROSSTOOL_GCCLANG_CC
+CROSSTOOL_GCCLANG		+= ,c++
+endif
+CROSSTOOL_GCCLANG		:= $(subst $(quote),,$(CROSSTOOL_GCCLANG)) 
+CROSSTOOL_GCCLANG		:= `echo $(CROSSTOOL_GCCLANG) | perl -p -e 's/\s//g'`
+
+ifdef PTXCONF_SOFTFLOAT
+CROSSTOOL_GLIBC_EXTRA_CONFIG 	+= --without-fp
+endif
+
+$(STATEDIR)/crosstool.prepare: $(crosstool_prepare_deps)
+	@$(call targetinfo, $@)
+	touch $@
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+#
+# Crosstool installs on 'compile', so we put everything into the install
+# target. 
+#
+
+crosstool_compile: $(STATEDIR)/crosstool.compile
+
+$(STATEDIR)/crosstool.compile: $(STATEDIR)/crosstool.prepare
+	@$(call targetinfo, $@)
+	touch $@
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+crosstool_install: $(STATEDIR)/crosstool.install
+
+crosstool_install_deps = $(STATEDIR)/crosstool.compile
+
+$(STATEDIR)/crosstool.install: $(crosstool_install_deps)
+	@$(call targetinfo, $@)
+	#
+	# We set all the stuff crosstool expects in it's environment
+	#
+	(	cd $(CROSSTOOL_DIR); \
+		set -ex; \
+		TARBALLS_DIR=$(TOPDIR)/src; \
+		RESULT_TOP=$(subst $(quote),,$(PTXCONF_PREFIX)); \
+		export TARBALLS_DIR RESULT_TOP;	\
+		export GCC_LANGUAGES="$(CROSSTOOL_GCCLANG)"; \
+		\
+		mkdir -p $(subst $(quote),,$(PTXCONF_PREFIX)); \
+		\
+		export KERNELCONFIG=$(CROSSTOOL_DIR)/$(CROSSTOOL_KERNELCONFIG); \
+		 \
+		TARGET=$(subst $(quote),,$(PTXCONF_GNU_TARGET)) \
+		TARGET_CFLAGS=$(CROSSTOOL_TARGET_CFLAGS) \
+		GCC_EXTRA_CONFIG=$(CROSSTOOL_GCC_EXTRA_CONFIG) \
+		GLIBC_EXTRA_CONFIG=$(CROSSTOOL_GLIBC_EXTRA_CONFIG) \
+		BINUTILS_DIR=binutils-$(BINUTILS_VERSION) \
+		GCC_DIR=gcc-$(GCC_VERSION) \
+		GLIBC_DIR=glibc-$(GLIBC_VERSION) \
+		LINUX_DIR=linux-$(KERNEL_VERSION) \
+		GLIBCTHREADS_FILENAME=glibc-linuxthreads-$(GLIBC_VERSION) \
+		sh $(CROSSTOOL_DIR)/all.sh --notest; \
+		\
+		echo "done" \
+		exit 1;	\
+	)
+		
+	touch $@
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+crosstool_targetinstall: $(STATEDIR)/crosstool.targetinstall
+
+crosstool_targetinstall_deps = $(STATEDIR)/crosstool.install
+
+$(STATEDIR)/crosstool.targetinstall: $(crosstool_targetinstall_deps)
+	@$(call targetinfo, $@)
+	touch $@
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+crosstool_clean:
+	rm -rf $(STATEDIR)/crosstool.*
+	rm -rf $(CROSSTOOL_DIR)
+
+# vim: syntax=make
diff --git a/rules/db41.make b/rules/db41.make
index 3e94f7991..57c412dad 100644
--- a/rules/db41.make
+++ b/rules/db41.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: db41.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Werner Schmitt mail2ws@gmx.de
 #          
diff --git a/rules/dhcp.make b/rules/dhcp.make
index 385c65ea5..822304292 100644
--- a/rules/dhcp.make
+++ b/rules/dhcp.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: dhcp.make,v 1.4 2004/08/27 14:50:40 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Benedikt Spranger
 #          
diff --git a/rules/dnsmasq.make b/rules/dnsmasq.make
index 1b5dfa1a3..1e58159cb 100644
--- a/rules/dnsmasq.make
+++ b/rules/dnsmasq.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: dnsmasq.make,v 1.2 2003/12/23 10:49:10 robert Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Benedikt Spranger
 #          
diff --git a/rules/dropbear.make b/rules/dropbear.make
index 203efcf66..cf11d448f 100644
--- a/rules/dropbear.make
+++ b/rules/dropbear.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: dropbear.make,v 1.8 2004/03/10 17:31:33 robert Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de> for
 #                       Pengutronix e.K. <info@pengutronix.de>, Germany
diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index d4e3d6837..94125cc78 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: e2fsprogs.make,v 1.14 2004/07/16 09:13:21 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
 #
diff --git a/rules/e2tools.make b/rules/e2tools.make
index b83454279..394b2297d 100644
--- a/rules/e2tools.make
+++ b/rules/e2tools.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: e2tools.make,v 1.2 2004/08/26 06:22:15 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Benedikt Spranger
 #          
diff --git a/rules/efax.make b/rules/efax.make
deleted file mode 100644
index 9cda6a09b..000000000
--- a/rules/efax.make
+++ /dev/null
@@ -1,139 +0,0 @@
-# -*-makefile-*-
-# $Id: template 1469 2004-07-01 16:08:08Z rsc $
-#
-# Copyright (C) 2004 by Robert Schwebel
-#          
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-ifdef PTXCONF_EFAX
-PACKAGES += efax
-endif
-
-#
-# Paths and names
-#
-EFAX_VERSION		= 0.9
-EFAX			= efax-$(EFAX_VERSION)
-EFAX_SUFFIX		= tar.gz
-EFAX_URL		= ftp://ftp.metalab.unc.edu/pub/Linux/apps/serialcomm/fax/$(EFAX).$(EFAX_SUFFIX)
-EFAX_SOURCE		= $(SRCDIR)/$(EFAX).$(EFAX_SUFFIX)
-EFAX_DIR		= $(BUILDDIR)/$(EFAX)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-efax_get: $(STATEDIR)/efax.get
-
-efax_get_deps = $(EFAX_SOURCE)
-
-$(STATEDIR)/efax.get: $(efax_get_deps)
-	@$(call targetinfo, $@)
-	@$(call get_patches, $(EFAX))
-	touch $@
-
-$(EFAX_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, $(EFAX_URL))
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-efax_extract: $(STATEDIR)/efax.extract
-
-efax_extract_deps = $(STATEDIR)/efax.get
-
-$(STATEDIR)/efax.extract: $(efax_extract_deps)
-	@$(call targetinfo, $@)
-	@$(call clean, $(EFAX_DIR))
-	@$(call extract, $(EFAX_SOURCE))
-	@$(call patchin, $(EFAX))
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-efax_prepare: $(STATEDIR)/efax.prepare
-
-#
-# dependencies
-#
-efax_prepare_deps = \
-	$(STATEDIR)/efax.extract \
-	$(STATEDIR)/virtual-xchain.install
-
-EFAX_PATH	=  PATH=$(CROSS_PATH)
-EFAX_ENV 	=  $(CROSS_ENV)
-#EFAX_ENV	+= PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig
-#EFAX_ENV	+=
-
-#
-# autoconf
-#
-EFAX_AUTOCONF = \
-	--build=$(GNU_HOST) \
-	--host=$(PTXCONF_GNU_TARGET) \
-	--prefix=$(CROSS_LIB_DIR)
-
-$(STATEDIR)/efax.prepare: $(efax_prepare_deps)
-	@$(call targetinfo, $@)
-	@$(call clean, $(EFAX_DIR)/config.cache)
-	cd $(EFAX_DIR) && \
-		$(EFAX_PATH) $(EFAX_ENV) \
-		./configure $(EFAX_AUTOCONF)
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-efax_compile: $(STATEDIR)/efax.compile
-
-efax_compile_deps = $(STATEDIR)/efax.prepare
-
-$(STATEDIR)/efax.compile: $(efax_compile_deps)
-	@$(call targetinfo, $@)
-	cd $(EFAX_DIR) && $(EFAX_ENV) $(EFAX_PATH) make
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-efax_install: $(STATEDIR)/efax.install
-
-$(STATEDIR)/efax.install: $(STATEDIR)/efax.compile
-	@$(call targetinfo, $@)
-	cd $(EFAX_DIR) && $(EFAX_ENV) $(EFAX_PATH) make install
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-efax_targetinstall: $(STATEDIR)/efax.targetinstall
-
-efax_targetinstall_deps = $(STATEDIR)/efax.compile
-
-$(STATEDIR)/efax.targetinstall: $(efax_targetinstall_deps)
-	@$(call targetinfo, $@)
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-efax_clean:
-	rm -rf $(STATEDIR)/efax.*
-	rm -rf $(EFAX_DIR)
-
-# vim: syntax=make
diff --git a/rules/ethereal.make b/rules/ethereal.make
index 52a82b51f..6fb1e1f64 100644
--- a/rules/ethereal.make
+++ b/rules/ethereal.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: ethereal.make,v 1.2 2004/08/27 14:50:40 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2004 by Robert Schwebel
 #          
diff --git a/rules/expat.make b/rules/expat.make
index a15d70780..f2a761859 100644
--- a/rules/expat.make
+++ b/rules/expat.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: expat.make,v 1.5 2004/02/25 22:30:46 robert Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #                       Pengutronix <info@pengutronix.de>, Germany
diff --git a/rules/figlet.make b/rules/figlet.make
index ae6fd342d..f232f4183 100644
--- a/rules/figlet.make
+++ b/rules/figlet.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: figlet.make,v 1.2 2004/07/01 16:06:48 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2004 by Robert Schwebel
 #          
diff --git a/rules/flash.make b/rules/flash.make
index 500fbe572..fbf04c5e3 100644
--- a/rules/flash.make
+++ b/rules/flash.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: flash.make,v 1.5 2004/08/23 09:33:02 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project. 
diff --git a/rules/fltk.make b/rules/fltk.make
index bd16fb23f..0ae72fb64 100644
--- a/rules/fltk.make
+++ b/rules/fltk.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: fltk.make,v 1.3 2003/11/10 00:46:58 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Werner Schmitt mail2ws@gmx.de
 #          
diff --git a/rules/fontconfig22.make b/rules/fontconfig22.make
index a1fb8202d..2a0d0f2b2 100644
--- a/rules/fontconfig22.make
+++ b/rules/fontconfig22.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: fontconfig22.make,v 1.8 2004/07/08 16:49:48 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #                       Pengutronix <info@pengutronix.de>, Germany
diff --git a/rules/freetype214.make b/rules/freetype214.make
index e47b12017..6ffb5832e 100644
--- a/rules/freetype214.make
+++ b/rules/freetype214.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: freetype214.make,v 1.7 2004/02/25 22:31:09 robert Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #             Pengutronix <info@pengutronix.de>, Germany
diff --git a/rules/gail.make b/rules/gail.make
index e7aa94cdb..747425d72 100644
--- a/rules/gail.make
+++ b/rules/gail.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: gail.make,v 1.4 2004/02/27 11:56:42 robert Exp $
+# $Id$
 #
 # Copyright (C) 2003 by BSP
 #          
diff --git a/rules/gawk.make b/rules/gawk.make
index 5b5734eed..58509097b 100644
--- a/rules/gawk.make
+++ b/rules/gawk.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: gawk.make,v 1.2 2004/08/30 10:33:22 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Ixia Corporation, By Milan Bobde
 #          
diff --git a/rules/gdb-wrapper.make b/rules/gdb-wrapper.make
index 7e6fac408..c731a5f31 100644
--- a/rules/gdb-wrapper.make
+++ b/rules/gdb-wrapper.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: gdb-wrapper.make,v 1.1 2004/01/08 15:47:49 robert Exp $
+# $Id$
 #
 # Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
 # Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
diff --git a/rules/gdb.make b/rules/gdb.make
index 57cf69000..01a7dcb22 100644
--- a/rules/gdb.make
+++ b/rules/gdb.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: gdb.make,v 1.7 2004/02/26 13:26:42 robert Exp $
+# $Id$
 #
 # Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
 # Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
diff --git a/rules/gdbserver.make b/rules/gdbserver.make
index d268ee166..b45abd303 100644
--- a/rules/gdbserver.make
+++ b/rules/gdbserver.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: gdbserver.make,v 1.4 2003/11/17 03:25:08 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
 # Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
diff --git a/rules/gettext.make b/rules/gettext.make
index 10af5c1c0..4717446c0 100644
--- a/rules/gettext.make
+++ b/rules/gettext.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: gettext.make,v 1.7 2003/12/23 10:53:34 robert Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #             Pengutronix <info@pengutronix.de>, Germany
diff --git a/rules/glib1210.make b/rules/glib1210.make
index 7f950201e..3e42652e1 100644
--- a/rules/glib1210.make
+++ b/rules/glib1210.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: glib1210.make,v 1.3 2003/12/15 07:16:22 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #                       Pengutronix <info@pengutronix.de>, Germany
diff --git a/rules/glib22.make b/rules/glib22.make
index be964f932..70e2e3293 100644
--- a/rules/glib22.make
+++ b/rules/glib22.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: glib22.make,v 1.9 2004/02/25 22:32:28 robert Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #                       Pengutronix <info@pengutronix.de>, Germany
diff --git a/rules/glibc.in b/rules/glibc.in
index 9a10b314a..74f09c434 100644
--- a/rules/glibc.in
+++ b/rules/glibc.in
@@ -2,166 +2,166 @@ config GLIBC_PTHREADS
 	bool
 	prompt "Compile glibc with pthreads"
 	default y
-	depends on GLIBC
+	depends on GLIBC && LIBC
 
 config GLIBC_LIBIO
 	bool
 	prompt "Build in GNU libio instead of GNU stdio"
 	default n
-	depends on GLIBC
+	depends on GLIBC && LIBC
 
 config GLIBC_SHARED
 	bool
 	prompt "Build shared library"
 	default y
-	depends on GLIBC
+	depends on GLIBC && LIBC
 
 config GLIBC_PROFILED
 	bool
 	prompt "Include profiling support"
 	default n
-	depends on GLIBC
+	depends on GLIBC && LIBC
 
 config GLIBC_OMITFP
 	bool
 	prompt "Build undebuggable optimized library"
 	default n
-	depends on GLIBC
+	depends on GLIBC && LIBC
 
 config GLIBC_BOUNDED
 	bool
 	prompt "Build with runtime bounds checking"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 
 config GLIBC_OPTKERNEL
 	bool
 	prompt "Optimize glibc for selected kernel version"
 	default n
-	depends on GLIBC
+	depends on GLIBC && LIBC
 
 config GLIBC_DEBUG
 	bool "Don't strip debugging symbols"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 
 # ----------
 
 comment	"Install options"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 
 config GLIBC_THREAD_DB
 	bool
 	prompt "Install libthread_db on the target"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 
 config GLIBC_DL
 	bool
 	prompt "Install libdl on the target"
 	default y if BASH || BUILD_GDBSERVER
-	depends on GLIBC
+	depends on GLIBC && LIBC
 
 config GLIBC_CRYPT
 	bool
 	prompt "Install libcrypt on the target"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 
 config GLIBC_UTIL
 	bool
 	prompt "Install libutil on the target"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 
 config GLIBC_LIBM
 	bool
 	prompt "Install libm on the target"
 	default y if BUILD_GDB
-	depends on GLIBC
+	depends on GLIBC && LIBC
 
 
 comment "libnss_dns depends on libresolv"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 	depends on !GLIBC_RESOLV
 
 config GLIBC_NSS_DNS
 	bool
 	prompt "Install libnss_dns"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 	depends on GLIBC_RESOLV
 
 config GLIBC_NSS_FILES
 	bool
 	prompt "Install libnss_files"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 
 comment "libnss_hesiod depends on libresolv and libnss_files"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 	depends on ! (GLIBC_RESOLV && GLIBC_NSS_FILES)
 
 config GLIBC_NSS_HESIOD
 	bool
 	prompt "Install libnss_hesiod"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 	depends on GLIBC_RESOLV && GLIBC_NSS_FILES
 
 comment "libnss_nis depends on libnsl and libnss_files"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 	depends on ! (GLIBC_NSL && GLIBC_NSS_FILES)
 
 config GLIBC_NSS_NIS
 	bool
 	prompt "Install libnss_nis"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 	depends on GLIBC_NSL && GLIBC_NSS_FILES
 
 comment "libnss_nisplus depends on libnsl"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 	depends on !GLIBC_NSL
 
 config GLIBC_NSS_NISPLUS
 	bool
 	prompt "Install libnss_nisplus"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 	depends on GLIBC_NSL
 
 comment "libnss_compat depends on libnsl"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 	depends on !GLIBC_NSL
 
 config GLIBC_NSS_COMPAT
 	bool
 	prompt "Install libnss_compat"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 	depends on GLIBC_NSL
 
 config GLIBC_RESOLV
 	bool
 	prompt "Install libresolv"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 
 config GLIBC_NSL
 	bool
 	prompt "Install libnsl"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 
 # -----
 
 config GLIBC_GCONV
 	bool
 	prompt "Install gconv libraries"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 
 config GLIBC_GCONV_ISO8859_1
 	bool
 	prompt "  ISO8859-1"
-	depends on GLIBC_GCONV
+	depends on GLIBC_GCONV && LIBC
 
 # -----
 
 comment "Timezone Files"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 
 config GLIBC_ZONEINFO
 	bool
 	prompt "Install zoneinfo files"
-	depends on GLIBC
+	depends on GLIBC && LIBC
 	default N
 
 config GLIBC_ZONEINFO_AFRICA
diff --git a/rules/glibc.make b/rules/glibc.make
index 1ddaf526f..8e8d4ff2c 100644
--- a/rules/glibc.make
+++ b/rules/glibc.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: glibc.make,v 1.27 2004/08/26 06:23:13 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
 # Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
@@ -14,7 +14,7 @@
 # We provide this package
 #
 ifdef PTXCONF_GLIBC
-ifdef PTXCONF_BUILD_CROSSCHAIN
+ifdef PTXCONF_LIBC
 PACKAGES	+= glibc
 endif
 DYNAMIC_LINKER	=  /lib/ld-linux.so.2
@@ -172,17 +172,9 @@ glibc_prepare:		$(STATEDIR)/glibc.prepare
 #
 # dependencies
 #
-glibc_prepare_deps = \
-	$(STATEDIR)/autoconf213.install \
-	$(STATEDIR)/glibc.extract
-
-ifdef PTXCONF_BUILD_CROSSCHAIN
-glibc_prepare_deps += \
-	$(STATEDIR)/xchain-gccstage1.install
-endif
-
-glibc_prepare_deps += \
-	$(STATEDIR)/xchain-kernel.install
+glibc_prepare_deps =  $(STATEDIR)/autoconf213.install
+glibc_prepare_deps += $(STATEDIR)/glibc.extract
+glibc_prepare_deps += $(STATEDIR)/xchain-kernel.install
 
 # 
 # arcitecture dependend configuration
@@ -336,11 +328,7 @@ endif
 
 glibc_targetinstall:		$(STATEDIR)/glibc.targetinstall
 
-# FIXME: RSC: commented out, we need to compile and install glibc also if 
-# we don't have installed a toolchain...
-#ifdef PTXCONF_BUILD_CROSSCHAIN
 glibc_targetinstall_deps = $(STATEDIR)/glibc.install
-#endif
 
 ifdef PTXCONF_GLIBC_DEBUG
 GLIBC_STRIP	= true
diff --git a/rules/gmp3.make b/rules/gmp3.make
index 58aafc2f4..9eb7b642e 100644
--- a/rules/gmp3.make
+++ b/rules/gmp3.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: gmp3.make,v 1.6 2003/10/31 11:48:11 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project. 
diff --git a/rules/gnuplot.make b/rules/gnuplot.make
index 9662dee5f..7027f83a6 100644
--- a/rules/gnuplot.make
+++ b/rules/gnuplot.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: gnuplot.make,v 1.1 2004/08/18 19:18:33 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2004 by Robert Schwebel
 #          
diff --git a/rules/grub.make b/rules/grub.make
index 38135cf8c..d137367da 100644
--- a/rules/grub.make
+++ b/rules/grub.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: grub.make,v 1.12 2004/08/27 14:50:40 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project. 
diff --git a/rules/gtk1210.make b/rules/gtk1210.make
index 53a72bc91..ad2424346 100644
--- a/rules/gtk1210.make
+++ b/rules/gtk1210.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: gtk1210.make,v 1.4 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #                       Pengutronix <info@pengutronix.de>, Germany
diff --git a/rules/gtk2-engines.make b/rules/gtk2-engines.make
index 3a157bdcd..9bbd168f0 100644
--- a/rules/gtk2-engines.make
+++ b/rules/gtk2-engines.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: gtk2-engines.make,v 1.1 2004/03/31 16:23:29 robert Exp $
+# $Id$
 #
 # Copyright (C) 2003 by BSP
 #          
diff --git a/rules/gtk22.make b/rules/gtk22.make
index cd69acc96..c478b96e5 100644
--- a/rules/gtk22.make
+++ b/rules/gtk22.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: gtk22.make,v 1.10 2004/02/26 18:44:38 robert Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #                       Pengutronix <info@pengutronix.de>, Germany
diff --git a/rules/hosttool-e2fsprogs.make b/rules/hosttool-e2fsprogs.make
index 27c7a6c7b..8617d81b7 100644
--- a/rules/hosttool-e2fsprogs.make
+++ b/rules/hosttool-e2fsprogs.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: hosttool-e2fsprogs.make,v 1.3 2004/08/26 06:23:42 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
 #
diff --git a/rules/hosttool-fakeroot.in b/rules/hosttool-fakeroot.in
index de35a7834..4f9bb8237 100644
--- a/rules/hosttool-fakeroot.in
+++ b/rules/hosttool-fakeroot.in
@@ -1,5 +1,12 @@
 
 config HOSTTOOLS_FAKEROOT
 	bool
+	prompt "fakeroot"
 	default y
+	help
+	  fakeroot lets you create archives with "real" owners and
+	  permissions, without being root. 
+
+	  If you want to create rootfs images with 'make image' you
+	  need this. 
 
diff --git a/rules/hosttool-fakeroot.make b/rules/hosttool-fakeroot.make
index 76ad809d3..43cdeb241 100644
--- a/rules/hosttool-fakeroot.make
+++ b/rules/hosttool-fakeroot.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: hosttool-fakeroot.make,v 1.2 2004/08/26 06:23:52 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Benedikt Spranger
 #          
diff --git a/rules/hosttool-genext2fs.make b/rules/hosttool-genext2fs.make
index 0d49a748d..0df5fd52e 100644
--- a/rules/hosttool-genext2fs.make
+++ b/rules/hosttool-genext2fs.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: hosttool-genext2fs.make,v 1.5 2004/08/26 06:24:02 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Ixia Corporation (www.ixiacom.com)
 #
diff --git a/rules/xchain-ksymoops.make b/rules/hosttool-ksymoops.make
index ceef1dece..cd23391b9 100644
--- a/rules/xchain-ksymoops.make
+++ b/rules/hosttool-ksymoops.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-ksymoops.make,v 1.4 2003/11/17 18:37:03 mkl Exp $
+# $Id:$
 #
 # Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project. 
@@ -73,10 +73,6 @@ ksymoops_compile: $(STATEDIR)/ksymoops.compile
 ksymoops_compile_deps = \
 	$(STATEDIR)/ksymoops.extract
 
-ifdef PTXCBUILD_CROSSCHAIN
-ksymoops_compile_deps += $(STATEDIR)/xchain-binutils.install
-endif
-
 $(STATEDIR)/ksymoops.compile: $(ksymoops_compile_deps)
 	@$(call targetinfo, $@)
 	make -C $(KSYMOOPS_DIR) $(KSYMOOPS_MAKEVARS)
diff --git a/rules/hosttool-util-linux.make b/rules/hosttool-util-linux.make
index c851e8357..31717d8e8 100644
--- a/rules/hosttool-util-linux.make
+++ b/rules/hosttool-util-linux.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: hosttool-util-linux.make,v 1.2 2004/08/26 06:24:21 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #          
diff --git a/rules/hotplug.make b/rules/hotplug.make
index 5a0c57991..142470bda 100644
--- a/rules/hotplug.make
+++ b/rules/hotplug.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: hotplug.make,v 1.1 2004/07/23 18:12:27 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2004 by Robert Schwebel
 #          
diff --git a/rules/inetutils.make b/rules/inetutils.make
index 7e0d92fb8..9fd1cb22f 100644
--- a/rules/inetutils.make
+++ b/rules/inetutils.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: inetutils.make,v 1.5 2004/07/22 18:21:05 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Ixia Corporation (www.ixiacom.com)
 #          
diff --git a/rules/iptables.make b/rules/iptables.make
index b2af48996..a20f2fa9f 100644
--- a/rules/iptables.make
+++ b/rules/iptables.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: iptables.make,v 1.2 2004/08/26 12:46:49 bbu Exp $
+# $Id$
 #
 # Copyright (C) 2004 by Robert Schwebel
 #          
diff --git a/rules/jed.make b/rules/jed.make
index a750df712..d2320bcb6 100644
--- a/rules/jed.make
+++ b/rules/jed.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: jed.make,v 1.1 2004/08/27 18:37:40 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2004 by BSP
 #          
diff --git a/rules/kaffe.make b/rules/kaffe.make
index 7e47f9ebb..b020e776b 100644
--- a/rules/kaffe.make
+++ b/rules/kaffe.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: kaffe.make,v 1.6 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de> for
 #                       GYRO net GmbH <info@gyro-net.de>, Hannover, Germany
diff --git a/rules/kernel-ben.make b/rules/kernel-ben.make
index 843e3e4ae..bbe3a345c 100644
--- a/rules/kernel-ben.make
+++ b/rules/kernel-ben.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: kernel-ben.make,v 1.3 2003/10/28 11:12:24 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #          
diff --git a/rules/kernel-dev-epoll.make b/rules/kernel-dev-epoll.make
index 175376e7f..d172857e7 100644
--- a/rules/kernel-dev-epoll.make
+++ b/rules/kernel-dev-epoll.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: kernel-dev-epoll.make,v 1.2 2003/11/02 23:56:52 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Ixia Corporation, by Milan Bobde
 #          
diff --git a/rules/kernel-ds.make b/rules/kernel-ds.make
index a0aded0c1..9f0325e4b 100644
--- a/rules/kernel-ds.make
+++ b/rules/kernel-ds.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: kernel-ds.make,v 1.3 2003/10/28 11:12:24 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #          
diff --git a/rules/kernel-ltt.make b/rules/kernel-ltt.make
index 19fbf22de..0cbfc687c 100644
--- a/rules/kernel-ltt.make
+++ b/rules/kernel-ltt.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: kernel-ltt.make,v 1.4 2003/10/28 11:12:24 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #          
diff --git a/rules/kernel-mtd.make b/rules/kernel-mtd.make
index e88ee9298..911b68c5f 100644
--- a/rules/kernel-mtd.make
+++ b/rules/kernel-mtd.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: kernel-mtd.make,v 1.3 2003/10/28 11:12:24 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #          
diff --git a/rules/kernel-ptx.make b/rules/kernel-ptx.make
index aa492a5a5..095cfb271 100644
--- a/rules/kernel-ptx.make
+++ b/rules/kernel-ptx.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: kernel-ptx.make,v 1.4 2003/10/28 11:12:24 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #          
diff --git a/rules/kernel-pxa.make b/rules/kernel-pxa.make
index 9b6105b9e..344702454 100644
--- a/rules/kernel-pxa.make
+++ b/rules/kernel-pxa.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: kernel-pxa.make,v 1.3 2003/10/28 11:12:24 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #          
diff --git a/rules/kernel-rmk.make b/rules/kernel-rmk.make
index 8e5dc064e..efc683275 100644
--- a/rules/kernel-rmk.make
+++ b/rules/kernel-rmk.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: kernel-rmk.make,v 1.3 2003/10/28 11:12:24 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #          
diff --git a/rules/kernel-rtai.make b/rules/kernel-rtai.make
index 31b52ed82..7ec6c1bcd 100644
--- a/rules/kernel-rtai.make
+++ b/rules/kernel-rtai.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: kernel-rtai.make,v 1.6 2003/12/02 14:09:03 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #          
diff --git a/rules/kernel-sys-epoll.make b/rules/kernel-sys-epoll.make
index 7468da332..5d41062e0 100644
--- a/rules/kernel-sys-epoll.make
+++ b/rules/kernel-sys-epoll.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: kernel-sys-epoll.make,v 1.2 2003/11/02 23:56:52 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Ixia Corporation, by Milan Bobde
 #          
diff --git a/rules/kernel-uc.make b/rules/kernel-uc.make
index 43ec0d075..9f5a3ccf8 100644
--- a/rules/kernel-uc.make
+++ b/rules/kernel-uc.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: kernel-uc.make,v 1.3 2003/10/28 11:12:24 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #          
diff --git a/rules/kernel.in b/rules/kernel.in
index 3783bfb83..a97c52560 100644
--- a/rules/kernel.in
+++ b/rules/kernel.in
@@ -1,3 +1,7 @@
+#
+# rules/kernel.in
+#
+
 menu	"Kernel              "
 
 config KERNEL_CONFIG
diff --git a/rules/kernel.make b/rules/kernel.make
index ce8dea929..ff5802594 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: kernel.make,v 1.28 2004/06/22 10:21:29 sha Exp $
+# $Id$
 #
 # Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
 #
diff --git a/rules/konq-e.make b/rules/konq-e.make
index 17ec22282..d763bc676 100644
--- a/rules/konq-e.make
+++ b/rules/konq-e.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: konq-e.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #          
diff --git a/rules/libIDL-2.make b/rules/libIDL-2.make
index 9fb7d4b4d..8ba7ace3d 100644
--- a/rules/libIDL-2.make
+++ b/rules/libIDL-2.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: libIDL-2.make,v 1.3 2004/02/25 09:51:29 robert Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #                       Pengutronix <info@pengutronix.de>, Germany
diff --git a/rules/libIDL068.make b/rules/libIDL068.make
index 6688b16a0..f717c117d 100644
--- a/rules/libIDL068.make
+++ b/rules/libIDL068.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: libIDL068.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #                       Pengutronix <info@pengutronix.de>, Germany
diff --git a/rules/libart.make b/rules/libart.make
index 17e4e0f26..05d15b8f7 100644
--- a/rules/libart.make
+++ b/rules/libart.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: libart.make,v 1.1 2004/02/25 22:39:22 robert Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #          
diff --git a/rules/libc.in b/rules/libc.in
index a25c55585..81a4fe18c 100644
--- a/rules/libc.in
+++ b/rules/libc.in
@@ -1,5 +1,14 @@
+#
+# rules/libc.in
+#
+
 menu	"C Library           "
 
+config LIBC
+	bool
+	prompt "Compile a C Library"
+	default y
+
 choice
         prompt "Which C library do you want to use?"
         default GLIBC
@@ -17,8 +26,9 @@ endchoice
 comment "C Library options"
 
 choice
-	prompt "C-Lib Version"
+	prompt "glibc Version"
 		default GLIBC_2_2_5
+		depends on GLIBC
 
 	config GLIBC_2_3_2
 		bool
diff --git a/rules/libcxx.in b/rules/libcxx.in
index 504f4a711..db6493222 100644
--- a/rules/libcxx.in
+++ b/rules/libcxx.in
@@ -1,3 +1,7 @@
+#
+# rules/libcxx.in
+#
+
 menu	"C++ Library         "
 
 config CXX
@@ -5,7 +9,8 @@ config CXX
 
 choice
 	depends on GLIBC || ( UCLIBC && GCC_3 )
-	depends on BUILD_CROSSCHAIN
+	# FIXME: this is not really true...
+	depends on CROSSTOOL
 
         bool "Which C++ library do you want to use?"
         	default LIBSTDCXX
@@ -19,11 +24,11 @@ endchoice
 config LIBSTDCXX_SHARED
 	bool "Build and install shared library"
 	default y
-	depends on CXX && BUILD_CROSSCHAIN
+	depends on CXX && CROSSTOOL
 
 config LIBSTDCXX_SHARED
 	bool "Install shared library"
 	default y
-	depends on CXX && !BUILD_CROSSCHAIN
+	depends on CXX && !CROSSTOOL
 
 endmenu
diff --git a/rules/libgd.make b/rules/libgd.make
index 0b2a84cb5..62e112006 100644
--- a/rules/libgd.make
+++ b/rules/libgd.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: libgd.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Benedikt Spranger <b.spranger@pengutronix.de>
 #          
diff --git a/rules/libglade.make b/rules/libglade.make
index 68047f271..67fbd725c 100644
--- a/rules/libglade.make
+++ b/rules/libglade.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: libglade.make,v 1.3 2004/02/25 22:33:33 robert Exp $
+# $Id$
 #
 # Copyright (C) 2003 by BSP
 #          
diff --git a/rules/libgnomecanvas.make b/rules/libgnomecanvas.make
index f53826c09..ef82efdaf 100644
--- a/rules/libgnomecanvas.make
+++ b/rules/libgnomecanvas.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: libgnomecanvas.make,v 1.3 2004/02/25 22:34:06 robert Exp $
+# $Id$
 #
 # Copyright (C) 2003 by BSP
 #          
diff --git a/rules/libnet.make b/rules/libnet.make
index 34c455210..f985aba97 100644
--- a/rules/libnet.make
+++ b/rules/libnet.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: libnet.make,v 1.8 2003/10/28 01:50:31 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #          
diff --git a/rules/liboop.make b/rules/liboop.make
index c73c8187f..8d85d692c 100644
--- a/rules/liboop.make
+++ b/rules/liboop.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: liboop.make,v 1.8 2003/10/26 20:55:29 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
 #          
diff --git a/rules/libpcap.make b/rules/libpcap.make
index 049651dde..1a8dd9790 100644
--- a/rules/libpcap.make
+++ b/rules/libpcap.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: libpcap.make,v 1.5 2004/06/23 15:30:15 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #          
diff --git a/rules/libpng125.make b/rules/libpng125.make
index 173705c60..c9355a527 100644
--- a/rules/libpng125.make
+++ b/rules/libpng125.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: libpng125.make,v 1.3 2004/08/18 19:18:33 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #                       Pengutronix <info@pengutronix.de>, Germany
diff --git a/rules/libxml2.make b/rules/libxml2.make
index f0a80735a..2cfe08094 100644
--- a/rules/libxml2.make
+++ b/rules/libxml2.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: libxml2.make,v 1.1 2003/11/17 16:51:14 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Benedikt Spranger
 #          
diff --git a/rules/lilo.make b/rules/lilo.make
index f7e8d75f0..5792d5c74 100644
--- a/rules/lilo.make
+++ b/rules/lilo.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: lilo.make,v 1.4 2004/06/10 10:33:22 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
 #
diff --git a/rules/lrzsz.make b/rules/lrzsz.make
index bb4c8e6e0..5cb7af872 100644
--- a/rules/lrzsz.make
+++ b/rules/lrzsz.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: lrzsz.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #                       Pengutronix <info@pengutronix.de>, Germany
diff --git a/rules/lsh.make b/rules/lsh.make
index 703cfb7f7..ab3e3ceac 100644
--- a/rules/lsh.make
+++ b/rules/lsh.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: lsh.make,v 1.7 2003/10/26 13:29:46 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
 #          
diff --git a/rules/ltt.make b/rules/ltt.make
index 5f1d09c88..9c3ca1b1c 100644
--- a/rules/ltt.make
+++ b/rules/ltt.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: ltt.make,v 1.4 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
 # Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
diff --git a/rules/mad.make b/rules/mad.make
index b7e451068..c03afdc3b 100644
--- a/rules/mad.make
+++ b/rules/mad.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: mad.make,v 1.1 2003/11/13 15:31:55 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Sascha Hauer <sascha.hauer@gyro-net.de>
 #          
diff --git a/rules/madwifi.make b/rules/madwifi.make
index 3f9116b5f..0e947df4d 100644
--- a/rules/madwifi.make
+++ b/rules/madwifi.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: madwifi.make,v 1.1 2004/06/10 10:36:56 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2004 by Greg Brackley
 #          
diff --git a/rules/memtest.make b/rules/memtest.make
index bba1fc82e..0dd53e1bb 100644
--- a/rules/memtest.make
+++ b/rules/memtest.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: memtest.make,v 1.1 2004/06/07 18:29:07 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2004 by Robert Schwebel
 #          
diff --git a/rules/mfirebird.make b/rules/mfirebird.make
index 42f51e922..c58c4466c 100644
--- a/rules/mfirebird.make
+++ b/rules/mfirebird.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: mfirebird.make,v 1.19 2004/06/10 11:18:18 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>, 
 #                       Pengutronix e.K.<info@pengutronix.de>, Germany
diff --git a/rules/mgetty.make b/rules/mgetty.make
index db458879c..a16c46096 100644
--- a/rules/mgetty.make
+++ b/rules/mgetty.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: mgetty.make,v 1.5 2004/03/25 15:53:07 bbu Exp $
+# $Id$
 #
 # Copyright (C) 2003 by BSP
 #          
diff --git a/rules/mtd.make b/rules/mtd.make
index 49aa5ec5a..cb15fe3e4 100644
--- a/rules/mtd.make
+++ b/rules/mtd.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: mtd.make,v 1.15 2004/06/22 17:10:41 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
 #          
diff --git a/rules/nano.make b/rules/nano.make
index 4ca73808d..b30083a70 100644
--- a/rules/nano.make
+++ b/rules/nano.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: nano.make,v 1.1 2004/08/23 09:36:54 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2004 by Robert Schwebel
 #          
diff --git a/rules/ncurses.make b/rules/ncurses.make
index 73400f9b4..285345880 100644
--- a/rules/ncurses.make
+++ b/rules/ncurses.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: ncurses.make,v 1.16 2004/08/19 13:01:24 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project. 
diff --git a/rules/netcat.make b/rules/netcat.make
index 86689eb28..f8fac58ff 100644
--- a/rules/netcat.make
+++ b/rules/netcat.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: netcat.make,v 1.3 2003/10/26 20:57:12 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 Ixia Corporation (www.ixiacom.com), by Milan Bobde
 #
diff --git a/rules/nfs-utils.make b/rules/nfs-utils.make
index 8cb62680f..3f755028e 100644
--- a/rules/nfs-utils.make
+++ b/rules/nfs-utils.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: nfs-utils.make,v 1.11 2004/08/24 10:12:22 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project. 
diff --git a/rules/nmap.make b/rules/nmap.make
index 54c9c7893..7f3b7bd01 100644
--- a/rules/nmap.make
+++ b/rules/nmap.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: nmap.make,v 1.6 2003/11/17 03:34:45 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 Ixia Corporation (www.ixiacom.com), by Milan Bobde
 #
diff --git a/rules/ntp.make b/rules/ntp.make
index 125ed6862..2c24952a5 100644
--- a/rules/ntp.make
+++ b/rules/ntp.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: ntp.make,v 1.6 2004/08/18 17:13:09 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Benedikt Spranger
 #          
diff --git a/rules/openafs.in b/rules/openafs.in
index bd5d027d3..1f3b9de70 100644
--- a/rules/openafs.in
+++ b/rules/openafs.in
@@ -1,14 +1,22 @@
+#
+# rules/openafs.in
+#
+
 menu    "OpenAFS             "
+
 config OPENAFS
 	bool
 	prompt "Compile OpenAFS"
 
-	choice
-		prompt "OpenAFS Version"
+choice
+	prompt "OpenAFS Version"
 		default OPENAFS_1_2_11 
 
-		config OPENAFS_1_2_11
+	config OPENAFS_1_2_11
+		depends on OPENAFS
 		bool
 		prompt "1.2.11"
-	endchoice
+
+endchoice
+
 endmenu
diff --git a/rules/openafs.make b/rules/openafs.make
index ca38c0adc..4b1653e95 100644
--- a/rules/openafs.make
+++ b/rules/openafs.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: openafs.make,v 1.1 2004/06/12 09:54:42 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003,2004 by leifj@it.su.se
 #          
diff --git a/rules/openssh.make b/rules/openssh.make
index 42e9e4b78..446aed0c2 100644
--- a/rules/openssh.make
+++ b/rules/openssh.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: openssh.make,v 1.17 2004/06/30 11:25:11 bbu Exp $
+# $Id$
 #
 # Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
 #
diff --git a/rules/openssl.make b/rules/openssl.make
index 0bfd8e376..c8a2209d0 100644
--- a/rules/openssl.make
+++ b/rules/openssl.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: openssl.make,v 1.14 2004/08/27 14:50:40 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2002 by Jochen Striepe for Pengutronix e.K., Hildesheim, Germany
 #               2003 by Pengutronix e.K., Hildesheim, Germany
diff --git a/rules/oprofile.make b/rules/oprofile.make
index b2e12af80..9d2b55926 100644
--- a/rules/oprofile.make
+++ b/rules/oprofile.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: oprofile.make,v 1.4 2004/06/23 22:53:05 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Benedikt Spranger <b.spranger@pengutronix.de>
 #          
diff --git a/rules/pango12.make b/rules/pango12.make
index 995af27af..bb1693e5f 100644
--- a/rules/pango12.make
+++ b/rules/pango12.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: pango12.make,v 1.13 2004/02/27 17:10:32 robert Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #                       Pengutronix <info@pengutronix.de>, Germany
diff --git a/rules/pcmcia-cs.make b/rules/pcmcia-cs.make
index 40527e71a..ca2e605f8 100644
--- a/rules/pcmcia-cs.make
+++ b/rules/pcmcia-cs.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: pcmcia-cs.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #          
diff --git a/rules/pdksh.make b/rules/pdksh.make
index aa7e22d5b..2b3c4a6e9 100644
--- a/rules/pdksh.make
+++ b/rules/pdksh.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: pdksh.make,v 1.10 2003/10/26 13:31:45 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
 # Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
diff --git a/rules/penguzilla.make b/rules/penguzilla.make
index 1bebb1341..833067471 100644
--- a/rules/penguzilla.make
+++ b/rules/penguzilla.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: penguzilla.make,v 1.14 2004/08/27 14:52:04 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #          
diff --git a/rules/popt.make b/rules/popt.make
index 4805b6489..029d3293a 100644
--- a/rules/popt.make
+++ b/rules/popt.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: popt.make,v 1.4 2003/10/28 01:50:31 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Benedikt Spranger <b.spranger@pengutronix.de>
 #          
diff --git a/rules/portmap.make b/rules/portmap.make
index 4feee5388..be1ec27db 100644
--- a/rules/portmap.make
+++ b/rules/portmap.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: portmap.make,v 1.8 2004/06/23 15:34:20 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project. 
diff --git a/rules/pppd.make b/rules/pppd.make
index 92837b30e..d3dba9ac1 100644
--- a/rules/pppd.make
+++ b/rules/pppd.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: pppd.make,v 1.4 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de> for
 #             GYRO net GmbH <info@gyro-net.de>, Hannover, Germany
diff --git a/rules/procps.make b/rules/procps.make
index 3223a5391..db7e3e8bf 100644
--- a/rules/procps.make
+++ b/rules/procps.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: procps.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 Ixia Corporation, by Milan Bobde
 #          
diff --git a/rules/proftpd.make b/rules/proftpd.make
index ccc15f01b..0673e3799 100644
--- a/rules/proftpd.make
+++ b/rules/proftpd.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: proftpd.make,v 1.7 2004/08/17 09:42:50 sha Exp $
+# $Id$
 #
 # Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
 #
diff --git a/rules/python.make b/rules/python.make
index 1238a5a37..39c02463d 100644
--- a/rules/python.make
+++ b/rules/python.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: python.make,v 1.5 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by David R Bacon
 # See CREDITS for details about who has contributed to this project. 
diff --git a/rules/qt.make b/rules/qt.make
index 4b490edad..416c137e2 100644
--- a/rules/qt.make
+++ b/rules/qt.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: qt.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #          
diff --git a/rules/qte.make b/rules/qte.make
index 355372448..8c5851d0e 100644
--- a/rules/qte.make
+++ b/rules/qte.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: qte.make,v 1.2 2003/11/13 04:28:40 mkl Exp $
+# $Id$
 #
 # (c) 2003 by Marco Cavallini <m.cavallini@koansoftware.com>
 #          
diff --git a/rules/rn.make b/rules/rn.make
index 1ca256c97..c70c85e3e 100644
--- a/rules/rn.make
+++ b/rules/rn.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: rn.make,v 1.2 2003/11/13 04:29:04 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 Ixia Corporation, by Milan Bobde
 #          
diff --git a/rules/rootfs.in b/rules/rootfs.in
index 930f5ccd7..2614c63ee 100644
--- a/rules/rootfs.in
+++ b/rules/rootfs.in
@@ -1,11 +1,18 @@
 menu	"Root Filesystem     "
 
+config ROOTFS
+	bool
+	prompt "Populate root filesystem"
+	default y
+
 config ROOTFS_DEV
+	depends on ROOTFS
 	bool
 	prompt "Create /dev"
 	default y
 
 config ROOTFS_ETC
+	depends on ROOTFS
 	bool
 	prompt "Use generic template for /etc"
 	default y
@@ -17,36 +24,43 @@ config ROOTFS_ETC
 	  directory you should problably switch this on. 
 
 config ROOTFS_FLOPPY
+	depends on ROOTFS
 	bool
 	prompt "Create /floppy"
 	default y
 
 config ROOTFS_HOME
+	depends on ROOTFS
 	bool
 	prompt "Create /home"
 	default y
 
 config ROOTFS_MNT
+	depends on ROOTFS
 	bool
 	prompt "Create /mnt"
 	default y
 
 config ROOTFS_PROC
+	depends on ROOTFS
 	bool
 	prompt "Create /proc"
 	default y 
 
 config ROOTFS_SYS
+	depends on ROOTFS
 	bool
 	prompt "Create /sys"
 	default y
 
 config ROOTFS_TMP
+	depends on ROOTFS
 	bool
 	prompt "Create /tmp"
 	default y
 
 config ROOTFS_VAR
+	depends on ROOTFS
 	bool
 	prompt "Create /var"
 	default y
diff --git a/rules/rootfs.make b/rules/rootfs.make
index de915c066..b88371d20 100644
--- a/rules/rootfs.make
+++ b/rules/rootfs.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: rootfs.make,v 1.10 2004/08/26 06:25:15 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project. 
@@ -11,7 +11,9 @@
 #
 # We provide this package
 #
+ifdef PTXCONF_ROOTFS
 PACKAGES += rootfs
+endif
 
 #
 # Paths and names 
@@ -143,27 +145,27 @@ ifdef PTXCONF_ROOTFS_ETC
 	# Copy generic etc
 	# FIXME: some parts of this have to be put into the packet make files!
 
-	$(call copy_root, 0, 0, 0644, $(TOPDIR)/etc/generic/fstab,        /etc/fstab)
-	$(call copy_root, 0, 0, 0644, $(TOPDIR)/etc/generic/group,        /etc/group)
-	$(call copy_root, 0, 0, 0640, $(TOPDIR)/etc/generic/gshadow,      /etc/gshadow)
-	$(call copy_root, 0, 0, 0644, $(TOPDIR)/etc/generic/hostname,     /etc/hostname)
-	$(call copy_root, 0, 0, 0644, $(TOPDIR)/etc/generic/hosts,        /etc/hosts)
-	$(call copy_root, 0, 0, 0644, $(TOPDIR)/etc/generic/inittab,      /etc/inittab)
-	$(call copy_root, 0, 0, 0644, $(TOPDIR)/etc/generic/passwd,       /etc/passwd)
-	$(call copy_root, 0, 0, 0644, $(TOPDIR)/etc/generic/profile,      /etc/profile)
-	$(call copy_root, 11, 101, 0644, $(TOPDIR)/etc/generic/proftpd.conf, /etc/proftpd.conf)
-	$(call copy_root, 0, 0, 0644, $(TOPDIR)/etc/generic/protocols,    /etc/protocols)
-	$(call copy_root, 0, 0, 0644, $(TOPDIR)/etc/generic/resolv.conf,  /etc/resolv.conf)
-	$(call copy_root, 0, 0, 0640, $(TOPDIR)/etc/generic/shadow,       /etc/shadow)
-	$(call copy_root, 0, 0, 0600, $(TOPDIR)/etc/generic/shadow-,      /etc/shadow-)
-	$(call copy_root, 0, 0, 0644, $(TOPDIR)/etc/generic/udhcpc.script,/etc/udhcpc.script)
+	$(call copy_root, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/fstab,        /etc/fstab)
+	$(call copy_root, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/group,        /etc/group)
+	$(call copy_root, 0, 0, 0640, $(TOPDIR)/projects/generic/etc/gshadow,      /etc/gshadow)
+	$(call copy_root, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/hostname,     /etc/hostname)
+	$(call copy_root, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/hosts,        /etc/hosts)
+	$(call copy_root, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/inittab,      /etc/inittab)
+	$(call copy_root, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/passwd,       /etc/passwd)
+	$(call copy_root, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/profile,      /etc/profile)
+	$(call copy_root, 11, 101, 0644, $(TOPDIR)/projects/generic/etc/proftpd.conf, /etc/proftpd.conf)
+	$(call copy_root, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/protocols,    /etc/protocols)
+	$(call copy_root, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/resolv.conf,  /etc/resolv.conf)
+	$(call copy_root, 0, 0, 0640, $(TOPDIR)/projects/generic/etc/shadow,       /etc/shadow)
+	$(call copy_root, 0, 0, 0600, $(TOPDIR)/projects/generic/etc/shadow-,      /etc/shadow-)
+	$(call copy_root, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/udhcpc.script,/etc/udhcpc.script)
 	$(call copy_root, 0, 0, 0755, /etc/init.d)
-	$(call copy_root, 0, 0, 0755, $(TOPDIR)/etc/generic/init.d/banner,     /etc/init.d/banner)
-	$(call copy_root, 0, 0, 0755, $(TOPDIR)/etc/generic/init.d/networking, /etc/init.d/networking)
-	$(call copy_root, 0, 0, 0755, $(TOPDIR)/etc/generic/init.d/net2flash,  /etc/init.d/net2flash)
-	$(call copy_root, 0, 0, 0755, $(TOPDIR)/etc/generic/init.d/proftpd,    /etc/init.d/proftpd)
-	$(call copy_root, 0, 0, 0755, $(TOPDIR)/etc/generic/init.d/rcS,        /etc/init.d/rcS)
-	$(call copy_root, 0, 0, 0755, $(TOPDIR)/etc/generic/init.d/utelnetd,   /etc/init.d/utelnetd)
+	$(call copy_root, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/banner,     /etc/init.d/banner)
+	$(call copy_root, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/networking, /etc/init.d/networking)
+	$(call copy_root, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/net2flash,  /etc/init.d/net2flash)
+	$(call copy_root, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/proftpd,    /etc/init.d/proftpd)
+	$(call copy_root, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/rcS,        /etc/init.d/rcS)
+	$(call copy_root, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/utelnetd,   /etc/init.d/utelnetd)
 	$(call copy_root, 0, 0, 0755, /etc/rc.d)
 
 endif
diff --git a/rules/rsync.make b/rules/rsync.make
index 655821806..4838d6d00 100644
--- a/rules/rsync.make
+++ b/rules/rsync.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: rsync.make,v 1.3 2003/12/04 09:51:39 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by wschmitt@envicomp.de
 #          
diff --git a/rules/rtai.make b/rules/rtai.make
index a509328ca..01e2d9c42 100644
--- a/rules/rtai.make
+++ b/rules/rtai.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: rtai.make,v 1.13 2004/08/10 21:21:57 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
 #
diff --git a/rules/rtnet.make b/rules/rtnet.make
index 035915573..b6baf3483 100644
--- a/rules/rtnet.make
+++ b/rules/rtnet.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: rtnet.make,v 1.4 2004/08/10 21:22:42 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
 #          
diff --git a/rules/setmixer.make b/rules/setmixer.make
index f2099f2a4..3a4aa6247 100644
--- a/rules/setmixer.make
+++ b/rules/setmixer.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: setmixer.make,v 1.1 2003/11/13 15:31:55 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Sascha Hauer <sascha.hauer@gyro-net.de>
 #          
diff --git a/rules/shorewall.make b/rules/shorewall.make
index bcfb17fff..01e53732a 100644
--- a/rules/shorewall.make
+++ b/rules/shorewall.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: shorewall.make,v 1.4 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Dan Kegel, Ixia Communications (http://ixiacom.com)
 #
diff --git a/rules/slang.make b/rules/slang.make
index 8049d6461..6fa3d111b 100644
--- a/rules/slang.make
+++ b/rules/slang.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: slang.make,v 1.1 2004/02/16 13:17:44 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Benedikt Spranger
 #          
diff --git a/rules/strace.make b/rules/strace.make
index 727e89e5c..f1b398e78 100644
--- a/rules/strace.make
+++ b/rules/strace.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: strace.make,v 1.7 2004/01/31 18:08:17 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
 # Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
diff --git a/rules/sys-epoll-lib.make b/rules/sys-epoll-lib.make
index 49bc25595..af81a8c4f 100644
--- a/rules/sys-epoll-lib.make
+++ b/rules/sys-epoll-lib.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: sys-epoll-lib.make,v 1.3 2003/11/05 01:01:08 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Ixia Corporation, by Milan Bobde
 #          
diff --git a/rules/sysutils.make b/rules/sysutils.make
index 0cbaf036d..9b8354c32 100644
--- a/rules/sysutils.make
+++ b/rules/sysutils.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: sysutils.make,v 1.1 2004/07/01 16:06:26 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2004 by Robert Schwebel
 #          
diff --git a/rules/sysvinit.make b/rules/sysvinit.make
index 91d41da70..9d2239165 100644
--- a/rules/sysvinit.make
+++ b/rules/sysvinit.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: sysvinit.make,v 1.1 2003/12/04 13:19:46 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Benedikt Spranger
 #          
diff --git a/rules/target.in b/rules/target.in
index 8c1ebc0f4..3f2bc7e96 100644
--- a/rules/target.in
+++ b/rules/target.in
@@ -261,46 +261,6 @@ config ARM_PROC
 	string
 	default "armv" if ARCH_ARM || ARCH_ARM_NOMMU
 
-config GNU_TARGET
-	string
-	default "arm-softfloat-linux-gnu" 	if ARM_ARCH_LE		&& GLIBC
-	default "armb-unknown-linux-gnu" 	if ARM_ARCH_BE		&& GLIBC
-	default "arm-elf"			if ARCH_ARM_NOMMU	&& GLIBC
-	default "i386-unknown-linux-gnu"	if OPT_I386		&& GLIBC
-	default "i486-unknown-linux-gnu"	if OPT_I486		&& GLIBC
-	default "i586-unknown-linux-gnu"	if OPT_I586		&& GLIBC
-	default "i686-unknown-linux-gnu"	if OPT_I686		&& GLIBC
-	default "powerpc-unknown-linux-gnu"	if OPT_PPC		&& GLIBC
-	default "powerpc-405-linux-gnu"		if OPT_PPC405		&& GLIBC
-	default "powerpc-750-linux-gnu"		if OPT_PPC750		&& GLIBC
-	default "powerpc-7450-linux-gnu"	if OPT_PPC7450		&& GLIBC
-	default "sparc-unknown-linux-gnu"	if OPT_SPARC		&& GLIBC
-	default "mips-unknown-linux-gnu"	if MIPS_ARCH_BE		&& GLIBC
-	default "mipsel-unknown-linux-gnu"	if MIPS_ARCH_LE		&& GLIBC
-	default "cris-unknown-linux-gnu"	if ARCH_CRIS		&& GLIBC
-	default "hppa-unknown-linux-gnu"	if ARCH_PARISC		&& GLIBC
-	default "sh3-unknown-linux-gnu"		if SH_ARCH_SH3		&& GLIBC
-	default "sh4-unknown-linux-gnu"		if SH_ARCH_SH4		&& GLIBC
-
-	default "arm-uclibc-linux-gnu" 		if ARM_ARCH_LE		&& UCLIBC
-	default "armb-uclibc-linux-gnu"		if ARM_ARCH_BE		&& UCLIBC
-	default "arm-elf"			if ARCH_ARM_NOMMU	&& UCLIBC
-	default "i386-uclibc-linux-gnu"		if OPT_I386		&& UCLIBC
-	default "i486-uclibc-linux-gnu"		if OPT_I486		&& UCLIBC
-	default "i586-uclibc-linux-gnu"		if OPT_I586		&& UCLIBC
-	default "i686-uclibc-linux-gnu"		if OPT_I686		&& UCLIBC
-	default "powerpc-uclibc-linux-gnu"	if OPT_PPC		&& UCLIBC
-	default "powerpc-405_uclibc-linux-gnu"	if OPT_PPC405		&& UCLIBC
-	default "powerpc-750_uclibc-linux-gnu"	if OPT_PPC750		&& UCLIBC
-	default "powerpc-7450_uclibc-linux-gnu"	if OPT_PPC7450		&& UCLIBC
-	default "sparc-uclibc-linux-gnu"	if OPT_SPARC		&& UCLIBC
-	default "mips-uclibc-linux-gnu"		if MIPS_ARCH_BE		&& UCLIBC
-	default "mipsel-uclibc-linux-gnu"	if MIPS_ARCH_LE		&& UCLIBC
-	default "cris-uclibc-linux-gnu"		if ARCH_CRIS		&& UCLIBC
-	default "hppa-uclibc-linux-gnu"		if ARCH_PARISC		&& UCLIBC
-	default "sh3-uclibc-linux-gnu"		if SH_ARCH_SH3		&& UCLIBC
-	default "sh4-uclibc-linux-gnu"		if SH_ARCH_SH4		&& UCLIBC
-
 config PREFIX
 	prompt "Prefix for development environment"
 	string
diff --git a/rules/tcpdump.make b/rules/tcpdump.make
index e13f1fcdb..5af02b92a 100644
--- a/rules/tcpdump.make
+++ b/rules/tcpdump.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: tcpdump.make,v 1.3 2004/06/23 15:37:49 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2004 by Robert Schwebel
 #          
diff --git a/rules/tcpwrapper.make b/rules/tcpwrapper.make
index 8b21fc005..1d1179020 100644
--- a/rules/tcpwrapper.make
+++ b/rules/tcpwrapper.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: tcpwrapper.make,v 1.10 2003/10/26 21:59:07 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
 #
diff --git a/rules/template b/rules/template
index 1efb9444e..fef8b36ce 100644
--- a/rules/template
+++ b/rules/template
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: template,v 1.14 2004/07/01 16:08:08 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2004 by @AUTHOR@
 #          
diff --git a/rules/template-patch b/rules/template-patch
index e2e99be1f..c85595072 100644
--- a/rules/template-patch
+++ b/rules/template-patch
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: template-patch,v 1.3 2003/10/31 22:50:09 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by @AUTHOR@
 #          
diff --git a/rules/template-patch-xchain b/rules/template-patch-xchain
index 51a18c6b2..168982119 100644
--- a/rules/template-patch-xchain
+++ b/rules/template-patch-xchain
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: template-patch-xchain,v 1.1 2003/10/31 22:50:37 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by @AUTHOR@
 #          
diff --git a/rules/template-xchain b/rules/template-xchain
index 643ed06ce..f8767baed 100644
--- a/rules/template-xchain
+++ b/rules/template-xchain
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: template-xchain,v 1.2 2003/10/26 13:52:53 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by @AUTHOR@
 #          
diff --git a/rules/termcap.make b/rules/termcap.make
index 922b9a912..d12f37487 100644
--- a/rules/termcap.make
+++ b/rules/termcap.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: termcap.make,v 1.3 2004/04/01 19:40:32 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003, 2004 by Marc Kleine-Budde <kleine-budde@gmx.de>
 #          
diff --git a/rules/thttpd.make b/rules/thttpd.make
index ea79cd78b..45fc74227 100644
--- a/rules/thttpd.make
+++ b/rules/thttpd.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: thttpd.make,v 1.2 2004/02/12 09:44:52 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Benedikt Spranger
 #          
diff --git a/rules/tinylogin.make b/rules/tinylogin.make
index bf5743bbd..aa02be8ff 100644
--- a/rules/tinylogin.make
+++ b/rules/tinylogin.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: tinylogin.make,v 1.3 2003/10/26 13:51:36 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
 #
diff --git a/rules/uclibc.make b/rules/uclibc.make
index 38449d112..d51f711de 100644
--- a/rules/uclibc.make
+++ b/rules/uclibc.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: uclibc.make,v 1.6 2004/03/31 20:50:45 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003, 2004 by Marc Kleine-Budde <kleine-budde@gmx.de>
 #
@@ -13,7 +13,7 @@
 # We provide this package
 #
 ifdef PTXCONF_UCLIBC
-ifdef PTXCONF_BUILD_CROSSCHAIN
+ifdef PTXCONF_LIBC
 PACKAGES	+= uclibc
 endif
 DYNAMIC_LINKER	=  /lib/ld-uClibc.so.0
@@ -154,9 +154,7 @@ $(STATEDIR)/uclibc.install: $(STATEDIR)/uclibc.compile
 
 uclibc_targetinstall: $(STATEDIR)/uclibc.targetinstall
 
-ifdef PTXCONF_BUILD_CROSSCHAIN
 uclibc_targetinstall_deps = $(STATEDIR)/uclibc.install
-endif
 
 $(STATEDIR)/uclibc.targetinstall: $(uclibc_targetinstall_deps)
 	@$(call targetinfo, $@)
diff --git a/rules/utelnetd.make b/rules/utelnetd.make
index d02b23d5a..d80b81c55 100644
--- a/rules/utelnetd.make
+++ b/rules/utelnetd.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: utelnetd.make,v 1.8 2003/10/26 21:59:07 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project. 
diff --git a/rules/util-linux.make b/rules/util-linux.make
index 0b544541c..30d166a68 100644
--- a/rules/util-linux.make
+++ b/rules/util-linux.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: util-linux.make,v 1.8 2004/07/16 09:13:48 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #          
diff --git a/rules/vendor-tweaks/abbcc.make b/rules/vendor-tweaks/abbcc.make
index 0fe16c6e9..e35a849c3 100644
--- a/rules/vendor-tweaks/abbcc.make
+++ b/rules/vendor-tweaks/abbcc.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: abbcc.make,v 1.7 2004/08/23 09:33:50 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2004 by Robert Schwebel <r.schwebel@pengutronix.de>
 #          
@@ -21,7 +21,7 @@ $(STATEDIR)/abbcc.targetinstall:
 	@$(call targetinfo, vendor-tweaks.targetinstall)
 
 #	copy /etc template and do some changes
-	cp -a $(TOPDIR)/etc/generic/. $(ROOTDIR)/etc
+	cp -a $(TOPDIR)/projects/generic/etc $(ROOTDIR)/etc
 	perl -i -p -e "s,\@HOSTNAME@,cc1,g" $(ROOTDIR)/etc/hostname
 	cp -a $(TOPDIR)/etc/generic/inittab $(ROOTDIR)/etc/
 	perl -i -p -e "s,\@SPEED@,19200,g" $(ROOTDIR)/etc/inittab
diff --git a/rules/vendor-tweaks/bmwm.make b/rules/vendor-tweaks/bmwm.make
index b74fbd11d..a136de99e 100644
--- a/rules/vendor-tweaks/bmwm.make
+++ b/rules/vendor-tweaks/bmwm.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: bmwm.make,v 1.9 2004/06/10 11:18:43 rsc Exp $
+# $Id$
 
 VENDORTWEAKS = bmwm
 
@@ -30,7 +30,7 @@ $(STATEDIR)/bmwm.targetinstall:
 	cp /usr/lib/libexpat.so.1 $(ROOTDIR)/usr/lib/
 
 	# copy /etc skeleton
-	cp -a $(TOPDIR)/etc/bmwm-cid_internet/* $(ROOTDIR)/etc/
+	cp -a $(TOPDIR)/scII-bmwm/etc/* $(ROOTDIR)/etc/
 	
 	# menu.lst for grub
 	install -d $(ROOTDIR)/boot/grub
diff --git a/rules/vendor-tweaks/cameron-efco.make b/rules/vendor-tweaks/cameron-efco.make
index 5c677ca71..3ced9716e 100644
--- a/rules/vendor-tweaks/cameron-efco.make
+++ b/rules/vendor-tweaks/cameron-efco.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: cameron-efco.make,v 1.1 2003/12/24 13:39:44 robert Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #          
@@ -21,7 +21,7 @@ $(STATEDIR)/cameron-efco.targetinstall:
 	@$(call targetinfo, vendor-tweaks.targetinstall)
 
 #	copy /etc template
-	cp -a $(TOPDIR)/etc/cameron-efco/. $(ROOTDIR)/etc
+	cp -a $(TOPDIR)/cameron-efco/etc/. $(ROOTDIR)/etc
 
 #	remove CVS stuff
 	find $(ROOTDIR) -name "CVS" | xargs rm -fr 
diff --git a/rules/vendor-tweaks/flowscreen2.make b/rules/vendor-tweaks/flowscreen2.make
index d101b5015..ab28c4496 100644
--- a/rules/vendor-tweaks/flowscreen2.make
+++ b/rules/vendor-tweaks/flowscreen2.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: flowscreen2.make,v 1.9 2004/08/18 09:29:01 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2004 by Pengutronix, Robert Schwebel
 #          
@@ -21,7 +21,7 @@ $(STATEDIR)/flowscreen2.targetinstall:
 	@$(call targetinfo, vendor-tweaks.targetinstall)
 
 #	copy /etc template
-	cp -a $(TOPDIR)/etc/generic/. $(ROOTDIR)/etc
+	cp -a $(TOPDIR)/projects/mx1fs2/. $(ROOTDIR)/etc
 
 #	remove CVS stuff
 	find $(ROOTDIR) -name "CVS" | xargs rm -fr 
diff --git a/rules/vendor-tweaks/frako.make b/rules/vendor-tweaks/frako.make
index f579129a4..8281a8318 100644
--- a/rules/vendor-tweaks/frako.make
+++ b/rules/vendor-tweaks/frako.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: frako.make,v 1.12 2004/04/07 12:37:31 bbu Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Auerswald GmbH & Co. KG <linux-development@auerswald.de>
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
@@ -29,7 +29,7 @@ $(STATEDIR)/frako.targetinstall:
 	@$(call targetinfo, vendor-tweaks.targetinstall)
 
 #	copy /etc template
-	cp -a $(TOPDIR)/etc/frako/. $(ROOTDIR)/etc
+	cp -a $(TOPDIR)/projects/frako/etc/. $(ROOTDIR)/etc
 
 #	remove CVS stuff
 	find $(ROOTDIR) -name "CVS" | xargs rm -fr 
diff --git a/rules/vendor-tweaks/i386-ratio-uno-2053-1.make b/rules/vendor-tweaks/i386-ratio-uno-2053-1.make
index 8b224936a..a58add1d8 100644
--- a/rules/vendor-tweaks/i386-ratio-uno-2053-1.make
+++ b/rules/vendor-tweaks/i386-ratio-uno-2053-1.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: i386-ratio-uno-2053-1.make,v 1.9 2004/04/14 18:29:07 bbu Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Auerswald GmbH & Co. KG <linux-development@auerswald.de>
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
@@ -22,7 +22,7 @@ $(STATEDIR)/ratio-uno-2053-1.targetinstall:
 	@$(call targetinfo, vendor-tweaks.targetinstall)
 
 #	copy /etc template
-	cp -a $(TOPDIR)/etc/ratio-uno-2053-1/. $(ROOTDIR)/etc
+	cp -a $(TOPDIR)/projects/ratio-uno/etc/. $(ROOTDIR)/etc
 
 #	remove CVS stuff
 	find $(ROOTDIR) -name "CVS" | xargs rm -fr 
diff --git a/rules/vendor-tweaks/innokom.make b/rules/vendor-tweaks/innokom.make
index c179741d2..12a9d7437 100644
--- a/rules/vendor-tweaks/innokom.make
+++ b/rules/vendor-tweaks/innokom.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: innokom.make,v 1.10 2004/06/23 15:38:27 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Auerswald GmbH & Co. KG <linux-development@auerswald.de>
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
@@ -39,7 +39,8 @@ ifdef PTXCONF_NFSUTILS_INSTALL_NFSD
 endif
 
 #	copy /etc template
-	cp -a $(TOPDIR)/etc/innokom/. $(ROOTDIR)/etc
+	install -d $(ROOTDIR)/etc
+	cp -a $(TOPDIR)/projects/innokom/etc/* $(ROOTDIR)/etc/
 
 #	remove CVS stuff
 	find $(ROOTDIR) -name "CVS" | xargs rm -fr 
diff --git a/rules/vendor-tweaks/pii_nge.make b/rules/vendor-tweaks/pii_nge.make
index 0c3347a64..5fafcdb43 100644
--- a/rules/vendor-tweaks/pii_nge.make
+++ b/rules/vendor-tweaks/pii_nge.make
@@ -1,6 +1,6 @@
 # -*-makefile-*-
 #  
-# $Id: pii_nge.make,v 1.9 2004/08/26 06:25:51 rsc Exp $
+# $Id$
 #
 # See CREDITS for details about who has contributed to this project.
 #
diff --git a/rules/vendor-tweaks/powerpc-4xx-toolchain.make b/rules/vendor-tweaks/powerpc-4xx-toolchain.make
index 9fbb9d5ed..70ff34391 100644
--- a/rules/vendor-tweaks/powerpc-4xx-toolchain.make
+++ b/rules/vendor-tweaks/powerpc-4xx-toolchain.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: powerpc-4xx-toolchain.make,v 1.1 2003/12/12 15:46:54 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Benedikt Spranger <b.spranger@pengutronix.de>
 #          
diff --git a/rules/vendor-tweaks/wystup.make b/rules/vendor-tweaks/wystup.make
index 738760067..aa3926f69 100644
--- a/rules/vendor-tweaks/wystup.make
+++ b/rules/vendor-tweaks/wystup.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: wystup.make,v 1.3 2004/08/30 15:41:20 bsp Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Auerswald GmbH & Co. KG <linux-development@auerswald.de>
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
@@ -22,7 +22,7 @@ $(STATEDIR)/wystup.targetinstall:
 	@$(call targetinfo, vendor-tweaks.targetinstall)
 
 #	copy /etc template
-#	cp -a $(TOPDIR)/etc/wystup/. $(ROOTDIR)/etc
+#	cp -a $(TOPDIR)/projects/wystup/etc/. $(ROOTDIR)/etc
 
 #	remove CVS stuff
 	find $(ROOTDIR) -name "CVS" | xargs rm -fr
diff --git a/rules/virtual-libc.make b/rules/virtual-libc.make
index 40474ec01..f42ffd3e7 100644
--- a/rules/virtual-libc.make
+++ b/rules/virtual-libc.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: virtual-libc.make,v 1.3 2004/08/09 08:56:51 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
 #
@@ -20,12 +20,14 @@ VIRTUAL += virtual-libc
 
 virtual-libc_install: $(STATEDIR)/virtual-libc.install
 
+ifdef PTXCONF_LIBC
 ifdef PTXCONF_GLIBC
 virtual-libc_install_deps = $(STATEDIR)/glibc.install
 endif 
 ifdef PTXCONF_UCLIBC
 virtual-libc_install_deps = $(STATEDIR)/uclibc.install
 endif 
+endif
 
 $(STATEDIR)/virtual-libc.install: $(virtual-libc_install_deps)
 	@$(call targetinfo, $@)
@@ -37,12 +39,14 @@ $(STATEDIR)/virtual-libc.install: $(virtual-libc_install_deps)
 
 virtual-libc_targetinstall: $(STATEDIR)/virtual-libc.targetinstall
 
+ifdef PTXCONF_LIBC
 ifdef PTXCONF_GLIBC
 virtual-libc_targetinstall_deps = $(STATEDIR)/glibc.targetinstall
 endif 
 ifdef PTXCONF_UCLIBC
 virtual-libc_targetinstall_deps = $(STATEDIR)/uclibc.targetinstall
 endif 
+endif
 
 $(STATEDIR)/virtual-libc.targetinstall: $(virtual-libc_targetinstall_deps)
 	@$(call targetinfo, $@)
diff --git a/rules/virtual-libcxx.make b/rules/virtual-libcxx.make
index 76f7986de..d8acf2cdf 100644
--- a/rules/virtual-libcxx.make
+++ b/rules/virtual-libcxx.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: virtual-libcxx.make,v 1.1 2003/11/13 19:28:24 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
 #
diff --git a/rules/wireless.make b/rules/wireless.make
index 817681d32..f25ab89c5 100644
--- a/rules/wireless.make
+++ b/rules/wireless.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: wireless.make,v 1.3 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project. 
diff --git a/rules/wxWindows.make b/rules/wxWindows.make
index 8a1c3ea8a..b059e27bc 100644
--- a/rules/wxWindows.make
+++ b/rules/wxWindows.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: wxWindows.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 08/10/2003 by Marco Cavallini <m.cavallini@koansoftware.com>
 #          
diff --git a/rules/xalf.make b/rules/xalf.make
index 3dca62305..a3ca20064 100644
--- a/rules/xalf.make
+++ b/rules/xalf.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xalf.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #          
diff --git a/rules/xchain-binutils.make b/rules/xchain-binutils.make
deleted file mode 100644
index e95f6137d..000000000
--- a/rules/xchain-binutils.make
+++ /dev/null
@@ -1,165 +0,0 @@
-# -*-makefile-*-
-# $Id: xchain-binutils.make,v 1.16 2004/03/31 20:50:45 mkl Exp $
-#
-# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
-#
-# See CREDITS for details about who has contributed to this project. 
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-ifdef PTXCONF_BUILD_CROSSCHAIN
-XCHAIN += xchain-binutils
-endif
-
-#
-# Paths and names 
-#
-XCHAIN_BINUTILS_VERSION	= $(BINUTILS_VERSION)
-XCHAIN_BINUTILS		= $(BINUTILS)
-XCHAIN_BINUTILS_SOURCE	= $(BINUTILS_SOURCE)
-XCHAIN_BINUTILS_DIR	= $(XCHAIN_BUILDDIR)/$(XCHAIN_BINUTILS)
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-xchain-binutils_get: $(STATEDIR)/xchain-binutils.get
-
-xchain-binutils_get_deps = \
-	$(XCHAIN_BINUTILS_SOURCE) \
-	$(STATEDIR)/xchain-binutils-patches.get
-
-$(STATEDIR)/xchain-binutils.get: $(xchain-binutils_get_deps)
-	@$(call targetinfo, $@)
-	touch $@
-
-$(STATEDIR)/xchain-binutils-patches.get:
-	@$(call targetinfo, $@)
-	@$(call get_patches, $(XCHAIN_BINUTILS))
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-xchain-binutils_extract: $(STATEDIR)/xchain-binutils.extract
-
-$(STATEDIR)/xchain-binutils.extract: $(STATEDIR)/xchain-binutils.get
-	@$(call targetinfo, $@)
-	@$(call clean, $(XCHAIN_BINUTILS_DIR))
-	@$(call extract, $(XCHAIN_BINUTILS_SOURCE), $(XCHAIN_BUILDDIR))
-	@$(call patchin, $(BINUTILS), $(XCHAIN_BINUTILS_DIR))
-#
-# inspired by Erik Andersen's buildroot
-#
-
-#
-# Hack binutils to use the correct shared lib loader
-#
-	cd $(XCHAIN_BINUTILS_DIR) && \
-		perl -i -p -e "s,#.*define.*ELF_DYNAMIC_INTERPRETER.*\".*\",#define ELF_DYNAMIC_INTERPRETER \"$(DYNAMIC_LINKER)\",;" \
-		`grep -lr "#define ELF_DYNAMIC_INTERPRETER" $(XCHAIN_BINUTILS_DIR)`
-
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-xchain-binutils_prepare: $(STATEDIR)/xchain-binutils.prepare
-
-XCHAIN_BINUTILS_AUTOCONF = \
-	--target=$(PTXCONF_GNU_TARGET) \
-	--host=$(GNU_HOST) \
-	--build=$(GNU_HOST) \
-	--prefix=$(PTXCONF_PREFIX) \
-	--enable-targets=$(PTXCONF_GNU_TARGET) \
-	--disable-nls \
-	--enable-shared \
-	--enable-commonbfdlib \
-	--enable-install-libiberty \
-	--with-sysroot=$(CROSS_LIB_DIR) \
-	--with-lib-path="$(CROSS_LIB_DIR)/usr/lib:$(CROSS_LIB_DIR)/lib"
-
-XCHAIN_BINUTILS_ENV	= $(HOSTCC_ENV)
-
-$(STATEDIR)/xchain-binutils.prepare: $(STATEDIR)/xchain-binutils.extract
-	@$(call targetinfo, $@)
-	@$(call clean, $(XCHAIN_BINUTILS_DIR)/config.cache)
-	cd $(XCHAIN_BINUTILS_DIR) && $(XCHAIN_BINUTILS_ENV) \
-		./configure $(XCHAIN_BINUTILS_AUTOCONF)
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-xchain-binutils_compile: $(STATEDIR)/xchain-binutils.compile
-
-$(STATEDIR)/xchain-binutils.compile: $(STATEDIR)/xchain-binutils.prepare 
-	@$(call targetinfo, $@)
-	make -C $(XCHAIN_BINUTILS_DIR)
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-xchain-binutils_install: $(STATEDIR)/xchain-binutils.install
-
-$(STATEDIR)/xchain-binutils.install: $(STATEDIR)/xchain-binutils.compile
-	@$(call targetinfo, $@)
-	make install -C $(XCHAIN_BINUTILS_DIR)
-#
-# make short-name links to long-name programms
-# e.g.: arm-linux-gcc -> arm-unknown-linux-gnu-gcc
-# take care not to make liks in case the short names are identical to 
-# the long names
-#
-	cd $(PTXCONF_PREFIX)/bin &&										\
-		for FILE in addr2line ar as ld nm objcopy objdump ranlib readelf size strings strip; do		\
-		if [ ! -e $(SHORT_TARGET)-linux-$$FILE ]; then 							\
-			ln -sf $(PTXCONF_GNU_TARGET)-$$FILE $(SHORT_TARGET)-linux-$$FILE;			\
-		fi;												\
-	done
-
-#
-# here we convert the static libiberty.a into a
-# shared one (.so)
-#
-	cd $(XCHAIN_BINUTILS_DIR)/libiberty && \
-		ld --whole-archive libiberty.a -r -o libiberty-$(XCHAIN_BINUTILS_VERSION).so
-
-	install -m 755 -D $(XCHAIN_BINUTILS_DIR)/libiberty/libiberty-$(XCHAIN_BINUTILS_VERSION).so \
-		$(PTXCONF_PREFIX)/$(GNU_HOST)/$(PTXCONF_GNU_TARGET)/lib/libiberty-$(XCHAIN_BINUTILS_VERSION).so
-	ln -sf libiberty-$(XCHAIN_BINUTILS_VERSION).so $(PTXCONF_PREFIX)/$(GNU_HOST)/$(PTXCONF_GNU_TARGET)/lib/libiberty.so
-
-#
-# ksymoops want's to have libiberty.a, we copy it into the dir where ksymoops
-# expects it
-#
-	install -m 644 -D $(XCHAIN_BINUTILS_DIR)/libiberty/libiberty.a \
-		$(PTXCONF_PREFIX)/$(GNU_HOST)/$(PTXCONF_GNU_TARGET)/lib/libiberty.a
-
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-xchain-binutils_targetinstall: $(STATEDIR)/xchain-binutils.targetinstall
-
-$(STATEDIR)/xchain-binutils.targetinstall: $(STATEDIR)/xchain-binutils.install
-	@$(call targetinfo, $@)
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-xchain-binutils_clean: 
-	rm -rf $(STATEDIR)/xchain-binutils.* $(XCHAIN_BINUTILS_DIR)
-
-# vim: syntax=make
diff --git a/rules/xchain-distcc.make b/rules/xchain-distcc.make
index 86b8e9bd0..188b3675e 100644
--- a/rules/xchain-distcc.make
+++ b/rules/xchain-distcc.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-distcc.make,v 1.2 2003/10/29 16:43:30 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 Ixia Communications, by Dan Kegel
 #          
diff --git a/rules/xchain-flex254.make b/rules/xchain-flex254.make
index e89f275ab..006b9cce3 100644
--- a/rules/xchain-flex254.make
+++ b/rules/xchain-flex254.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-flex254.make,v 1.1 2003/11/02 14:24:08 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
 #          
diff --git a/rules/xchain-gccstage1.make b/rules/xchain-gccstage1.make
deleted file mode 100644
index 3cca156f2..000000000
--- a/rules/xchain-gccstage1.make
+++ /dev/null
@@ -1,270 +0,0 @@
-# -*-makefile-*-
-# $Id: xchain-gccstage1.make,v 1.18 2004/07/08 16:48:17 bsp Exp $
-#
-# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
-#
-# See CREDITS for details about who has contributed to this project. 
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-ifdef PTXCONF_BUILD_CROSSCHAIN
-XCHAIN += xchain-gccstage1
-endif
-
-#
-# Paths and names 
-#
-# version stuff in now in rules/Version.make
-# NB: make s*cks
-#
-GCC			=  gcc-$(GCC_VERSION)
-GCC_URL			=  ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$(GCC_VERSION)/$(GCC).tar.gz
-GCC_SOURCE		=  $(SRCDIR)/$(GCC).tar.gz
-GCC_DIR			=  $(BUILDDIR)/$(GCC)
-GCC_STAGE1_DIR		=  $(BUILDDIR)/$(GCC)-$(PTXCONF_GNU_TARGET)-stage1
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-xchain-gccstage1_get: $(STATEDIR)/xchain-gccstage1.get
-
-xchain-gccstage1_get_deps = \
-	$(GCC_SOURCE) \
-	$(STATEDIR)/xchain-gccstage1-patches.get
-
-$(STATEDIR)/xchain-gccstage1.get: $(xchain-gccstage1_get_deps)
-	@$(call targetinfo, $@)
-	touch $@
-
-$(STATEDIR)/xchain-gccstage1-patches.get:
-	@$(call targetinfo, $@)
-	@$(call get_patches, $(GCC))
-	touch $@
-
-$(GCC_SOURCE): 
-	@$(call targetinfo, $@)
-	@$(call get, $(GCC_URL))
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-xchain-gccstage1_extract: $(STATEDIR)/xchain-gccstage1.extract
-
-xchain-gccstage1_extract_deps = $(STATEDIR)/xchain-gccstage1.get
-
-$(STATEDIR)/xchain-gccstage1.extract: $(xchain-gccstage1_extract_deps)
-	@$(call targetinfo, $@)
-	@$(call clean, $(GCC_DIR))
-	@$(call extract, $(GCC_SOURCE))
-	@$(call patchin, $(GCC))
-
-#
-# sto^H^H^Hinspired by Erik Andersen's buildroot
-#
-
-#
-# Hack things to use the correct shared lib loader
-#
-	cd $(GCC_DIR) && \
-		export LIST=`grep -lr -- "-dynamic-linker.*\.so[\.0-9]*" *` && \
-		if [ -n "$$LIST" ] ; then \
-			perl -i -p -e "s,-dynamic-linker.*\.so[\.0-9]*},-dynamic-linker $(DYNAMIC_LINKER)},;" $$LIST; \
-		fi;
-
-ifdef PTXCONF_UCLIBC
-ifdef PTXCONF_GCC_2
-#
-# Use atexit() directly, rather than cxa_atexit
-#
-	perl -i -p -e "s,int flag_use_cxa_atexit = 1;,int flag_use_cxa_atexit = 0;,g;"\
-		$(GCC_DIR)/gcc/cp/decl2.c;
-#
-# We do not wish to build the libstdc++ library provided with gcc,
-# since it doesn't seem to work at all with uClibc plus gcc 2.95...
-#
-	mv $(GCC_DIR)/libstdc++ $(GCC_DIR)/libstdc++.orig
-	mv $(GCC_DIR)/libio $(GCC_DIR)/libio.orig
-endif # PTXCONFIG_GCC_2
-endif # PTXCON_UCLIBC
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-xchain-gccstage1_prepare: $(STATEDIR)/xchain-gccstage1.prepare
-
-xchain-gccstage1_prepare_deps = \
-	$(STATEDIR)/xchain-binutils.install \
-	$(STATEDIR)/xchain-gccstage1.extract
-
-#
-# Dan Kegel says:
-#
-# Only need to install bootstrap glibc headers for gcc-3.0 and above?
-# Or maybe just gcc-3.3 and above? This will change for gcc-3.5, I
-# think (I hope). See also http://gcc.gnu.org/PR8180, which complains
-# about the need for this step. Don't install them if they're already
-# there (it's really slow)
-#
-# Comments:
-# gcc-3.2.3 for PPC needs some headers (or a patch that disables the
-# #include of the headers)
-#
-# you will get an error like this:
-#
-# /home/frogger/projects/ptxdist/ptxdist-ppc/build/gcc-3.2.3-powerpc-405-linux-gnu-stage1/gcc/xgcc
-# [...]
-# /home/frogger/projects/ptxdist/ptxdist-ppc/build/gcc-3.2.3/gcc/libgcc2.c
-# -o libgcc/./_muldi3.o
-#
-# In file included from tconfig.h:21, from
-# /home/frogger/projects/ptxdist/ptxdist-ppc/build/gcc-3.2.3/gcc/libgcc2.c:36:
-# /home/frogger/projects/ptxdist/ptxdist-ppc/build/gcc-3.2.3/gcc/config/rs6000/linux.h:82:20:
-# signal.h: No such file or directory
-# /home/frogger/projects/ptxdist/ptxdist-ppc/build/gcc-3.2.3/gcc/config/rs6000/linux.h:83:26:
-# sys/ucontext.h: No such file or directory
-# make[3]: *** [libgcc/./_muldi3.o] Error 1
-# [MKL]
-#
-
-#
-# the header thing is even more complicated:
-#
-# - we've learned so far that gcc > 3 need the libc headers
-# - uClibc installs the kernel headers,
-#   so we don't need to do that here again
-# - so we need to install the kernel headers if gcc < 3 or
-#   we are building a glibc based toolchain
-# [MKL]
-#
-ifeq (3,$(GCC_VERSION_MAJOR))
-ifdef PTXCONF_GLIBC 
-xchain-gccstage1_prepare_deps += \
-	$(STATEDIR)/xchain-glibc.install \
-	$(STATEDIR)/xchain-kernel.install
-endif
-ifdef PTXCONF_UCLIBC
-xchain-gccstage1_prepare_deps += $(STATEDIR)/xchain-uclibc.install
-endif
-else
-xchain-gccstage1_prepare_deps += $(STATEDIR)/xchain-kernel.install
-endif
-
-GCC_STAGE1_PATH	= PATH=$(CROSS_PATH)
-GCC_STAGE1_ENV	= $(HOSTCC_ENV)
-
-GCC_STAGE1_AUTOCONF = \
-	--target=$(PTXCONF_GNU_TARGET) \
-	--host=$(GNU_HOST) \
-	--build=$(GNU_HOST) \
-	--prefix=$(PTXCONF_PREFIX) \
-	--with-local-prefix=$(CROSS_LIB_DIR) \
-	$(GCC_EXTRA_CONFIG) \
-	--disable-nls \
-	--disable-threads \
-	--disable-shared \
-	--disable-multilib \
-	--enable-languages=c \
-	--enable-symvers=gnu \
-	--enable-target-optspace \
-	--enable-version-specific-runtime-libs \
-	--with-newlib \
-        --without-headers \
-	--with-gnu-ld
-
-# RSC: Where does --with-newlib come from ???
-
-ifdef PTXCONF_GLIBC
-GCC_STAGE1_AUTOCONF	+= --enable-__cxa_atexit
-endif
-
-ifdef PTXCONF_UCLIBC
-GCC_STAGE1_AUTOCONF	+= --disable-__cxa_atexit
-endif
-
-ifdef PTXCONF_SOFTFLOAT
-GCC_STAGE1_AUTOCONF	+= --enable-softfloat
-else
-GCC_STAGE1_AUTOCONF	+= --disable-softfloat
-endif
-
-#
-# FIXME: "configure: line 193: cd: no: No such file or directory"
-#
-# cd /home/frogger/ptxdist/ptxdist-i386/build/gcc-3.2.3-"i386-linux"-stage1 && \
-#        PATH="/home/frogger/ptxdist/xchain/i386"/bin:$PATH CC=gcc \
-#
-# /home/frogger/ptxdist/ptxdist-i386/build/gcc-3.2.3/configure
-# --target="i386-linux" --host=powerpc-host-linux-gnu
-# --build=powerpc-host-linux-gnu
-# --prefix="/home/frogger/ptxdist/xchain/i386"
-# --with-local-prefix="/home/frogger/ptxdist/xchain/i386"/"i386-linux"
-# --disable-nls --disable-multilib --disable-threads --disable-shared
-# --enable-languages=c --enable-symvers=gnu --enable-target-optspace
-# --enable-version-specific-runtime-libs --with-newlib
-# --without-headers --with-gnu-ld --enable-__cxa_atexit Copying no to
-# /home/frogger/ptxdist/xchain/i386/i386-linux/sys-include
-# /home/frogger/ptxdist/ptxdist-i386/build/gcc-3.2.3/configure: line
-# 193: cd: no: No such file or directory
-#
-$(STATEDIR)/xchain-gccstage1.prepare: $(xchain-gccstage1_prepare_deps)
-	@$(call targetinfo, $@)
-	@$(call clean, $(GCC_STAGE1_DIR))
-
-	mkdir -p $(GCC_STAGE1_DIR)
-	cd $(GCC_STAGE1_DIR) && \
-		$(GCC_STAGE1_PATH) $(GCC_STAGE1_ENV) \
-		$(GCC_DIR)/configure $(GCC_STAGE1_AUTOCONF)
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-xchain-gccstage1_compile: $(STATEDIR)/xchain-gccstage1.compile
-
-$(STATEDIR)/xchain-gccstage1.compile: $(STATEDIR)/xchain-gccstage1.prepare
-	@$(call targetinfo, $@)
-	cd $(GCC_STAGE1_DIR) && \
-		$(GCC_STAGE1_PATH) \
-		make all-gcc
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-xchain-gccstage1_install: $(STATEDIR)/xchain-gccstage1.install
-
-$(STATEDIR)/xchain-gccstage1.install: $(STATEDIR)/xchain-gccstage1.compile
-	@$(call targetinfo, $@)
-	cd $(GCC_STAGE1_DIR) &&	\
-		$(GCC_STAGE1_PATH) $(GCC_STAGE1_ENV) \
-		make install
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-xchain-gccstage1_targetinstall: $(STATEDIR)/xchain-gccstage1.targetinstall
-
-$(STATEDIR)/xchain-gccstage1.targetinstall:
-	@$(call targetinfo, $@)
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-xchain-gccstage1_clean:
-	rm -fr $(GCC_STAGE1_DIR)
-	rm -fr $(STATEDIR)/xchain-gccstage1.*
-	rm -fr $(GCC_DIR)
-
-# vim: syntax=make
diff --git a/rules/xchain-gccstage2.make b/rules/xchain-gccstage2.make
deleted file mode 100644
index 04d983f25..000000000
--- a/rules/xchain-gccstage2.make
+++ /dev/null
@@ -1,245 +0,0 @@
-# -*-makefile-*-
-# $Id: xchain-gccstage2.make,v 1.26 2004/01/30 12:43:57 robert Exp $
-#
-# Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
-#
-# See CREDITS for details about who has contributed to this project. 
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-ifdef PTXCONF_BUILD_CROSSCHAIN
-XCHAIN += xchain-gccstage2
-endif
-
-#
-# Paths and names 
-#
-GCC_STAGE2_DIR		= $(BUILDDIR)/$(GCC)-$(PTXCONF_GNU_TARGET)-stage2
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-xchain-gccstage2_get: $(STATEDIR)/xchain-gccstage2.get
-
-$(STATEDIR)/xchain-gccstage2.get: $(xchain-gccstate1_get_deps)
-	@$(call targetinfo, $@)
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-xchain-gccstage2_extract: $(STATEDIR)/xchain-gccstage2.extract
-
-$(STATEDIR)/xchain-gccstage2.extract: $(STATEDIR)/xchain-gccstage1.extract
-	@$(call targetinfo, $@)
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-xchain-gccstage2_prepare: $(STATEDIR)/xchain-gccstage2.prepare
-
-xchain-gccstage2_prepare_deps =  $(STATEDIR)/xchain-gccstage2.extract
-
-ifdef PTXCONF_GLIBC
-xchain-gccstage2_prepare_deps += $(STATEDIR)/glibc.install
-endif
-ifdef PTXCONF_UCLIBC
-xchain-gccstage2_prepare_deps += $(STATEDIR)/uclibc.install
-endif
-
-GCC_STAGE2_PATH	= PATH=$(CROSS_PATH)
-GCC_STAGE2_ENV	= $(HOSTCC_ENV)
-
-#
-# Robert Schwebel says:
-#
-# why do we have to define _GNU_SOURCE here? Otherwhise 
-# the c++ compiler cannot be compiled. occours in 2.95.3
-#
-# the error looks like this:
-# /home/frogger/projects/ptxdist/ptxdist-generic/build/gcc-2.95.3-i386-linux-stage2/gcc/xgcc
-# -B/home/frogger/projects/ptxdist/ptxdist-generic/build/gcc-2.95.3-i386-linux-stage2/gcc/
-# -B/home/frogger/ptxdist/xchain/generic/i386-linux/bin/ -c -g -Os
-# -fno-implicit-templates
-# -I. -I/home/frogger/projects/ptxdist/ptxdist-generic/build/gcc-2.95.3/libio
-# -nostdinc++ -D_IO_MTSAFE_IO -fpic
-# /home/frogger/projects/ptxdist/ptxdist-generic/build/gcc-2.95.3/libio/iostream.cc
-# -o pic/iostream.o
-# /home/frogger/projects/ptxdist/ptxdist-generic/build/gcc-2.95.3/libio/iostream.cc:
-# In method `class istream & istream::get(char &)':
-# /home/frogger/projects/ptxdist/ptxdist-generic/build/gcc-2.95.3/libio/iostream.cc:75:
-# `_pthread_cleanup_push_defer' undeclared (first use this function)
-# /home/frogger/projects/ptxdist/ptxdist-generic/build/gcc-2.95.3/libio/iostream.cc:75:
-# (Each undeclared identifier is reported only once
-# /home/frogger/projects/ptxdist/ptxdist-generic/build/gcc-2.95.3/libio/iostream.cc:75:
-# for each function it appears in.)
-# /home/frogger/projects/ptxdist/ptxdist-generic/build/gcc-2.95.3/libio/iostream.cc:86:
-# implicit declaration of function `int
-# _pthread_cleanup_pop_restore(...)'
-#
-ifdef PTXCONF_GCC_2_95_3
-GCC_STAGE2_MAKEVARS	= CXXFLAGS_FOR_TARGET="-D_GNU_SOURCE"
-endif
-
-GCC_STAGE2_AUTOCONF_THREADS = --disable-threads
-ifdef PTXCONF_GLIBC_PTHREADS
-GCC_STAGE2_AUTOCONF_THREADS = --enable-threads=posix
-endif
-ifdef PTXCONF_UCLIBC_UCLIBC_HAS_THREADS
-GCC_STAGE2_AUTOCONF_THREADS = --enable-threads=posix
-endif
-
-GCC_STAGE2_AUTOCONF = \
-	--target=$(PTXCONF_GNU_TARGET) \
-	--host=$(GNU_HOST) \
-	--build=$(GNU_HOST) \
-	--prefix=$(PTXCONF_PREFIX) \
-	--with-local-prefix=$(CROSS_LIB_DIR) \
-	$(GCC_EXTRA_CONFIG) \
-	$(GCC_STAGE2_AUTOCONF_THREADS) \
-	--with-headers=$(CROSS_LIB_DIR)/include \
-	--disable-nls \
-	--enable-symvers=gnu \
-	--enable-target-optspace \
-	--enable-c99 \
-	--enable-long-long
-
-ifdef PTXCONF_GCC_SHARED
-GCC_STAGE2_AUTOCONF	+= --enable-shared
-else
-GCC_STAGE2_AUTOCONF	+= --disable-shared
-endif
-
-ifdef PTXCONF_GCC_MULTILIB
-GCC_STAGE2_AUTOCONF	+= --enable-multilib
-else
-GCC_STAGE2_AUTOCONF	+= --disable-multilib
-endif
-
-ifdef PTXCONF_SOFTFLOAT
-GCC_STAGE2_AUTOCONF	+= --enable-softfloat
-else
-GCC_STAGE2_AUTOCONF	+= --disable-softfloat
-endif
-
-#
-# build C++ by default
-#
-# ifdef PTXCONF_CXX
-GCC_STAGE2_AUTOCONF	+= --enable-languages="c,c++"
-# else
-# GCC_STAGE2_AUTOCONF	+= --enable-languages="c"
-# endif
-
-ifdef PTXCONF_GLIBC
-GCC_STAGE2_AUTOCONF	+= --enable-__cxa_atexit
-endif
-ifdef PTXCONF_UCLIBC
-GCC_STAGE2_AUTOCONF	+= --disable-__cxa_atexit
-endif
-
-$(STATEDIR)/xchain-gccstage2.prepare: $(xchain-gccstage2_prepare_deps)
-	@$(call targetinfo, $@)
-	@$(call clean, $(GCC_STAGE2_DIR))
-
-	mkdir -p $(GCC_STAGE2_DIR)
-	cd $(GCC_STAGE2_DIR) &&	\
-	     	$(GCC_STAGE2_PATH) $(GCC_STAGE2_ENV) \
-		$(GCC_DIR)/configure $(GCC_STAGE2_AUTOCONF)
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-xchain-gccstage2_compile: $(STATEDIR)/xchain-gccstage2.compile
-
-$(STATEDIR)/xchain-gccstage2.compile: $(STATEDIR)/xchain-gccstage2.prepare
-	@$(call targetinfo, $@)
-	$(GCC_STAGE2_PATH) make -C $(GCC_STAGE2_DIR) $(GCC_STAGE2_MAKEVARS)
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-xchain-gccstage2_install: $(STATEDIR)/xchain-gccstage2.install
-
-$(STATEDIR)/xchain-gccstage2.install: $(STATEDIR)/xchain-gccstage2.compile
-	@$(call targetinfo, $@)
-	$(GCC_STAGE2_PATH) make -C $(GCC_STAGE2_DIR) install
-
-#
-# make short-name links to long-name programms
-# e.g.: arm-linux-gcc -> arm-unknown-linux-gnu-gcc
-# don't link if short-name == long-name. 
-#
-	cd $(PTXCONF_PREFIX)/bin &&							\
-		for FILE in gcc gccbug cpp gcov; do					\
-		if [ ! -e $(SHORT_TARGET)-linux-$$FILE ]; then				\
-		       ln -sf $(PTXCONF_GNU_TARGET)-$$FILE $(SHORT_TARGET)-linux-$$FILE;\
-		fi; 									\
-	done
-ifdef PTXCONF_CXX
-	cd $(PTXCONF_PREFIX)/bin &&							\
-		for FILE in c++ g++ c++flit; do						\
-		if [ ! -e $(SHORT_TARGET)-linux-$$FILE ]; then				\
-		       ln -sf $(PTXCONF_GNU_TARGET)-$$FILE $(SHORT_TARGET)-linux-$$FILE;\
-		fi;									\
-	done
-endif
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-xchain-gccstage2_targetinstall: $(STATEDIR)/xchain-gccstage2.targetinstall
-
-ifdef PTXCONF_BUILD_CROSSCHAIN
-xchain-gccstage2_targetinstall_deps = $(STATEDIR)/xchain-gccstage2.install
-endif
-
-$(STATEDIR)/xchain-gccstage2.targetinstall: $(xchain-gccstage2_targetinstall_deps)
-	@$(call targetinfo, $@)
-ifdef PTXCONF_LIBSTDCXX_SHARED
-	mkdir -p $(ROOTDIR)/usr/lib
-
-	for FILE in											\
-		`find $(CROSS_LIB_DIR)/lib/ -name "libgcc_s[-.]*so*"`					\
-		`find $(PTXCONF_PREFIX)/lib/gcc-lib/$(PTXCONF_GNU_TARGET)/ -name "libgcc_s[-.]*so*"`	\
-		;do											\
-			cp -d $$FILE $(ROOTDIR)/lib/;							\
-			chmod 755 $$FILE;								\
-			$(CROSSSTRIP) -R .note -R .comment $$FILE;					\
-	done
-
-#
-# gcc-2.95.3 has weird permission on libstdc++
-# chmod 755 fixes that
-#
-	for FILE in											\
-		`find $(CROSS_LIB_DIR)/lib/ -name "libstdc++[-.]*so*"`					\
-		`find $(PTXCONF_PREFIX)/lib/gcc-lib/$(PTXCONF_GNU_TARGET)/ -name "libstdc++[-.]*so*"`	\
-		;do											\
-			cp -d $$FILE $(ROOTDIR)/usr/lib/;						\
-			chmod 755 $$FILE;								\
-			$(CROSSSTRIP) -R .note -R .comment $$FILE;					\
-	done
-endif
-	touch $@
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-xchain-gccstage2_clean:
-	rm -fr $(GCC_STAGE2_DIR) $(STATEDIR)/xchain-gccstage2.* 
-
-# vim: syntax=make
diff --git a/rules/xchain-gdb.make b/rules/xchain-gdb.make
index 75000e1ea..c5cd5d1e9 100644
--- a/rules/xchain-gdb.make
+++ b/rules/xchain-gdb.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-gdb.make,v 1.9 2003/11/17 03:43:42 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
 # Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
diff --git a/rules/xchain-glibc.make b/rules/xchain-glibc.make
index 4242a4d0b..c2c6b8726 100644
--- a/rules/xchain-glibc.make
+++ b/rules/xchain-glibc.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-glibc.make,v 1.21 2004/01/31 15:06:39 robert Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
 # Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
diff --git a/rules/xchain-kaffe.make b/rules/xchain-kaffe.make
index dd1e5d0bc..f060b2485 100644
--- a/rules/xchain-kaffe.make
+++ b/rules/xchain-kaffe.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-kaffe.make,v 1.3 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de> for
 #             GYRO net GmbH <info@gyro-net.de>, Hannover, Germany
diff --git a/rules/xchain-kernel-ben.make b/rules/xchain-kernel-ben.make
index cdd1955af..53a8644b3 100644
--- a/rules/xchain-kernel-ben.make
+++ b/rules/xchain-kernel-ben.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-kernel-ben.make,v 1.3 2003/10/28 11:12:24 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #
diff --git a/rules/xchain-kernel-dev-epoll.make b/rules/xchain-kernel-dev-epoll.make
index c98b86163..8dba225f4 100644
--- a/rules/xchain-kernel-dev-epoll.make
+++ b/rules/xchain-kernel-dev-epoll.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-kernel-dev-epoll.make,v 1.2 2003/11/05 00:58:41 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Ixia Corporation, by Milan Bobde
 #          
diff --git a/rules/xchain-kernel-ds.make b/rules/xchain-kernel-ds.make
index 5bae81632..8038057bf 100644
--- a/rules/xchain-kernel-ds.make
+++ b/rules/xchain-kernel-ds.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-kernel-ds.make,v 1.3 2003/10/28 11:12:24 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #          
diff --git a/rules/xchain-kernel-mtd.make b/rules/xchain-kernel-mtd.make
index 88a647e86..e6e3e392b 100644
--- a/rules/xchain-kernel-mtd.make
+++ b/rules/xchain-kernel-mtd.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-kernel-mtd.make,v 1.3 2003/10/28 11:12:24 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #          
diff --git a/rules/xchain-kernel-ptx.make b/rules/xchain-kernel-ptx.make
index 373a8ed36..fd531f753 100644
--- a/rules/xchain-kernel-ptx.make
+++ b/rules/xchain-kernel-ptx.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-kernel-ptx.make,v 1.4 2003/10/28 11:12:24 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #
diff --git a/rules/xchain-kernel-pxa.make b/rules/xchain-kernel-pxa.make
index 33054fd71..dac6347f3 100644
--- a/rules/xchain-kernel-pxa.make
+++ b/rules/xchain-kernel-pxa.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-kernel-pxa.make,v 1.3 2003/10/28 11:12:24 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #
diff --git a/rules/xchain-kernel-rmk.make b/rules/xchain-kernel-rmk.make
index 40d15ec02..8d5823c71 100644
--- a/rules/xchain-kernel-rmk.make
+++ b/rules/xchain-kernel-rmk.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-kernel-rmk.make,v 1.3 2003/10/28 11:12:24 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #
diff --git a/rules/xchain-kernel-sys-epoll.make b/rules/xchain-kernel-sys-epoll.make
index 1f4a4c7c6..8dfa324d5 100644
--- a/rules/xchain-kernel-sys-epoll.make
+++ b/rules/xchain-kernel-sys-epoll.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-kernel-sys-epoll.make,v 1.2 2003/11/05 00:58:41 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Ixia Corporation, by Milan Bobde
 #          
diff --git a/rules/xchain-kernel-uc.make b/rules/xchain-kernel-uc.make
index 3f3c01410..8ab123f1a 100644
--- a/rules/xchain-kernel-uc.make
+++ b/rules/xchain-kernel-uc.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-kernel-uc.make,v 1.3 2003/10/28 11:12:24 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde.de>
 #
diff --git a/rules/xchain-kernel.make b/rules/xchain-kernel.make
index 11f95e01a..3b1aa8e9a 100644
--- a/rules/xchain-kernel.make
+++ b/rules/xchain-kernel.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-kernel.make,v 1.30 2004/08/18 19:19:36 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2002, 2003 by Pengutronix e.K., Hildesheim, Germany
 #
diff --git a/rules/xchain-ltt.make b/rules/xchain-ltt.make
index 25c4e84d6..b05a985d2 100644
--- a/rules/xchain-ltt.make
+++ b/rules/xchain-ltt.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-ltt.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Auerswald GmbH & Co. KG, Schandelah, Germany
 # Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
diff --git a/rules/xchain-modutils.make b/rules/xchain-modutils.make
index de3aaf720..c39a3d502 100644
--- a/rules/xchain-modutils.make
+++ b/rules/xchain-modutils.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-modutils.make,v 1.2 2003/11/02 14:24:08 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Marc Kleine-Budde <kleine-budde@gmx.de>
 #          
diff --git a/rules/xchain-mtd.make b/rules/xchain-mtd.make
index 0f0522159..ba7730b9e 100644
--- a/rules/xchain-mtd.make
+++ b/rules/xchain-mtd.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-mtd.make,v 1.4 2004/06/22 17:10:41 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
 #          
diff --git a/rules/xchain-nasm.make b/rules/xchain-nasm.make
index e5a7f4e86..614e7fd88 100644
--- a/rules/xchain-nasm.make
+++ b/rules/xchain-nasm.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-nasm.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Dan Kegel http://kegel.com
 #          
diff --git a/rules/xchain-python.make b/rules/xchain-python.make
index c45aeee8f..d7ae91c57 100644
--- a/rules/xchain-python.make
+++ b/rules/xchain-python.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-python.make,v 1.2 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by David R Bacon
 #             Marc Kleine-Budde <kleine-budde@gmx.de>
diff --git a/rules/xchain-scons.make b/rules/xchain-scons.make
index 47e1d7784..1adaa5a2b 100644
--- a/rules/xchain-scons.make
+++ b/rules/xchain-scons.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-scons.make,v 1.3 2003/10/26 21:01:36 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Dan Kegel
 #          
diff --git a/rules/xchain-uclibc.make b/rules/xchain-uclibc.make
index 6e46eee7a..a68600e49 100644
--- a/rules/xchain-uclibc.make
+++ b/rules/xchain-uclibc.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-uclibc.make,v 1.4 2004/03/31 20:50:45 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003, 2004 by Marc Kleine-Budde <kleine-budde@gmx.de>
 #
diff --git a/rules/xchain-umkimage.make b/rules/xchain-umkimage.make
index d2f823e7f..cc8f21960 100644
--- a/rules/xchain-umkimage.make
+++ b/rules/xchain-umkimage.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-umkimage.make,v 1.5 2004/06/22 06:53:53 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Pengutronix e.K., Hildesheim, Germany
 #          
diff --git a/rules/xchain-zlib.make b/rules/xchain-zlib.make
index 606601639..1d8353ee7 100644
--- a/rules/xchain-zlib.make
+++ b/rules/xchain-zlib.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xchain-zlib.make,v 1.4 2003/10/26 21:59:07 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project. 
diff --git a/rules/xfree430.make b/rules/xfree430.make
index 7db4a53e8..e8e17fa46 100644
--- a/rules/xfree430.make
+++ b/rules/xfree430.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xfree430.make,v 1.17 2004/02/26 01:04:22 robert Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #             Pengutronix <info@pengutronix.de>, Germany
diff --git a/rules/xvkbd.make b/rules/xvkbd.make
index c7c4ad93f..67fc82589 100644
--- a/rules/xvkbd.make
+++ b/rules/xvkbd.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: xvkbd.make,v 1.3 2003/10/23 15:01:19 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 by Robert Schwebel <r.schwebel@pengutronix.de>
 #          
diff --git a/rules/zebra.make b/rules/zebra.make
index 0b298ffe1..081aa2984 100644
--- a/rules/zebra.make
+++ b/rules/zebra.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: zebra.make,v 1.3 2003/10/28 00:10:09 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2003 Jochen Striepe, Pengutronix e.K. <info@pengutronix.de>, Germany
 # Copyright (C) 2003 Robert Schwebel, Pengutronix e.K. <info@pengutronix.de>, Germany
diff --git a/rules/zlib.make b/rules/zlib.make
index d531b4306..aa9a79ea2 100644
--- a/rules/zlib.make
+++ b/rules/zlib.make
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Id: zlib.make,v 1.12 2004/05/04 10:57:24 mkl Exp $
+# $Id$
 #
 # Copyright (C) 2002 by Pengutronix e.K., Hildesheim, Germany
 # See CREDITS for details about who has contributed to this project. 
diff --git a/scripts/cvs2cl b/scripts/cvs2cl
index 0f82ba7e9..b52be4ac6 100755
--- a/scripts/cvs2cl
+++ b/scripts/cvs2cl
@@ -13,8 +13,8 @@ exec perl -w -x $0 ${1+"$@"} # -*- mode: perl; perl-indent-level: 2; -*-
 ##############################################################
 
 ## $Revision: 1.1 $
-## $Date: 2004/02/02 19:34:53 $
-## $Author: robert $
+## $Date$
+## $Author$
 ##
 
 use strict;
diff --git a/scripts/mkprefix b/scripts/mkprefix
index a3b6ca9b4..130d67f46 100755
--- a/scripts/mkprefix
+++ b/scripts/mkprefix
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# $Id: mkprefix,v 1.4 2003/09/13 09:23:48 robert Exp $
+# $Id$
 
 #require 5.008;
 
diff --git a/scripts/settoolchain.sh b/scripts/settoolchain.sh
index 617a25c92..96d4ba7e3 100755
--- a/scripts/settoolchain.sh
+++ b/scripts/settoolchain.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: settoolchain.sh,v 1.9 2004/07/28 01:13:09 rsc Exp $
+# $Id$
 #
 # Copyright (C) 2003 Ixia Communications, by Dan Kegel
 #
diff --git a/src/JUST_FOR_CVS b/src/JUST_FOR_CVS
deleted file mode 100644
index e69de29bb..000000000
--- a/src/JUST_FOR_CVS
+++ /dev/null
diff --git a/state/JUST_FOR_CVS b/state/JUST_FOR_CVS
deleted file mode 100644
index e69de29bb..000000000
--- a/state/JUST_FOR_CVS
+++ /dev/null