111 files changed, 5197 insertions, 2157 deletions

diff --git a/.gitignore b/.gitignore
index a4d67734a..fc81d7882 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,6 @@
 /host_*/
 /pkg_*/
 /root_*/
-/bin/
 /firmware/
 /build_*/
 /config/*.o
diff --git a/README b/README
index 820cc95c9..3e280c165 100644
--- a/README
+++ b/README
@@ -8,16 +8,11 @@ Before you can start you need to install some tools:
 - gcc 
 - binutils 
 - GNU make
-- GNU m4
 - GNU awk
 - GNU sed
 - tar
 - patch
 - gzip
-- bzip2
-- lzop
-- lzma
-- xz
 - wget
 - libc headers
 - ncurses5 headers
@@ -39,3 +34,4 @@ To switch to another target configuration, simply run "make switch". This will
 backup your existing configuration and will start with an empty one.
 
 Sunshine!
+ Waldemar Brodkorb <wbx@openadk.org>
diff --git a/mk/build.mk b/mk/build.mk
index eadccdcb3..90fce65a8 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -91,7 +91,7 @@ POSTCONFIG=		-@\
 	if [ -f .adkinit ];then rm .adkinit;\
 	else \
 	if [ -f .config.old ];then \
-		$(TOPDIR)/bin/pkgrebuild;\
+		$(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/pkgrebuild;\
 		rebuild=0; \
 		if [ "$$(grep ^BUSYBOX .config|md5sum)" != "$$(grep ^BUSYBOX .config.old|md5sum)" ];then \
 			touch .rebuild.busybox;\
@@ -138,7 +138,7 @@ include $(TOPDIR)/rules.mk
 all: world
 
 ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/Makefile)
-	$(BIN_DIR)/depmaker > ${TOPDIR}/package/Depends.mk
+	$(STAGING_HOST_DIR)/usr/bin/depmaker > ${TOPDIR}/package/Depends.mk
 
 .NOTPARALLEL:
 .PHONY: all world clean cleantarget cleandir distclean image_clean
@@ -155,12 +155,12 @@ ifeq ($(ADK_NATIVE),y)
 else
 ifeq ($(ADK_TOOLCHAIN),y)
 ifeq ($(ADK_TOOLCHAIN_ONLY),y)
-	$(MAKE) -f mk/build.mk toolchain/fixup tools/install package/compile
+	$(MAKE) -f mk/build.mk tools/install toolchain/fixup package/compile
 else
-	$(MAKE) -f mk/build.mk toolchain/fixup tools/install package/compile root_clean package/install
+	$(MAKE) -f mk/build.mk tools/install toolchain/fixup package/compile root_clean package/install
 endif
 else
-	$(MAKE) -f mk/build.mk toolchain/fixup tools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index
+	$(MAKE) -f mk/build.mk tools/install toolchain/fixup target/config-prepare target/compile package/compile root_clean package/install target/install package_index
 endif
 endif
 
@@ -250,13 +250,13 @@ root_clean:
 clean:
 	@$(TRACE) clean
 	$(MAKE) -C $(CONFIG) clean
-	for d in ${STAGING_PKG_DIR}; do \
-		for f in $$(ls $$d/[a-z]* 2>/dev/null |grep -v [A-Z] 2>/dev/null); do  \
-			while read file ; do \
-				rm ${STAGING_DIR}/$$file 2>/dev/null;\
-			done < $$f ; \
-			rm $$f ; \
-		done \
+	for f in $$(ls ${STAGING_PKG_DIR}/ 2>/dev/null |grep -v [A-Z]|grep -v stamps 2>/dev/null); do  \
+		while read file ; do \
+			echo ${STAGING_DIR}/$$file ;\
+			rm ${STAGING_DIR}/$$file 2>/dev/null;\
+		done < $$f ; \
+		echo ${STAGING_PKG_DIR}/$$f ;\
+		rm ${STAGING_PKG_DIR}/$$f ; \
 	done
 	rm -rf $(BUILD_DIR) $(FW_DIR) $(TARGET_DIR) \
 	    	${TOPDIR}/package/pkglist.d
@@ -535,7 +535,7 @@ bulktoolchain:
 			$(GMAKE) prereq && \
 				$(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \
 				$(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit;fi; \
-				tar -cJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_$${arch}_*_$${libc} target_$${arch}_*_$${libc}; \
+				tar -cvJf ${TOPDIR}/firmware/toolchain_$${arch}_$${libc}.tar.xz host_$${arch}_*_$${libc} target_$${arch}_*_$${libc}; \
 			rm .config; \
 		    ) 2>&1 | tee $(TOPDIR)/firmware/toolchain_$${arch}_$${libc}/build.log; \
 		    if [ -f .exit ];then break;fi \
@@ -619,24 +619,24 @@ bulkallmod:
 	  if [ -f .exit ];then echo "Bulk build failed!"; cat .exit;rm .exit; exit 1;fi \
 	done
 
-${TOPDIR}/bin/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c
-	@mkdir -p ${TOPDIR}/bin
+$(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/pkgmaker: $(TOPDIR)/tools/adk/pkgmaker.c $(TOPDIR)/tools/adk/sortfile.c $(TOPDIR)/tools/adk/strmap.c
+	@mkdir -p host_$(GNU_HOST_NAME)/usr/bin
 	@$(CC_FOR_BUILD) -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c
 
-${TOPDIR}/bin/pkgrebuild: $(TOPDIR)/tools/adk/pkgrebuild.c $(TOPDIR)/tools/adk/strmap.c
+$(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/pkgrebuild: $(TOPDIR)/tools/adk/pkgrebuild.c $(TOPDIR)/tools/adk/strmap.c
 	@$(CC_FOR_BUILD) -g -o $@ tools/adk/pkgrebuild.c tools/adk/strmap.c
 
-package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) ${TOPDIR}/bin/pkgmaker ${TOPDIR}/bin/pkgrebuild
+package/Config.in.auto menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile) $(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/pkgmaker $(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/pkgrebuild
 	@echo "Generating menu structure ..."
-	@$(TOPDIR)/bin/pkgmaker
+	@$(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/pkgmaker
 	@:>.menu
 
-${TOPDIR}/bin/depmaker: $(TOPDIR)/tools/adk/depmaker.c
-	$(CC_FOR_BUILD) -g -o $(TOPDIR)/bin/depmaker $(TOPDIR)/tools/adk/depmaker.c
+$(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/depmaker: $(TOPDIR)/tools/adk/depmaker.c
+	$(CC_FOR_BUILD) -g -o $@ $(TOPDIR)/tools/adk/depmaker.c
 
-dep: $(TOPDIR)/bin/depmaker
+dep: $(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/depmaker
 	@echo "Generating dependencies ..."
-	@$(TOPDIR)/bin/depmaker > ${TOPDIR}/package/Depends.mk
+	@$(TOPDIR)/host_$(GNU_HOST_NAME)/usr/bin/depmaker > ${TOPDIR}/package/Depends.mk
 
 .PHONY: menu dep
 
diff --git a/mk/host.mk b/mk/host.mk
index 3fcca0664..aa88bab44 100644
--- a/mk/host.mk
+++ b/mk/host.mk
@@ -37,7 +37,7 @@ _HOST_PATCH_COOKIE=	${WRKDIST}/.prepared
 _HOST_CONFIGURE_COOKIE=	${WRKDIR}/.host_configure_done
 _HOST_BUILD_COOKIE=	${WRKDIR}/.host_build_done
 _HOST_FAKE_COOKIE=	${HOST_WRKINST}/.host_fake_done
-_HOST_COOKIE=		${STAGING_PKG_DIR}/${PKG_NAME}
${PKG_VERSION}-${PKG_RELEASE}-host
+_HOST_COOKIE=		${STAGING_PKG_DIR}/stamps/${PKG_NAME}
${PKG_VERSION}-${PKG_RELEASE}-host
 
 hostextract: ${_HOST_EXTRACT_COOKIE}
 hostpatch: ${_HOST_PATCH_COOKIE}
diff --git a/mk/image.mk b/mk/image.mk
index 9b60c2400..571752eaf 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -136,15 +136,15 @@ endif
 ${FW_DIR}/${ROOTFSTARBALL}: ${TARGET_DIR} kernel-package
 	cd ${TARGET_DIR}; find . | sed -n '/^\.\//s///p' | \
 		sed "s#\(.*\)#:0:0::::::\1#" | sort | \
-		${BIN_DIR}/cpio -o -Hustar -P | gzip -n9 >$@
+		${STAGING_HOST_DIR}/usr/bin/cpio -o -Hustar -P | gzip -n9 >$@
 
 ${FW_DIR}/${ROOTFSUSERTARBALL}: ${TARGET_DIR}
 	cd ${TARGET_DIR}; find . | grep -v ./boot/ | sed -n '/^\.\//s///p' | \
 		sed "s#\(.*\)#:0:0::::::\1#" | sort | \
-		${BIN_DIR}/cpio -o -Hustar -P | gzip -n9 >$@
+		${STAGING_HOST_DIR}/usr/bin/cpio -o -Hustar -P | gzip -n9 >$@
 
 ${FW_DIR}/${INITRAMFS}_list: ${TARGET_DIR}
-	bash ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \
+	$(BASH) ${LINUX_DIR}/scripts/gen_initramfs_list.sh -u squash -g squash \
 		${TARGET_DIR}/ >$@
 	( \
 		echo "nod /dev/console 0644 0 0 c 5 1"; \
@@ -162,12 +162,12 @@ ${FW_DIR}/${INITRAMFS}: ${FW_DIR}/${INITRAMFS}_list
 		${ADK_COMPRESSION_TOOL} -c >$@
 
 ${BUILD_DIR}/root.squashfs: ${TARGET_DIR}
-	${STAGING_HOST_DIR}/bin/mksquashfs ${TARGET_DIR} \
+	${STAGING_HOST_DIR}/usr/bin/mksquashfs ${TARGET_DIR} \
 		${BUILD_DIR}/root.squashfs -comp xz \
 		-nopad -noappend -root-owned $(MAKE_TRACE)
 
 ${FW_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR}
-	${STAGING_HOST_DIR}/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -q -r ${TARGET_DIR} \
+	${STAGING_HOST_DIR}/usr/bin/mkfs.jffs2 $(ADK_JFFS2_OPTS) -q -r ${TARGET_DIR} \
 		--pad=$(ADK_TARGET_MTD_SIZE) -o ${FW_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE)
 
 createinitramfs: ${FW_DIR}/${INITRAMFS}_list
@@ -242,7 +242,7 @@ ${FW_DIR}/${ROOTFSISO}: ${TARGET_DIR} kernel-package
 		${TARGET_DIR}/boot/syslinux
 	echo 'DEFAULT /boot/kernel root=/dev/sr0 init=/init' > \
 		${TARGET_DIR}/boot/syslinux/isolinux.cfg
-	${BIN_DIR}/mkisofs -R -uid 0 -gid 0 -o $@ \
+	${STAGING_HOST_DIR}/usr/bin/mkisofs -R -uid 0 -gid 0 -o $@ \
 		-b boot/syslinux/isolinux.bin \
 		-c boot/syslinux/boot.cat -no-emul-boot \
 		-boot-load-size 4 -boot-info-table ${TARGET_DIR}