100 files changed, 7651 insertions, 160 deletions

diff --git a/Config.in b/Config.in
index 103e92075..a43ea3e13 100644
--- a/Config.in
+++ b/Config.in
@@ -95,7 +95,7 @@ prompt "Kernel Version"
 depends on ADK_TOOLCHAIN_ONLY
 
 config ADK_KERNEL_VERSION_TOOLCHAIN
-	prompt "3.5.4"
+	prompt "3.5.6"
 	boolean
 	depends on ADK_TOOLCHAIN_ONLY
 
@@ -106,20 +106,25 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_
 
 choice
 prompt "Kernel Version"
-config ADK_KERNEL_VERSION_3_5_4
-	prompt "3.5.4"
+config ADK_KERNEL_VERSION_3_6_1
+	prompt "3.6.1"
 	boolean
 
-config ADK_KERNEL_VERSION_3_4_9
-	prompt "3.4.9"
+config ADK_KERNEL_VERSION_3_5_6
+	prompt "3.5.6"
+	boolean
+
+config ADK_KERNEL_VERSION_3_4_13
+	prompt "3.4.13"
 	boolean
 
 endchoice
 
 config ADK_KERNEL_VERSION
 	string
-	default "3.4.9" if ADK_KERNEL_VERSION_3_4_9
-	default "3.5.4" if ADK_KERNEL_VERSION_3_5_4
+	default "3.4.13" if ADK_KERNEL_VERSION_3_4_13
+	default "3.5.6" if ADK_KERNEL_VERSION_3_5_6
+	default "3.6.1" if ADK_KERNEL_VERSION_3_6_1
 	help
 
 choice
diff --git a/mk/build.mk b/mk/build.mk
index 0ad4ea788..fa2e21fd5 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -158,12 +158,12 @@ ifeq ($(ADK_NATIVE),y)
 else
 ifeq ($(ADK_TOOLCHAIN),y)
 ifeq ($(ADK_TOOLCHAIN_ONLY),y)
-	$(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install package/compile
+	$(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install package/compile
 else
-	$(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install package/compile root_clean package/install
+	$(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install package/compile root_clean package/install
 endif
 else
-	$(MAKE) -f mk/build.mk toolchain/install tools/install jtools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index
+	$(MAKE) -f mk/build.mk toolchain/fixup tools/install jtools/install target/config-prepare target/compile package/compile root_clean package/install target/install package_index
 endif
 endif
 
diff --git a/mk/image.mk b/mk/image.mk
index 4e1ab94dc..b432a32ce 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -50,6 +50,15 @@ image-prepare-post:
 	sed -i '/^root:/s!:/bin/sh$$!:${ROOTSH}!' ${TARGET_DIR}/etc/passwd
 	-rm -f ${TARGET_DIR}/bin/sh
 	ln -sf ${BINSH} ${TARGET_DIR}/bin/sh
+ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
+	# multilib fixup lib dirs
+	mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
+	rm -rf ${TARGET_DIR}/lib/
+	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib
+	mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH}
+	rm -rf ${TARGET_DIR}/usr/lib/
+	ln -sf /usr/${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/usr/lib
+endif
 
 KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg
 KERNEL_PKG:=$(PACKAGE_DIR)/kernel_$(KERNEL_VERSION)_$(CPU_ARCH).$(PKG_SUFFIX)
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index f52834616..87a861da7 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -1,17 +1,23 @@
 ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y)
-KERNEL_VERSION:=	3.5.4
+KERNEL_VERSION:=	3.5.6
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		95d5c7271ad448bc965bdb29339b6923
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_5_4),y)
-KERNEL_VERSION:=	3.5.4
+ifeq ($(ADK_KERNEL_VERSION_3_6_1),y)
+KERNEL_VERSION:=	3.6.1
+KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
+KERNEL_RELEASE:=	1
+KERNEL_MD5SUM:=		63bdd7d325afae1ac525586d24eb5399
+endif
+ifeq ($(ADK_KERNEL_VERSION_3_5_6),y)
+KERNEL_VERSION:=	3.5.6
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		95d5c7271ad448bc965bdb29339b6923
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_4_9),y)
-KERNEL_VERSION:=	3.4.9
+ifeq ($(ADK_KERNEL_VERSION_3_4_13),y)
+KERNEL_VERSION:=	3.4.13
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		f9cd4fe763396bf814f3a71de42fde9b
diff --git a/mk/toolchain.mk b/mk/toolchain.mk
index 6a181a444..80860a0f1 100644
--- a/mk/toolchain.mk
+++ b/mk/toolchain.mk
@@ -2,5 +2,6 @@ prepare: ${WRKDIST}/.prepared $(WRKBUILD)/.headers
 configure: ${WRKBUILD}/.configured
 compile: $(WRKBUILD)/.compiled
 install: $(WRKBUILD)/.installed
+fixup: $(WRKBUILD)/.fixup
 clean:
 	rm -rf $(WRKDIR)
diff --git a/mk/vars.mk b/mk/vars.mk
index bdfd333ad..6fc2eb192 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -99,7 +99,8 @@ TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts
 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 \
-			-Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib
+			-Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \
+			$(ADK_TARGET_ABI_LDFLAGS)
 
 ifneq ($(ADK_NATIVE),)
 TARGET_CPPFLAGS:=
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 9bd18ce93..43043514c 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -19,6 +19,12 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBBFD,libbfd,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBFD},${PKGSC_LIBBFD}))
 
+ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
+CONFIGURE_ARGS+=	--enable-multilib
+else
+CONFIGURE_ARGS+=	--disable-multilib
+endif
+
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 TARGET_CFLAGS+=		-fPIC
 ifeq ($(ADK_NATIVE),)
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 34b274d96..9fe1ef52a 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		e025414bc6cd79579cc7a32a45d3ae1c
 PKG_DESCR:=		Core utilities for embedded systems
 PKG_SECTION:=		base
-#PKG_BUILDDEP:=		libtirpc
+PKG_BUILDDEP:=		libtirpc
 PKG_URL:=		http://www.busybox.net/
 PKG_SITES:=		http://www.busybox.net/downloads/
 
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 3728ef8da..31d9c68f8 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -24,6 +24,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBCONVERT},${PKG_SECTION}))
 
+TARGET_LDFLAGS+=	$(ADK_TARGET_ABI_CFLAGS)
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 CONFIGURE_ARGS+=	--disable-pam \
diff --git a/package/dropbear/patches/patch-Makefile_in b/package/dropbear/patches/patch-Makefile_in
index 0995ed95a..3e6783b64 100644
--- a/package/dropbear/patches/patch-Makefile_in
+++ b/package/dropbear/patches/patch-Makefile_in
@@ -1,5 +1,5 @@
 --- dropbear-2012.55.orig/Makefile.in	2012-02-23 14:47:05.000000000 +0100
-+++ dropbear-2012.55/Makefile.in	2012-06-02 21:00:17.000000000 +0200
++++ dropbear-2012.55/Makefile.in	2012-10-05 17:24:16.000000000 +0200
 @@ -56,7 +56,7 @@ HEADERS=options.h dbutil.h session.h pac
  		loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \
  		listener.h fake-rfc2553.h
@@ -21,7 +21,16 @@