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

36 files changed, 922 insertions, 841 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/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/vars.mk b/mk/vars.mk
index 5c291f604..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
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/cairo/Makefile b/package/cairo/Makefile
index 93453d917..887a60425 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -10,6 +10,7 @@ PKG_MD5SUM:=		f101a9e88b783337b20b2e26dfd26d5f
 PKG_DESCR:=		cairo graphics library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		fontconfig libfreetype libpng libx11 pixman
+PKG_DEPENDS+=		libxrender
 PKG_BUILDDEP:=		libpng pixman freetype fontconfig libX11 libXrender glib
 PKG_BUILDDEP+=		libXext
 PKG_URL:=		http://cairographics.org/
diff --git a/package/cifs-utils/Makefile b/package/cifs-utils/Makefile
index 4b718b07d..e12c6caf7 100644
--- a/package/cifs-utils/Makefile
+++ b/package/cifs-utils/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		cifs-utils
-PKG_VERSION:=		6.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		371e007a201be90c16497cd9bd5e2553
+PKG_VERSION:=		6.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		f83ef48ab1154aa74dd4cf1c1202bf04
 PKG_DESCR:=		CIFS utilities
 PKG_SECTION:=		net/fs
 PKG_DEPENDS:=		kmod-cifs
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index 942e88942..af8ffaf3d 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -4,16 +4,21 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		collectd
-PKG_VERSION:=		5.0.1
+PKG_VERSION:=		5.4.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a405d6cca021748fea43b60348b72b0c
+PKG_MD5SUM:=		d4176b3066f3b85d85343d3648ea43f6
 PKG_DESCR:=		System statistics collection daemon
 PKG_SECTION:=		misc
-PKG_DEPENDS:=		libpthread
+PKG_BUILDDEP:=		libtool
+PKG_DEPENDS:=		libpthread libltdl
 PKG_URL:=		http://collectd.org/
 PKG_SITES:=		http://collectd.org/files/
 
 PKG_FLAVOURS_COLLECTD:=	WITH_CPU WITH_LOAD WITH_MEMORY WITH_PING
+PKG_FLAVOURS_COLLECTD+=	WITH_RRD
+PKGFD_WITH_RRD:=	enable RRD output
+PKGFB_WITH_RRD:=	rrdtool
+PKGFS_WITH_RRD:=	librrd
 PKGFD_WITH_CPU:=	collect CPU statistics
 PKGFD_WITH_LOAD:=	collect system load statistics
 PKGFD_WITH_MEMORY:=	collect memory usage statistics
@@ -36,11 +41,14 @@ ifneq (${ADK_PACKAGE_COLLECTD_WITH_PING},y)
 DISABLE_PING:=--disable-ping
 endif
 
-CONFIGURE_ARGS+=	--disable-apache \
+CONFIGURE_ARGS+=	--disable-aggregation \
+			--disable-apache \
 			--disable-apcups \
 			--disable-apple_sensors \
 			--disable-ascent \
 			--disable-battery \
+			--disable-cgroups \
+			--disable-conntrack \
 			${DISABLE_CPU} \
 			--disable-cpufreq \
 			--disable-contextswitch \
@@ -50,6 +58,7 @@ CONFIGURE_ARGS+=	--disable-apache \
 			--disable-dns \
 			--disable-email \
 			--disable-entropy \
+			--disable-ethstat \
 			--disable-exec \
 			--disable-filecount \
 			--disable-fscache \
@@ -61,38 +70,47 @@ CONFIGURE_ARGS+=	--disable-apache \
 			${DISABLE_LOAD} \
 			--disable-madwifi \
 			--disable-mbmon \
+			--disable-md \
 			--disable-memcached \
 			${DISABLE_MEMORY} \
 			--disable-multimeter \
 			--disable-mysql \
-			--disable-openvpn \
-			--disable-python \
-			--disable-postgresql \
-			--disable-powerdns \
 			--disable-network \
 			--disable-nginx \
 			--disable-nfs \
 			--disable-ntpd \
+			--disable-numa \
 			--disable-nut \
+			--disable-olsrd \
+			--disable-openvpn \
+			--disable-python \
+			--disable-postgresql \
+			--disable-powerdns \
 			--disable-perl \
 			${DISABLE_PING} \
 			--disable-processes \
+			--disable-protocols \
 			--disable-sensors \
 			--disable-serial \
 			--disable-logfile \
+			--disable-statsd \
 			--disable-swap \
-			--disable-syslog \
+			--enable-syslog \
 			--disable-tape \
 			--disable-target_notification \
 			--disable-target_replace \
 			--disable-target_set \
+			--disable-tcpconns \
 			--disable-teamspeak2 \
 			--disable-ted \
 			--disable-thermal \
 			--disable-unixsock \
 			--disable-users \
+			--disable-uptime \
+			--disable-uuid \
 			--disable-vserver \
 			--disable-wireless \
+			--disable-write_graphite \
 			--disable-write_http \
 			--with-fp-layout=nothing \
 			--without-java \
@@ -106,6 +124,9 @@ XAKE_FLAGS+=		LIBS='-lm -lltdl'
 post-install:
 	${INSTALL_DIR} ${IDIR_COLLECTD}/usr/lib/collectd \
 		${IDIR_COLLECTD}/usr/sbin ${IDIR_COLLECTD}/etc
+	${INSTALL_DIR} ${IDIR_COLLECTD}/usr/share/collectd
+	${CP} ${WRKINST}/usr/share/collectd/types.db \
+		${IDIR_COLLECTD}/usr/share/collectd
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/collectd ${IDIR_COLLECTD}/usr/sbin
 	${CP} ${WRKINST}/usr/lib/collectd/*.so \
 		${IDIR_COLLECTD}/usr/lib/collectd
diff --git a/package/collectd/patches/patch-src_Makefile_in b/package/collectd/patches/patch-src_Makefile_in
deleted file mode 100644
index d1580516a..000000000
--- a/package/collectd/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
---- collectd-5.0.1.orig/src/Makefile.in	2011-10-14 22:54:14.000000000 +0200
-+++ collectd-5.0.1/src/Makefile.in	2011-10-22 18:57:51.000000000 +0200
-@@ -56,8 +56,8 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT) 
- # too. -octo
- @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_13 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
- @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_14 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
--@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = $(LIBLTDL) liboconfig/liboconfig.la
--@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = $(LIBLTDL) liboconfig/liboconfig.la
-+@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = liboconfig/liboconfig.la
-+@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = liboconfig/liboconfig.la
- @BUILD_WITH_OWN_LIBOCONFIG_FALSE@am__append_17 = -loconfig
- @BUILD_WITH_LIBSOCKET_TRUE@am__append_18 = -lsocket
- @BUILD_AIX_TRUE@am__append_19 = -lm
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 552a12122..de0ed663c 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		a70edc50524f258eaf5c9a9994ed8748
 PKG_DESCR:=		DBUS library and daemon
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libexpat libx11
-PKG_BUILDDEP:=		expat libX11
+PKG_DEPENDS:=		libexpat libx11 libuuid
+PKG_BUILDDEP:=		expat libX11 util-linux
 PKG_URL:=		http://dbus.freedesktop.org/
 PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus/
 
@@ -27,6 +27,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,DBUS_DEV,dbus-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBUS_DEV},${PKGSC_DBUS_DEV},${PKG_OPTS}))
 
+TARGET_LDFLAGS+=	-luuid
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--disable-tests \
 			--disable-abstract-sockets \
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 26baf5d36..beabb3201 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libX11
 PKG_VERSION:=		1.5.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		395455e4d3a51459374fe5ca8420aae8
 PKG_DESCR:=		X11 client-side library
 PKG_SECTION:=		x11/libs
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=	--enable-xlocale \
 libx11-install:
 	${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11
 	${CP} ${WRKINST}/usr/lib/libX11.so* ${IDIR_LIBX11}/usr/lib/
-	${CP} ${WRKINST}/usr/lib/libX11-xcb* ${IDIR_LIBX11}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libX11-xcb*.so* ${IDIR_LIBX11}/usr/lib/
 	${CP} ${WRKINST}/usr/share/X11/XErrorDB ${IDIR_LIBX11}/usr/share/X11
 	${CP} ${WRKINST}/usr/share/X11/locale ${IDIR_LIBX11}/usr/share/X11
 
diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile
index 003cd9783..9c024504c 100644
--- a/package/libgcc/Makefile
+++ b/package/libgcc/Makefile
@@ -11,7 +11,7 @@ PKG_SECTION:=		libs
 
 NO_DISTFILES:=		1
 
-PKG_ARCH_DEPENDS:=	!sh !avr32
+PKG_ARCH_DEPENDS:=	!avr32
 
 include ${TOPDIR}/mk/package.mk
 
@@ -24,8 +24,12 @@ INSTALL_STYLE:=		manual
 do-install:
 ifeq ($(ADK_NATIVE),)
 	${INSTALL_DIR} ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+ifeq ($(ADK_LINUX_SH),y)
+	${CP} ${STAGING_TARGET_DIR}/lib/!m1/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+else
 	${CP} ${STAGING_TARGET_DIR}/$(ADK_TARGET_LIBC_PATH)/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
 endif
+endif
 ifeq ($(ADK_TARGET_MULTILIB_X86_32),y)
 	${INSTALL_DIR} ${IDIR_LIBGCC}/lib32
 	${CP} ${STAGING_TARGET_DIR_32}/lib/libgcc*.so* ${IDIR_LIBGCC}/lib32
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index cf395108d..cdc2fe9bb 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -43,8 +43,8 @@ INSTALL_STYLE:=		manual
 
 libpthread-install:
 ifeq ($(ADK_NATIVE),)
-	${INSTALL_DIR} ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
 ifeq ($(ADK_TARGET_LIB_MUSL),)
+	${INSTALL_DIR} ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
 	${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/$(ADK_TARGET_LIBC_PATH)
 endif
 endif
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile
index 44f5becd0..fddf9656b 100644
--- a/package/libstdcxx/Makefile
+++ b/package/libstdcxx/Makefile
@@ -34,6 +34,7 @@ ifeq ($(ADK_NATIVE),y)
 else
 	(cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.17 libstdc++.so.6)
 	(cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.17 libstdc++.so)
+	(cd ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/; ln -sf libstdc++.so.6.0.17 libstdc++.so)
 	$(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}
 	-@rm ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}/libstdc++.so.*-gdb.py
 endif
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 39cf4b0c8..d8ad8eac5 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		b68be330deeb23989c08a9fefd9fcdeb
 PKG_DESCR:=		A music player daemon
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		glib libstdcxx
+PKG_DEPENDS:=		glib libstdcxx libgcc
 PKG_FDEPENDS:=		glib libstdcxx
 PKG_BUILDDEP:=		glib
 PKG_URL:=		http://www.musicpd.org/
diff --git a/package/mpd/files/mpd.conf b/package/mpd/files/mpd.conf
index 48af33c4a..d05c29e44 100644
--- a/package/mpd/files/mpd.conf
+++ b/package/mpd/files/mpd.conf
@@ -1,8 +1,8 @@
 # An example configuration file for MPD
 user				"mpd"
 music_directory			"/music"
-playlist_directory		"~/playlists"
-db_file				"~/.database"
+playlist_directory		"/etc/mpd/playlists"
+db_file				"/etc/mpd/database"
 pid_file			"/var/run/mpd/mpd.pid"
 log_file			"syslog"
 # An example of an ALSA output
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index cd84e98a3..8fa2aff9c 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -20,7 +20,7 @@ WRKDIST=		${WRKDIR}/icedtea-${PKG_VERSION}
 
 PKG_HOST_DEPENDS:=	!darwin !cygwin !openbsd !netbsd !freebsd
 PKG_ARCH_DEPENDS:=	arm mips x86 x86_64
-PKG_SYSTEM_DEPENDS:=	!linksys-ag241 !fon-fon2100 !broadcom-bcm47xx
+PKG_SYSTEM_DEPENDS:=	!linksys-ag241 !fon-fon2100 !broadcom-bcm47xx !lemote-yeelong
 
 PKG_SUBPKGS:=		OPENJDK7
 PKG_CHOICES_OPENJDK7:=	ZERO SHARK CACAO
diff --git a/package/pcre/Makefile b/package/pcre/Makefile
index 80e856b57..d81eb7c06 100644
--- a/package/pcre/Makefile
+++ b/package/pcre/Makefile
@@ -24,6 +24,7 @@ $(eval $(call PKG_template,LIBPCRECPP,libpcrecpp,${PKG_VERSION}-${PKG_RELEASE},$
 $(eval $(call PKG_template,LIBPCRE_DEV,libpcre-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBPCRE_DEV},${PKGSC_LIBPCRE_DEV}))
 
 XAKE_FLAGS+=		${TARGET_CONFIGURE_OPTS}
+TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32 -lintl
 
 libpcre-install:
 	${INSTALL_DIR} ${IDIR_LIBPCRE}/usr/lib
diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile
index a047f032c..840633559 100644
--- a/package/rrdtool/Makefile
+++ b/package/rrdtool/Makefile
@@ -4,25 +4,29 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		rrdtool
-PKG_VERSION:=		1.2.30
+PKG_VERSION:=		1.4.8
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		19b24f7184a8dbf7b48c1bbb565ad9fb
-PKG_DESCR:=		Round Robin Database (RRD) management library and tools
+PKG_MD5SUM:=		dbe59386db97fd2f2216729facd74ca8
+PKG_DESCR:=		Round Robin Database (RRD) management library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libart libfreetype libpng zlib
+PKG_DEPENDS+=		glib cairo pango
 PKG_BUILDDEP:=		libxml2 cgilib freetype libart libpng
+PKG_BUILDDEP+=		glib cairo pango
 PKG_URL:=		http://oss.oetiker.ch/
 PKG_SITES:=		http://oss.oetiker.ch/rrdtool/pub/
 
 PKG_SUBPKGS:=		LIBRRD RRDCGI RRDTOOL
-PKG_SECTION_RRDCGI:=	misc
-PKG_SECTION_RRDTOOL:=	misc
+PKGSC_RRDCGI:=		misc
+PKGSD_RRDCGI:=		RRD CGI
+PKGSC_RRDTOOL:=		misc
+PKGSD_RRDTOOL:=		RRD tool
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBRRD,librrd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_RRDCGI}))
-$(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_RRDTOOL}))
+$(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_RRDCGI}))
+$(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_RRDTOOL}))
 
 CONFIGURE_ENV+=		rd_cv_ieee_works=yes
 CONFIGURE_ARGS+=	--enable-rrdcgi \
@@ -30,21 +34,22 @@ CONFIGURE_ARGS+=	--enable-rrdcgi \
 			--disable-perl \
 			--disable-ruby \
 			--disable-tcl \
-			--disable-python \
-			--without-x \
-			--with-rrd-default-font=/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
+			--disable-python
 TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/usr/include/freetype2
+TARGET_LDFLAGS+=	-lglib-2.0
+XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
-post-install:
+rrdtool-install:
 	${INSTALL_DIR} ${IDIR_RRDTOOL}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/rrdtool ${WRKINST}/usr/bin/rrdupdate \
 	               ${IDIR_RRDTOOL}/usr/bin/
+
+rrdcgi-install:
 	${INSTALL_DIR} ${IDIR_RRDCGI}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/rrdcgi ${IDIR_RRDCGI}/usr/bin/
+
+librrd-install:
 	${INSTALL_DIR} ${IDIR_LIBRRD}/usr/lib
-	${CP} ${WRKINST}/usr/lib/librrd.so.* ${IDIR_LIBRRD}/usr/lib/
-	${INSTALL_DIR} ${IDIR_LIBRRD}/usr/share/rrdtool/fonts
-	${CP} ${WRKBUILD}/src/DejaVuSansMono-Roman.ttf \
-		${IDIR_LIBRRD}/usr/share/rrdtool/fonts/
+	${CP} ${WRKINST}/usr/lib/librrd*.so* ${IDIR_LIBRRD}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/rrdtool/patches/patch-configure b/package/rrdtool/patches/patch-configure
deleted file mode 100644
index 852d96098..000000000
--- a/package/rrdtool/patches/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- rrdtool-1.2.30.orig/configure	2009-01-19 15:29:29.000000000 +0100
-+++ rrdtool-1.2.30/configure	2009-05-09 04:31:25.000000000 +0200
-@@ -26320,7 +26320,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-  ex_check_save_CPPFLAGS=${CPPFLAGS}
-  ex_check_save_LDFLAGS=${LDFLAGS}
-  if test "x/usr/include/libart-2.0" != "x"; then
--   CPPFLAGS="$CPPFLAGS -I/usr/include/libart-2.0"
-+   CPPFLAGS="$CPPFLAGS"
-  fi
-   { echo "$as_me:$LINENO: checking for art_vpath_add_point in -lart_lgpl_2" >&5
- echo $ECHO_N "checking for art_vpath_add_point in -lart_lgpl_2... $ECHO_C" >&6; }
-@@ -27916,7 +27916,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-  ex_check_save_CPPFLAGS=${CPPFLAGS}
-  ex_check_save_LDFLAGS=${LDFLAGS}
-  if test "x/usr/include/freetype2" != "x"; then
--   CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
-+   CPPFLAGS="$CPPFLAGS"
-  fi
-   { echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5
- echo $ECHO_N "checking for FT_Init_FreeType in -lfreetype... $ECHO_C" >&6; }
diff --git a/package/rrdtool/patches/patch-ltmain_sh b/package/rrdtool/patches/patch-ltmain_sh
deleted file mode 100644
index 940e4a403..000000000
--- a/package/rrdtool/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- rrdtool-1.2.30.orig/ltmain.sh	2007-03-14 16:47:55.000000000 +0100
-+++ rrdtool-1.2.30/ltmain.sh	2011-01-16 22:22:28.000000000 +0100
-@@ -1623,7 +1623,7 @@ EOF
-       # -pg pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
--      -t[45]*|-txscale*|@*)
-+      -t[45]*|-txscale*|@*|-fstack-protector*|-flto)
- 
- 	# Unknown arguments in both finalize_command and compile_command need
- 	# to be aesthetically quoted because they are evaled later.
diff --git a/package/samba/files/smb.conf b/package/samba/files/smb.conf
index 2ac0576d8..1b65b238d 100644
--- a/package/samba/files/smb.conf
+++ b/package/samba/files/smb.conf
@@ -12,9 +12,9 @@
  pid directory = /var/run/samba
  load printers = no
  printcap name = /dev/null
- unix charset = ASCII 
+ unix charset = UTF8
  dos charset = ASCII 
- display charset = ASCII 
+ display charset = UTF8
  unix extensions = yes 
 
 #[media]
diff --git a/rules.mk b/rules.mk
index a66762391..0a89332d3 100644
--- a/rules.mk
+++ b/rules.mk
@@ -43,6 +43,7 @@ ADK_RUNTIME_TMPFS_SIZE:=	$(strip $(subst ",, $(ADK_RUNTIME_TMPFS_SIZE)))
 ADK_RUNTIME_CONSOLE_SERIAL_SPEED:=	$(strip $(subst ",, $(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)))
 ADK_HOST:=		$(strip $(subst ",, $(ADK_HOST)))
 ADK_VENDOR:=		$(strip $(subst ",, $(ADK_VENDOR)))
+ADK_COMPRESSION_TOOL:=		$(strip $(subst ",, $(ADK_COMPRESSION_TOOL)))
 ADK_TOOLS_ADDPATTERN_ARGS:=	$(strip $(subst ",, $(ADK_TOOLS_ADDPATTERN_ARGS)))
 ADK_KERNEL_VERSION:=		$(strip $(subst ",, $(ADK_KERNEL_VERSION)))
 ADK_PARAMETER_NETCONSOLE_SRC_IP:=	$(strip $(subst ",, $(ADK_PARAMETER_NETCONSOLE_SRC_IP)))
diff --git a/scripts/create-sys b/scripts/create-sys
index c34a6ac3a..d34a0e443 100755
--- a/scripts/create-sys
+++ b/scripts/create-sys
@@ -32,7 +32,7 @@ for i in $systems;do
 	systemu=$(echo $system|tr '[:upper:]' '[:lower:]')
 	system=$(echo $system|tr '[:upper:]_' '[:lower:]-')
 	system=$(echo $system|sed 's#x86-64#x86_64#')
-	if [ "${system%-*}" = "toolchain" -o "${system%-*}" = "qemu" -o "${system%-*}" = "vbox" ];then
+	if [ "${system%-*}" = "toolchain" -o "${system%-*}" = "qemu" -o "${system%-*}" = "vbox" -o "${system%-*}" = "aranym" ];then
 		printf "\tdefault \"${system%-*}\" if ADK_$systemu\n" >> $topdir/target/config/Config.in.system.default
 	else
 		printf "\tdefault \"${system}\" if ADK_$systemu\n" >> $topdir/target/config/Config.in.system.default
diff --git a/scripts/update-sys b/scripts/update-sys
index 64b56a7dd..6c82dc626 100755
--- a/scripts/update-sys
+++ b/scripts/update-sys
@@ -49,7 +49,7 @@ config $archsym
 	boolean
 EOF
 
-if [ "${system}" = "toolchain" -o "${system}" = "qemu" -o "${system}" = "vbox" ];then
+if [ "${system}" = "toolchain" -o "${system}" = "qemu" -o "${system}" = "vbox" -o "${system}" = "aranym" ];then
 	sys=${system}-$cpuarch
 else
 	sys=$system
diff --git a/target/config/Config.in b/target/config/Config.in
index a14ef5b7a..6a7c05d82 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -542,7 +542,8 @@ config ADK_TARGET_CMDLINE
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ
 	default "console=ttyAMA0 console=tty0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILE
 	default "console=ttyS0,115200 console=tty0 fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	default "console=tty0" if ADK_TARGET_SYSTEM_QEMU_SH
+	default "console=ttySC1 console=tty0" if ADK_TARGET_SYSTEM_QEMU_SH
+	default "console=ttyS0" if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
 	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
 	default "console=ttyS0,115200" if ADK_TARGET_SYSTEM_FOXBOARD_LX
@@ -672,6 +673,7 @@ config ADK_TARGET_ROOTFS_INITRAMFS
 	bool "initramfs filesystem"
 	depends on \
 		ADK_HARDWARE_QEMU || \
+		ADK_TARGET_SYSTEM_ARANYM_M68K || \
 		ADK_LINUX_ARM || \
 		ADK_LINUX_MIPS || \
 		ADK_LINUX_PPC || \
@@ -731,7 +733,7 @@ config ADK_TARGET_ROOTFS_NFSROOT
 	select ADK_KERNEL_NFS_COMMON
 	select ADK_KERNEL_IP_PNP
 	select ADK_KERNEL_IP_PNP_DHCP
-	depends on !ADK_HARDWARE_QEMU && !ADK_HARDWARE_VBOX
+	depends on !ADK_HARDWARE_QEMU && !ADK_HARDWARE_VBOX && !ADK_TARGET_SYSTEM_ARANYM_M68K
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	help
 	  Root filesystem mounted via NFS. (DHCP)
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics
index dfa31bba7..e35f97ac4 100644
--- a/target/linux/config/Config.in.graphics
+++ b/target/linux/config/Config.in.graphics
@@ -20,6 +20,7 @@ config ADK_KERNEL_VGA_CONSOLE
 	boolean
 	default y if ADK_HARDWARE_VBOX
 	default y if ADK_HARDWARE_QEMU
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default n
 
 config ADK_KERNEL_FONTS
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input
index 3eff14a42..a4079c37b 100644
--- a/target/linux/config/Config.in.input
+++ b/target/linux/config/Config.in.input
@@ -5,6 +5,7 @@ config ADK_KERNEL_INPUT
 	boolean
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
@@ -19,6 +20,16 @@ config ADK_KERNEL_INPUT
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
+config ADK_KERNEL_KEYBOARD_ATARI
+	boolean
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
+	default n
+
+config ADK_KERNEL_MOUSE_ATARI
+	boolean
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
+	default n
+
 config ADK_KERNEL_KEYBOARD_GPIO
 	boolean
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
@@ -48,6 +59,7 @@ config ADK_KERNEL_INPUT_KEYBOARD
 	boolean
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
 	default y if ADK_TARGET_SYSTEM_IBM_X40
@@ -82,6 +94,7 @@ config ADK_KERNEL_INPUT_MOUSE
 	boolean
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_QEMU_X86_64
+	default y if ADK_TARGET_SYSTEM_ARANYM_M68K
 	default y if ADK_TARGET_SYSTEM_VBOX_I686
 	default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C