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

95 files changed, 5342 insertions, 10089 deletions

diff --git a/Config.in b/Config.in
index d2bedf377..dcfbd9f03 100644
--- a/Config.in
+++ b/Config.in
@@ -177,6 +177,7 @@ config ADK_COMPRESSION_TOOL
 	default "xz" if ADK_TARGET_INITRAMFS_COMPRESSION_XZ
 	default "lzma -9" if ADK_TARGET_INITRAMFS_COMPRESSION_LZMA
 	default "lzop" if ADK_TARGET_INITRAMFS_COMPRESSION_LZO
+	default "gzip -n9"
 	help
 
 source "target/linux/Config.in"
diff --git a/mk/build.mk b/mk/build.mk
index 98a8d0c03..98d3fe561 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -32,6 +32,7 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_PACEMAKER_MGMTD=n \
 			ADK_PACKAGE_PACEMAKER_PYTHON_GUI=n \
 			ADK_PACKAGE_OPENJDK=n \
+			ADK_PACKAGE_OPENJDK7=n \
 			ADK_PACKAGE_CLASSPATH=n \
 			ADK_PACKAGE_GPSD=n \
 			ADK_PACKAGE_GPSD_CLIENTS=n \
@@ -594,7 +595,7 @@ bulk:
 	done
 
 bulkall:
-	for libc in uclibc eglibc glibc;do \
+	for libc in uclibc eglibc glibc musl;do \
 	  while read arch; do \
 	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu); \
 	      for system in $$systems;do \
@@ -612,7 +613,7 @@ bulkall:
 	done
 
 bulkallmod:
-	for libc in uclibc eglibc glibc;do \
+	for libc in uclibc eglibc glibc musl;do \
 	  while read arch; do \
 	      systems=$$(./scripts/getsystems $$arch| grep -v toolchain|grep -v qemu); \
 	      for system in $$systems;do \
diff --git a/mk/image.mk b/mk/image.mk
index 57664464e..095b69c1d 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -143,7 +143,7 @@ ${BIN_DIR}/${INITRAMFS}_list: ${TARGET_DIR}
 	) >>$@
 
 ${BIN_DIR}/${INITRAMFS}: ${BIN_DIR}/${INITRAMFS}_list
-	bash ${LINUX_DIR}/usr/gen_init_cpio ${BIN_DIR}/${INITRAMFS}_list | \
+	${LINUX_DIR}/usr/gen_init_cpio ${BIN_DIR}/${INITRAMFS}_list | \
 		${ADK_COMPRESSION_TOOL} -c >$@
 
 ${BUILD_DIR}/root.squashfs: ${TARGET_DIR}
diff --git a/mk/modules.mk b/mk/modules.mk
index ca1bf178c..5722d9800 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1204,7 +1204,7 @@ $(eval $(call KMOD_template,SND_BCM2835,snd-bcm2835,\
 #,65))
 
 $(eval $(call KMOD_template,USB_VIDEO_CLASS,usb-video-class,\
-	$(MODULES_DIR)/kernel/drivers/media/video/uvc/uvcvideo \
+	$(MODULES_DIR)/kernel/drivers/media/usb/uvc/uvcvideo \
 ,70))
 
 $(eval $(call KMOD_template,USB_GSPCA,usb-gspca,\
diff --git a/mk/vars.mk b/mk/vars.mk
index e22a46beb..e84e8b86b 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -16,7 +16,7 @@ BUILD_DIR:=		${BASE_DIR}/build_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIB
 BUILD_DIR_PFX:=		$(BASE_DIR)/build_*
 STAGING_PKG_DIR:=	${BASE_DIR}/pkg_${ADK_TARGET_SYSTEM}_${CPU_ARCH}_${ADK_TARGET_LIBC}
 STAGING_PKG_DIR_PFX:=	${BASE_DIR}/pkg_*
-STAGING_HOST_DIR:=	${BASE_DIR}/host_${CPU_ARCH}_${ADK_TARGET_LIBC}
+STAGING_HOST_DIR:=	${BASE_DIR}/host_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC}
 STAGING_HOST_DIR_PFX:=	${BASE_DIR}/host_*
 STAGING_JAVA_HOST_DIR:=	${BASE_DIR}/jhost
 # use headers and foo-config from system
@@ -24,15 +24,15 @@ ifeq ($(ADK_NATIVE),y)
 STAGING_TARGET_DIR:=
 SCRIPT_TARGET_DIR:=	/usr/bin
 else
-STAGING_TARGET_DIR:=	${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}
+STAGING_TARGET_DIR:=	${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC}
 SCRIPT_TARGET_DIR:=	${STAGING_TARGET_DIR}/scripts
 endif
-STAGING_DIR:=		${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_LIBC}
+STAGING_DIR:=		${BASE_DIR}/target_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC}
 STAGING_TARGET_DIR_PFX:=${BASE_DIR}/target_*
 # relation from STAGING_HOST_DIR to STAGING_TARGET_DIR (for gcc to find
 # its sysroot while staying relocatable)
-STAGING_HOST2TARGET:=	../target_${CPU_ARCH}_${ADK_TARGET_LIBC}
-TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_LIBC}
+STAGING_HOST2TARGET:=	../target_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC}
+TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC}
 TOOLCHAIN_BUILD_DIR_PFX=$(BASE_DIR)/toolchain_build_*
 TOOLS_BUILD_DIR=	$(BASE_DIR)/tools_build
 JTOOLS_BUILD_DIR=	$(BASE_DIR)/jtools_build
@@ -99,7 +99,7 @@ TARGET_LD:=		${TARGET_COMPILER_PREFIX}ld
 
 TARGET_CPPFLAGS:=	
 TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(ADK_TARGET_ABI_CFLAGS)
-TARGET_CFLAGS_LIBC:=	$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(TARGET_OPTIMIZATION) -fPIC
+TARGET_CFLAGS_LIBC:=	$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(TARGET_OPTIMIZATION)
 TARGET_CXXFLAGS:=	$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident
 TARGET_LDFLAGS:=	-L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \
 			-Wl,-O2 -Wl,-rpath -Wl,/usr/lib \
@@ -167,7 +167,8 @@ TARGET_CONFIGURE_OPTS=	PATH='${TARGET_PATH}' \
 			CC='$(TARGET_CC)' \
 			GCC='$(TARGET_CC)' \
 			CXX='$(TARGET_CXX)' \
-			CROSS='$(TARGET_CROSS)'
+			CROSS='$(TARGET_CROSS)' \
+			ARCH=${ARCH}
 
 HOST_CONFIGURE_OPTS=	CC_FOR_BUILD='${CC_FOR_BUILD}' \
 			CPPFLAGS_FOR_BUILD='${CPPFLAGS_FOR_BUILD}' \
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index d62773bd3..008c4eb4f 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		MesaLib
 PKG_VERSION:=		8.0.5
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		cda5d101f43b8784fa60bdeaca4056f2
 PKG_DESCR:=		MESA library
 PKG_SECTION:=		libs
diff --git a/package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c b/package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c
new file mode 100644
index 000000000..f1d92ca8c
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c
@@ -0,0 +1,26 @@
+--- Mesa-8.0.5.orig/src/gallium/auxiliary/util/u_debug_symbol.c	2012-10-24 21:03:59.000000000 +0200
++++ Mesa-8.0.5/src/gallium/auxiliary/util/u_debug_symbol.c	2013-09-25 17:45:12.000000000 +0200
+@@ -151,23 +151,6 @@ debug_symbol_name_dbghelp(const void *ad
+ }
+ #endif
+ 
+-#ifdef __GLIBC__
+-#include <execinfo.h>
+-
+-/* This can only provide dynamic symbols, or binary offsets into a file.
+- *
+- * To fix this, post-process the output with tools/addr2line.sh
+- */
+-static INLINE void
+-debug_symbol_name_glibc(const void *addr, char* buf, unsigned size)
+-{
+-   char** syms = backtrace_symbols((void**)&addr, 1);
+-   strncpy(buf, syms[0], size);
+-   buf[size - 1] = 0;
+-   free(syms);
+-}
+-#endif
+-
+ void
+ debug_symbol_name(const void *addr, char* buf, unsigned size)
+ {
diff --git a/package/MesaLib/patches/patch-src_glsl_strtod_c b/package/MesaLib/patches/patch-src_glsl_strtod_c
new file mode 100644
index 000000000..ce6514dbb
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_glsl_strtod_c
@@ -0,0 +1,32 @@
+--- Mesa-8.0.5.orig/src/glsl/strtod.c	2012-10-24 21:03:59.000000000 +0200
++++ Mesa-8.0.5/src/glsl/strtod.c	2013-09-25 17:34:06.000000000 +0200
+@@ -25,14 +25,6 @@
+ 
+ 
+ #include <stdlib.h>
+-
+-#ifdef _GNU_SOURCE
+-#include <locale.h>
+-#ifdef __APPLE__
+-#include <xlocale.h>
+-#endif
+-#endif
+-
+ #include "strtod.h"
+ 
+ 
+@@ -44,14 +36,5 @@
+ double
+ glsl_strtod(const char *s, char **end)
+ {
+-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
+-   !defined(__HAIKU__)
+-   static locale_t loc = NULL;
+-   if (!loc) {
+-      loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+-   }
+-   return strtod_l(s, end, loc);
+-#else
+    return strtod(s, end);
+-#endif
+ }
diff --git a/package/MesaLib/patches/patch-src_mesa_main_imports_c b/package/MesaLib/patches/patch-src_mesa_main_imports_c
new file mode 100644
index 000000000..10cbca86a
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_mesa_main_imports_c
@@ -0,0 +1,33 @@
+--- Mesa-8.0.5.orig/src/mesa/main/imports.c	2012-10-24 21:03:59.000000000 +0200
++++ Mesa-8.0.5/src/mesa/main/imports.c	2013-09-25 17:41:11.000000000 +0200
+@@ -49,14 +49,6 @@
+ #include "mtypes.h"
+ #include "version.h"
+ 
+-#ifdef _GNU_SOURCE
+-#include <locale.h>
+-#ifdef __APPLE__
+-#include <xlocale.h>
+-#endif
+-#endif
+-
+-
+ #define MAXSTRING 4000  /* for vsnprintf() */
+ 
+ #ifdef WIN32
+@@ -766,14 +758,7 @@ _mesa_strdup( const char *s )
+ float
+ _mesa_strtof( const char *s, char **end )
+ {
+-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
+-   !defined(ANDROID) && !defined(__HAIKU__)
+-   static locale_t loc = NULL;
+-   if (!loc) {
+-      loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+-   }
+-   return strtof_l(s, end, loc);
+-#elif defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
++#if defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
+    return strtof(s, end);
+ #else
+    return (float)strtod(s, end);
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 8f9f1b3d6..0d6881c48 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		b65e9a04181bd7c9db7667a4566f8dc3
 PKG_DESCR:=		ALSA mixer utility
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		alsa-lib libpthread
+PKG_DEPENDS:=		alsa-lib libpthread libgcc
 PKG_BUILDDEP:=		alsa-lib
 PKG_URL:=		http://www.alsa-project.org/
 PKG_SITES:=		ftp://ftp.alsa-project.org/pub/utils/
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 605922737..8ff743270 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -65,6 +65,9 @@ endif
 ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILE),y)
 	$(SED) 's#ttyS#ttyAMA#g' $(IDIR_BASE_FILES)/etc/inittab
 endif
+ifeq ($(ADK_TARGET_SYSTEM_ARANYM),y)
+	$(SED) 's#ttyS#nfcon0#g' $(IDIR_BASE_FILES)/etc/inittab
+endif
 	$(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab
 	test -z $(ADK_RUNTIME_HOSTNAME) || \
 	    echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \
diff --git a/package/base-files/src/etc/init.d/umount b/package/base-files/src/etc/init.d/umount
index bcd545999..49bd5a020 100755
--- a/package/base-files/src/etc/init.d/umount
+++ b/package/base-files/src/etc/init.d/umount
@@ -5,7 +5,7 @@ case $1 in
 autostop)
 	cd /
 	sync
-	for i in $(