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

74 files changed, 67641 insertions, 57137 deletions

diff --git a/Makefile b/Makefile
index fa7faa6bb..8402845b5 100644
--- a/Makefile
+++ b/Makefile
@@ -140,6 +140,9 @@ package_index: .prereq_done
 bulk: .prereq_done
 	@${GMAKE_INV} bulk
 
+bulktoolchain: .prereq_done
+	@${GMAKE_INV} bulktoolchain
+
 bulkall: .prereq_done
 	@${GMAKE_INV} bulkall
 
diff --git a/TODO b/TODO
index bc92713e7..8ab4f4aec 100644
--- a/TODO
+++ b/TODO
@@ -1,12 +1,7 @@
-- check ncurses headers in latest cygwin
 - macos x build
 - test on OpenSuSE
-- test on CentOS
 - test on Fedora Core
 - help text for config/ needs adoption
-- fix glibc build for MIPS targets
-- implement update for MTD devices (ag241)
 - fix watchdog for alix1c (mfgpt timers problem)
-- package drbd
 - implement rpm package backend 
 - implement dpkg package backend 
diff --git a/mk/build.mk b/mk/build.mk
index a8ba19c72..53f0ff5bf 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -18,6 +18,8 @@ DEFCONFIG=		ADK_DEVELSYSTEM=n \
 			ADK_PACKAGE_GRUB=n \
 			ADK_PACKAGE_AUFS2_UTIL=n \
 			ADK_PACKAGE_BASE_FILES=y \
+			ADK_PACKAGE_GCC=n \
+			ADK_PACKAGE_MGETTY=n \
 			ADK_COMPILE_HEIMDAL=n \
 			ADK_PACKAGE_HEIMDAL_PKINIT=n \
 			ADK_PACKAGE_HEIMDAL_SERVER=n \
@@ -425,6 +427,18 @@ bulk:
 	    ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc-$$fs.log; \
 	done <${TOPDIR}/target/bulk.lst
 
+bulktoolchain:
+	while read target libc; do \
+		mkdir -p $(TOPDIR)/bin/$${target}_$$libc; \
+	    ( \
+		echo === building $$target $$libc on $$(date); \
+		$(GMAKE) prereq && \
+			$(GMAKE) TARGET=$$target LIBC=$$libc defconfig; \
+			$(GMAKE) VERBOSE=1 all; \
+		rm .config; \
+	    ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc.log; \
+	done <${TOPDIR}/target/bulktool.lst
+
 bulkall:
 	while read target libc fs; do \
 		mkdir -p $(TOPDIR)/bin/$${target}_$$libc; \
diff --git a/mk/modules.mk b/mk/modules.mk
index 4747a4e16..ab33f6863 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -778,7 +778,6 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\
 ,11))
 
 $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\
-    $(MODULES_DIR)/kernel/lib/zlib_inflate/zlib_inflate \
     $(MODULES_DIR)/kernel/lib/zlib_deflate/zlib_deflate \
     $(MODULES_DIR)/kernel/crypto/deflate \
 ,10))
diff --git a/mk/package.mk b/mk/package.mk
index f397974d8..6c58d4d4e 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -216,7 +216,7 @@ endif
 	    	-exec echo 'WARNING: $${IPKG_$(1)} installs files in /lib -' \
 		' fix this!' >&2 \; -quit 2>/dev/null; fi; \
 	    find usr ! -type d 2>/dev/null | \
-	    grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' | \
+	    grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' | \
 	    tee '$${STAGING_PARENT}/pkg/$(1)' | \
 	    cpio -padlmu '$${STAGING_DIR}'
 	@cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index d78cc5876..466a4c398 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -164,7 +164,7 @@ endif
 	    	-exec echo 'WARNING: ${PKG_NAME} installs files in /lib -' \
 		' fix this!' >&2 \; -quit 2>/dev/null; fi;\
 	    find usr ! -type d 2>/dev/null | \
-	    grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' | \
+	    grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' | \
 	    tee '${STAGING_PARENT}/pkg/${PKG_NAME}' | \
 	    cpio -padlmu '${STAGING_DIR}'
 	@cd '${STAGING_DIR}'; grep 'usr/lib/.*\.la$$' \
diff --git a/package/Config.in b/package/Config.in
index 29c32ede3..e5ffd2e07 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -235,6 +235,10 @@ source "package/ncurses/Config.in.lib"
 source "package/neon/Config.in"
 source "package/libnet/Config.in"
 source "package/libnet/Config.in.lib"
+source "package/libnetfilter_conntrack/Config.in"
+source "package/libnetfilter_conntrack/Config.in.lib"
+source "package/libnetfilter_log/Config.in"
+source "package/libnetfilter_log/Config.in.lib"
 source "package/libnetfilter_queue/Config.in"
 source "package/libnetfilter_queue/Config.in.lib"
 source "package/libnfsidmap/Config.in"
@@ -323,7 +327,6 @@ source "package/libxslt/Config.in"
 source "package/libxslt/Config.in.lib"
 source "package/lua/Config.in.lib"
 source "package/uclibc++/Config.in.manual"
-source "package/ustl/Config.in"
 source "package/zlib/Config.in"
 endmenu
 
diff --git a/package/base-files/src/sbin/adkupdate b/package/base-files/src/sbin/adkupdate
index 8a97495ed..1af188b41 100755
--- a/package/base-files/src/sbin/adkupdate
+++ b/package/base-files/src/sbin/adkupdate
@@ -6,13 +6,18 @@ if [ $who -ne 0 ]; then
   exit 1
 fi
 
+system=$(awk '/system type/ { print $5 }' /proc/cpuinfo 2>/dev/null)
+
 if [ -x /sbin/mtd ];then
-	updatecmd="mtd -r write - linux"
+	if [ "$system" == "AR7" ];then
+		updatecmd="dd bs=16 skip=3 | mtd -r write - linux"
+	else
+		updatecmd="mtd -r write - linux"
+	fi
 else
 	updatecmd="gunzip -c | tar -xf -"
 fi
 
-system=$(awk '/system type/ { print $5 }' /proc/cpuinfo 2>/dev/null)
 
 check_exit() {
 	if [ $? -ne 0 ];then
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index 1f8f003eb..0e81c8345 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -66,6 +66,7 @@ CONFIGURE_ARGS+=	--disable-apache \
 			--disable-multimeter \
 			--disable-mysql \
 			--disable-openvpn \
+			--disable-python \
 			--disable-postgresql \
 			--disable-powerdns \
 			--disable-network \
@@ -95,6 +96,7 @@ CONFIGURE_ARGS+=	--disable-apache \
 			--disable-write_http \
 			--with-fp-layout=nothing \
 			--without-java \
+			--without-python \
 			--without-libiptc \
 			--with-nan-emulation
 
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 4de63c4f7..b77895f5b 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -24,6 +24,7 @@ PKG_BUILDDEP+=		glibc
 endif
 
 PKG_HOST_DEPENDS:=	!freebsd
+PKG_TARGET_DEPENDS:=	!ag241
 
 include ${TOPDIR}/mk/package.mk
 
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index f82cc9f2c..915c165b2 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -4,15 +4,16 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gpsd
-PKG_VERSION:=		2.39
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		3db437196a6840c252fca99b6c19d4d0
+PKG_VERSION:=		2.92
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		50b60d9f6dd51e001f4dfbaeb825c988
 PKG_DESCR:=		An interface daemon for GPS receivers
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libpthread
 PKG_BUILDDEP+=		ncurses
 PKG_CXX:=		GPSD
 PKG_SITES:=		http://download.berlios.de/gpsd/
+PKG_URL:=		http://gpsd.berlios.de/
 
 PKG_DESCR_1:=		GPS client utilities
 
@@ -23,18 +24,21 @@ $(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEAS
 
 CONFIGURE_ENV+=		EGREP="grep -E" \
 			CPP="$(TARGET_CC) -E" \
+			PYTHON="none" \
 			ac_cv_func_strlcpy=no \
 			ac_cv_func_strlcat=no \
 			ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	--without-x \
 			--disable-dbus
 
+TCFLAGS+=		-fPIC
+
 ifeq ($(ADK_COMPILE_GPSD_WITH_UCLIBCXX),y)
 TCXXFLAGS+=		-fno-builtin -fno-rtti -nostdinc++ \
 			-I${STAGING_DIR}/usr/include/uClibc++
-TLDFLAGS+=		-luClibc++ -lc -lm -nodefaultlibs
+TLDFLAGS+=		-luClibc++ -lc -lm -pthread -nodefaultlibs
 else
-TLDFLAGS+=		-shared
+TLDFLAGS+=		-shared -pthread
 endif
 
 post-extract:
diff --git a/package/gpsd/patches/autotool.patch b/package/gpsd/patches/autotool.patch
deleted file mode 100644
index 1e64bc483..000000000
--- a/package/gpsd/patches/autotool.patch
+++ /dev/null
@@ -1,56056 +0,0 @@
-diff -Nur gpsd-2.39.orig/aclocal.m4 gpsd-2.39/aclocal.m4
---- gpsd-2.39.orig/aclocal.m4	2009-03-18 22:10:27.000000000 +0100
-+++ gpsd-2.39/aclocal.m4	2010-02-18 21:41:59.068861441 +0100
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -13,8 +13,8 @@
- 
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(AC_AUTOCONF_VERSION, [2.61],,
--[m4_warning([this file was generated for autoconf 2.61.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-+[m4_warning([this file was generated for autoconf 2.65.
- You have another version of autoconf.  It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -395,12 +395,12 @@
- # lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
- # ---------------------------------------------------
- m4_define([lt_decl_varnames_tagged],
--[_$0(m4_quote(m4_default([$1], [[, ]])),
--     m4_quote(m4_if([$2], [],
--		     m4_quote(lt_decl_tag_varnames),
--		  m4_quote(m4_shift($@)))),
--     m4_split(m4_normalize(m4_quote(_LT_TAGS))))])
--m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])
-+[m4_assert([$# <= 2])dnl
-+_$0(m4_quote(m4_default([$1], [[, ]])),
-+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-+m4_define([_lt_decl_varnames_tagged],
-+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
- 
- 
- # lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-@@ -960,10 +960,10 @@
-       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-     darwin1.*)
-       _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
--    darwin*) # darwin 5.x on 
-+    darwin*) # darwin 5.x on
-       # if running on 10.5 or later, the deployment target defaults
-       # to the OS version, if on x86, and 10.4, the deployment
--      # target defaults to 10.4. Don't you love it? 
-+      # target defaults to 10.4. Don't you love it?
-       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
- 	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
- 	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-@@ -1005,7 +1005,11 @@
-   _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-   _LT_TAGVAR(link_all_deplibs, $1)=yes
-   _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
--  if test "$GCC" = "yes"; then
-+  case $cc_basename in
-+     ifort*) _lt_dar_can_shared=yes ;;
-+     *) _lt_dar_can_shared=$GCC ;;
-+  esac
-+  if test "$_lt_dar_can_shared" = "yes"; then
-     output_verbose_link_cmd=echo
-     _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-     _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-@@ -1527,7 +1531,7 @@
-     lt_cv_sys_max_cmd_len=-1;
-     ;;
- 
--  cygwin* | mingw*)
-+  cygwin* | mingw* | cegcc*)
-     # On Win9x/ME, this test blows up -- it succeeds, but takes
-     # about 5 minutes as the teststring grows exponentially.
-     # Worse, since 9x/ME are not pre-emptively multitasking,
-@@ -1695,10 +1699,6 @@
- #  endif
- #endif
- 
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
--
- void fnord() { int i=42;}
- int main ()
- {
-@@ -1714,7 +1714,7 @@
-   else
-     puts (dlerror ());
- 
--    exit (status);
-+  return status;
- }]
- _LT_EOF
-   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-@@ -1753,7 +1753,7 @@
-     lt_cv_dlopen_self=yes
-     ;;
- 
--  mingw* | pw32*)
-+  mingw* | pw32* | cegcc*)
-     lt_cv_dlopen="LoadLibrary"
-     lt_cv_dlopen_libs=
-     ;;
-@@ -2050,6 +2050,7 @@
- [AC_REQUIRE([AC_CANONICAL_HOST])dnl
- m4_require([_LT_DECL_EGREP])dnl
- m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_OBJDUMP])dnl
- m4_require([_LT_DECL_SED])dnl
- AC_MSG_CHECKING([dynamic linker characteristics])
- m4_if([$1],
-@@ -2214,14 +2215,14 @@
-   # libtool to hard-code these into programs
-   ;;
- 
--cygwin* | mingw* | pw32*)
-+cygwin* | mingw* | pw32* | cegcc*)
-   version_type=windows
-   shrext_cmds=".dll"
-   need_version=no
-   need_lib_prefix=no
- 
-   case $GCC,$host_os in
--  yes,cygwin* | yes,mingw* | yes,pw32*)
-+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-     library_names_spec='$libname.dll.a'
-     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-     postinstall_cmds='base_file=`basename \${file}`~
-@@ -2244,7 +2245,7 @@
-       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-       sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-       ;;
--    mingw*)
-+    mingw* | cegcc*)
-       # MinGW DLLs use traditional 'lib' prefix
-       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-       sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-@@ -2459,7 +2460,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -2682,7 +2683,7 @@
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
--  library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
-   hardcode_into_libs=yes
-@@ -2706,7 +2707,7 @@
- if test "$GCC" = yes; then
-   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
-- 
-+
- if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-   sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
- fi
-@@ -2983,6 +2984,7 @@
- #  -- PORTME fill in with the dynamic library characteristics
- m4_defun([_LT_CHECK_MAGIC_METHOD],
- [m4_require([_LT_DECL_EGREP])
-+m4_require([_LT_DECL_OBJDUMP])
- AC_CACHE_CHECK([how to recognize dependent libraries],
- lt_cv_deplibs_check_method,
- [lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -3033,6 +3035,12 @@
-   fi
-   ;;
- 
-+cegcc)
-+  # use the weaker test based on 'objdump'. See mingw*.
-+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-+  lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  ;;
-+
- darwin* | rhapsody*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
-@@ -3091,7 +3099,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-@@ -3344,7 +3352,7 @@
- aix*)
-   symcode='[[BCDT]]'
-   ;;
--cygwin* | mingw* | pw32*)
-+cygwin* | mingw* | pw32* | cegcc*)
-   symcode='[[ABCDGISTW]]'
-   ;;
- hpux*)
-@@ -3590,7 +3598,7 @@
-     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-       # PIC is the default for these OSes.
-       ;;
--    mingw* | cygwin* | os2* | pw32*)
-+    mingw* | cygwin* | os2* | pw32* | cegcc*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
-       # Although the cygwin gcc ignores -fPIC, still need this for old-style
-@@ -3617,10 +3625,11 @@
-       fi
-       ;;<