Merge branch 'master' of git+ssh://openadk.org/git/openadk

94 files changed, 590012 insertions, 323 deletions

diff --git a/BUGS b/BUGS
index 528b590cf..70759ad05 100644
--- a/BUGS
+++ b/BUGS
@@ -1,3 +1,5 @@
-- arm: thumb mode with glibc does not boot
-- sparc64: ide driver not working, only virtio (but unstable)
-- microblaze big endian: network card emulation fails
+- qemu-sparc: startup kernel with gcc 4.8.2 broken
+- qemu-sh4: usb keyboard is broken
+- qemu-arm: thumb mode with glibc does not boot
+- qemu-sparc64: ide driver not working, only virtio (but unstable)
+- qemu-microblaze: network card emulation fails, little endian works
diff --git a/Config.in b/Config.in
index 7cee82338..855d79095 100644
--- a/Config.in
+++ b/Config.in
@@ -121,6 +121,10 @@ config ADK_KERNEL_VERSION_3_11_10
 	prompt "3.11.10"
 	boolean
 
+config ADK_KERNEL_VERSION_3_10_30
+	prompt "3.10.30"
+	boolean
+
 config ADK_KERNEL_VERSION_3_4_82
 	prompt "3.4.82"
 	boolean
@@ -132,6 +136,7 @@ config ADK_KERNEL_VERSION
 	default "3.13.5" if ADK_KERNEL_VERSION_3_13_5
 	default "3.12.13" if ADK_KERNEL_VERSION_3_12_13
 	default "3.11.10" if ADK_KERNEL_VERSION_3_11_10
+	default "3.10.30" if ADK_KERNEL_VERSION_3_10_30
 	default "3.4.82" if ADK_KERNEL_VERSION_3_4_82
 	help
 
diff --git a/LICENCE b/LICENCE
index 89ce093f4..cc23dbf16 100644
--- a/LICENCE
+++ b/LICENCE
@@ -1,4 +1,4 @@
-OpenADK is Copyright © 2008-2010 Waldemar Brodkorb <wbx@openadk.org>
+OpenADK is Copyright © 2008-2014 Waldemar Brodkorb <wbx@openadk.org>
 All rights reserved.
 
 This licence file covers all of the OpenADK meta distribution
@@ -20,11 +20,12 @@ contains tools that are possibly covered by non-GPL-compatible,
 but OSD/DFSG-compliant, licences. 
 
 OpenADK is based upon several other projects which are listed
-below, in no particular order. If you think you should be li-
-sted here but I have forgotten you, please forgive and drop
+below, in no particular order. If you think you should be listed 
+here but I have forgotten you, please forgive and drop
 me an email.
 
 • The FreeWRT Project
 • The OpenWrt Project
-• uClibc Buildroot
+• The Buildroot Project
+• The Aboriginal Linux Project
 • The MirOS Project and contributors
diff --git a/README b/README
index 3e280c165..687950abd 100644
--- a/README
+++ b/README
@@ -10,6 +10,7 @@ Before you can start you need to install some tools:
 - GNU make
 - GNU awk
 - GNU sed
+- findutils (find, xargs)
 - tar
 - patch
 - gzip
@@ -18,7 +19,6 @@ Before you can start you need to install some tools:
 - ncurses5 headers
 - zlib headers
 - perl
-- xargs
 
 There is a check for the required versions of these tools in advance, though.
 (to re-issue the checks, use "make prereq").
diff --git a/config/Makefile b/config/Makefile
index afe153c8a..9dc08d3ac 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
 endif
 
 CP=cp -fpR
-CFLAGS_FOR_BUILD+=-DKBUILD_NO_NLS
+CFLAGS_FOR_BUILD:=-DKBUILD_NO_NLS -O2 -w
 
 all: ncurses conf mconf
 
@@ -39,36 +39,25 @@ endif
 endif
 endif
 
-GTKLIBS = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`
-GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0`
-
 CONF_SRC  =conf.c
 MCONF_SRC =mconf.c $(wildcard lxdialog/*.c)
-GCONF_SRC =gconf.c
 SHARED_SRC=zconf.tab.c
 SHARED_DEPS:=lkc.h lkc_proto.h lkc_defs.h expr.h zconf.tab.h
 CONF_OBJS =$(patsubst %.c,%.o, $(CONF_SRC))
 MCONF_OBJS=$(patsubst %.c,%.o, $(MCONF_SRC))
-GCONF_OBJS=$(patsubst %.c,%.o, $(GCONF_SRC))
 SHARED_OBJS=$(patsubst %.c,%.o, $(SHARED_SRC))
 
 conf: $(CONF_OBJS) $(SHARED_OBJS)
-	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NATIVE_LDFLAGS) $^ -o $@
+	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $^ -o $@
 
 mconf: $(MCONF_OBJS) $(SHARED_OBJS)
-	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NATIVE_LDFLAGS) $^ -o $@ $(LIBS)
-
-gconf: $(GCONF_OBJS) $(SHARED_OBJS)
-	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NATIVE_LDFLAGS) $^ -o $@ $(GTKLIBS)
+	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $^ -o $@ $(LIBS)
 
 $(CONF_OBJS): %.o : %.c $(SHARED_DEPS)
 	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@
 
 $(MCONF_OBJS): %.o : %.c $(SHARED_DEPS)
-	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(HOSTNCURSES) -I. -c $< -o $@
-
-$(GCONF_OBJS): %.o : %.c $(SHARED_DEPS)
-	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(GTKCFLAGS) -DLKC_DIRECT_LINK -I. -c $< -o $@
+	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@
 
 glob.o: glob.c $(SHARED_DEPS)
 	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c glob.c -o $@
@@ -94,15 +83,15 @@ lex.%.c: %.l
 	flex -P$(notdir $*) -o$@ $<
 
 lex.zconf.o: lex.zconf.c $(SHARED_DEPS)
-	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@
+	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@
 
 zconf.tab.o: zconf.tab.c zconf.hash.c lex.zconf.c confdata.c expr.c symbol.c menu.c $(SHARED_DEPS)
-	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@
+	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@
 
 else
 
 lex.zconf.o: lex.zconf.c $(SHARED_DEPS)
-	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@
+	@$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -I. -c $< -o $@
 
 lex.zconf.c: lex.zconf.c_shipped
 	@$(CP) lex.zconf.c_shipped lex.zconf.c
diff --git a/mk/build.mk b/mk/build.mk
index 42d75bbcd..f4e2ae6e4 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -143,7 +143,7 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M
 .PHONY: all world clean cleantarget cleandir cleantoolchain distclean image_clean
 
 world:
-	mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
+	mkdir -p $(DL_DIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
 		$(PACKAGE_DIR) $(TOOLS_BUILD_DIR) $(STAGING_HOST_DIR)/usr/bin \
 		$(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)/stamps
 	${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
@@ -165,23 +165,23 @@ ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
 	    ${BASH} ${TOPDIR}/scripts/ipkg-make-index.sh . >Packages
 endif
 
-${STAGING_DIR} ${STAGING_DIR}/etc ${STAGING_HOST_DIR}:
-	mkdir -p ${STAGING_DIR}/{bin,etc,lib,usr/bin,usr/include,usr/lib/pkgconfig} \
+${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}:
+	mkdir -p ${STAGING_TARGET_DIR}/{bin,etc,lib,usr/bin,usr/include,usr/lib/pkgconfig} \
 		${STAGING_HOST_DIR}/{bin,lib,usr/bin,usr/lib,usr/include}
 
-${STAGING_DIR}/etc/ipkg.conf: ${STAGING_DIR}/etc
+${STAGING_TARGET_DIR}/etc/ipkg.conf: ${STAGING_TARGET_DIR}/etc
 ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
-	echo "dest root /" >${STAGING_DIR}/etc/ipkg.conf
-	echo "option offline_root ${TARGET_DIR}" >>$(STAGING_DIR)/etc/ipkg.conf
+	echo "dest root /" >${STAGING_TARGET_DIR}/etc/ipkg.conf
+	echo "option offline_root ${TARGET_DIR}" >>$(STAGING_TARGET_DIR)/etc/ipkg.conf
 endif
 
-package/%: ${STAGING_DIR}/etc/ipkg.conf ${TOPDIR}/package/Depends.mk
+package/%: ${STAGING_TARGET_DIR}/etc/ipkg.conf ${TOPDIR}/package/Depends.mk
 	$(MAKE) -C package $(patsubst package/%,%,$@)
 
 target/%:
 	$(MAKE) -C target $(patsubst target/%,%,$@)
 
-toolchain/%: ${STAGING_DIR}
+toolchain/%: ${STAGING_TARGET_DIR}
 	$(MAKE) -C toolchain $(patsubst toolchain/%,%,$@)
 
 tools/%:
@@ -247,7 +247,7 @@ clean:
 	$(MAKE) -C $(CONFIG) clean
 	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 \
-			rm ${STAGING_DIR}/$$file 2>/dev/null;\
+			rm ${STAGING_TARGET_DIR}/$$file 2>/dev/null;\
 		done < ${STAGING_PKG_DIR}/$$f ; \
 		rm ${STAGING_PKG_DIR}/$$f ; \
 	done
@@ -281,7 +281,7 @@ cleantarget:
 	@$(TRACE) cleantarget
 	@$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE)
 	rm -rf $(BUILD_DIR) $(FW_DIR) $(TARGET_DIR)
-	rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_HOST_DIR) $(STAGING_DIR) $(STAGING_PKG_DIR)
+	rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_HOST_DIR) $(STAGING_TARGET_DIR) $(STAGING_PKG_DIR)
 	rm -f .tmpconfig.h all.config .defconfig
 
 distclean:
diff --git a/mk/fetch.mk b/mk/fetch.mk
index a2590d467..6382571b3 100644
--- a/mk/fetch.mk
+++ b/mk/fetch.mk
@@ -2,9 +2,9 @@
 # material, please see the LICENCE file in the top-level directory.
 
 ifneq ($(strip ${DIST_SUBDIR}),)
-FULLDISTDIR?=		${DISTDIR}/${DIST_SUBDIR}
+FULLDISTDIR?=		${DL_DIR}/${DIST_SUBDIR}
 else
-FULLDISTDIR?=		${DISTDIR}
+FULLDISTDIR?=		${DL_DIR}
 endif
 
 FULLDISTFILES=		$(patsubst %,${FULLDISTDIR}/%,${DISTFILES})
diff --git a/mk/image.mk b/mk/image.mk
index e97839760..6721549b5 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -47,7 +47,7 @@ image-prepare-post:
 			mkfontdir ${TARGET_DIR}/usr/share/fonts/X11/$${i}; \
 		done; \
 	fi
-	sed -i '/^root:/s!:/bin/sh$$!:${ROOTSH}!' ${TARGET_DIR}/etc/passwd
+	$(SED) '/^root:/s!:/bin/sh$$!:${ROOTSH}!' ${TARGET_DIR}/etc/passwd
 	-rm -f ${TARGET_DIR}/bin/sh
 	ln -sf ${BINSH} ${TARGET_DIR}/bin/sh
 ifeq ($(ADK_LINUX_X86_64),y)
@@ -171,7 +171,7 @@ ${FW_DIR}/${ROOTFSJFFS2}: ${TARGET_DIR}
 		--pad=$(ADK_TARGET_MTD_SIZE) -o ${FW_DIR}/${ROOTFSJFFS2} $(MAKE_TRACE)
 
 createinitramfs: ${STAGING_TARGET_DIR}/${INITRAMFS}_list
-	${SED} 's/.*CONFIG_(BLK_DEV_INITRD|INITRAMFS_SOURCE|INITRAMFS_COMPRESSION).*//' \
+	${SED} 's/.*CONFIG_\(RD_\|XZ_\|BLK_DEV_INITRD\|INITRAMFS_\).*//' \
 		${LINUX_DIR}/.config
 	( \
 		echo "CONFIG_BLK_DEV_INITRD=y"; \
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 09362fbae..ef9fee277 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -22,6 +22,12 @@ KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		59f352d3f4e2cdf6755f79e09fa09176
 endif
+ifeq ($(ADK_KERNEL_VERSION_3_10_30),y)
+KERNEL_VERSION:=	3.10.30
+KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
+KERNEL_RELEASE:=	1
+KERNEL_MD5SUM:=		f48ca7dd9f2eb14a2903cb6a4fbe07ed
+endif
 ifeq ($(ADK_KERNEL_VERSION_3_4_82),y)
 KERNEL_VERSION:=	3.4.82
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
diff --git a/mk/package.mk b/mk/package.mk
index 8439d88eb..a70de9377 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -221,10 +221,10 @@ ifneq (${ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS},y)
 endif
 endif
 	@mkdir -p $${PACKAGE_DIR} '$${STAGING_PKG_DIR}/stamps' \
-	    '$${STAGING_DIR}/scripts'
+	    '$${STAGING_TARGET_DIR}/scripts'
 ifeq (,$(filter noremove,$(7)))
 	@if test -s '$${STAGING_PKG_DIR}/$(1)'; then \
-		cd '$${STAGING_DIR}'; \
+		cd '$${STAGING_TARGET_DIR}'; \
 		while read fn; do \
 			rm -f "$$$$fn"; \
 		done <'$${STAGING_PKG_DIR}/$(1)'; \
@@ -244,8 +244,8 @@ endif
 	    find usr ! -type d 2>/dev/null | \
 	    grep -E -v -e '^usr/lib/pkgconfig' -e '^usr/share' -e '^usr/doc' -e '^usr/src' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config' | \
 	    tee '$${STAGING_PKG_DIR}/$(1)' | \
-	    $(STAGING_HOST_DIR)/usr/bin/cpio -padlmu '$${STAGING_DIR}'
-	@cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \
+	    $(STAGING_HOST_DIR)/usr/bin/cpio -padlmu '$${STAGING_TARGET_DIR}'
+	@cd '$${STAGING_TARGET_DIR}'; grep 'usr/lib/.*\.la$$$$' \
 	    '$${STAGING_PKG_DIR}/$(1)' | while read fn; do \
 		chmod u+w $$$$fn; \
 		$(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_TARGET_DIR)/usr/lib,g" $$$$fn; \
@@ -280,7 +280,7 @@ clean-targets: clean-dev-$(1)
 clean-dev-$(1):
 ifeq (,$(filter noremove,$(7)))
 	@if test -s '$${STAGING_PKG_DIR}/$(1)'; then \
-		cd '$${STAGING_DIR}'; \
+		cd '$${STAGING_TARGET_DIR}'; \
 		while read fn; do \
 			rm -f "$$$$fn"; \
 		done <'$${STAGING_PKG_DIR}/$(1)'; \
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 66feea33c..941970cbc 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -38,7 +38,7 @@ ifneq ($(filter manual,${CONFIG_STYLE}),)
 	env ${CONFIGURE_EN