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

package/DirectFB/Makefile

@@ -24,7 +24,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,DIRECTFB,directfb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,DIRECTFB_DEV,directfb-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DIRECTFB_DEV},${PKGSC_DIRECTFB_DEV}))
 
-TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64
+TARGET_LDFLAGS+=	-L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32
 CONFIGURE_ARGS+=	--with-inputdrivers=linuxinput,keyboard,ps2mouse \
 			--with-gfxdrivers=none \
 			--without-tools \

package/base-files/src/etc/network/if-pre-up.d/04-wireless

@@ -90,7 +90,11 @@ case "$IF_WIRELESS_MODE" in
 				exit 1
 			}
 			driver=nl80211
-			iw dev ${IFACE} connect $IF_WIRELESS_SSID
+			[ $sec -eq 2 ] && {
+				iw dev ${IFACE} connect $IF_WIRELESS_SSID key d:0:$IF_WIRELESS_PASSPHRASE
+			} || {
+				iw dev ${IFACE} connect $IF_WIRELESS_SSID
+			}
 		}
 		[ $wpa2 -eq 1 ] && {
 			[ -x /usr/sbin/wpa_supplicant ] || {

toolchain/uClibc/patches/0.9.33.2/target_arch.patch

@@ -1,25 +1,24 @@
-diff -Nur uClibc-0.9.33.2.orig/extra/Configs/Config.in uClibc-0.9.33.2/extra/Configs/Config.in
---- uClibc-0.9.33.2.orig/extra/Configs/Config.in	2012-05-15 09:20:09.000000000 +0200
-+++ uClibc-0.9.33.2/extra/Configs/Config.in	2012-10-01 12:17:14.000000000 +0200
-@@ -235,6 +235,9 @@
- 	default "i486" if CONFIG_486
- 	default "i586" if CONFIG_586 || CONFIG_586MMX
- 	default "i686" if TARGET_ARCH = "i386"
-+	default "mips" if CONFIG_MIPS_N32_ABI
-+	default "mips" if CONFIG_MIPS_O32_ABI
-+	default "mips64" if CONFIG_MIPS_N64_ABI
- 	default ""
- 
- source "extra/Configs/Config.in.arch"
 diff -Nur uClibc-0.9.33.2.orig/Rules.mak uClibc-0.9.33.2/Rules.mak
 --- uClibc-0.9.33.2.orig/Rules.mak	2012-05-15 09:20:09.000000000 +0200
-+++ uClibc-0.9.33.2/Rules.mak	2012-10-01 11:28:26.000000000 +0200
-@@ -118,7 +118,7 @@
++++ uClibc-0.9.33.2/Rules.mak	2013-04-19 12:52:32.000000000 +0200
+@@ -118,12 +118,17 @@
  LIBC := libc
  SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION)
  UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION)
 -ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),)
-+ifneq ($(findstring  $(TARGET_SUBARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),)
++
++UCLIBC_LDSO_NAME := ld-uClibc
++ARCH_NATIVE_BIT := 32
++ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 powerpc64 s390x sparc64 x86_64 ),)
  UCLIBC_LDSO_NAME := ld64-uClibc
  ARCH_NATIVE_BIT := 64
  else
+-UCLIBC_LDSO_NAME := ld-uClibc
+-ARCH_NATIVE_BIT := 32
++ifeq ($(CONFIG_MIPS_N64_ABI),y)
++UCLIBC_LDSO_NAME := ld64-uClibc
++ARCH_NATIVE_BIT := 64
++endif
+ endif
+ UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(ABI_VERSION)
+ NONSHARED_LIBNAME := uclibc_nonshared.a