diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-04-22 12:27:51 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-04-22 12:27:51 +0200 |
| commit | 6655495bfee27eed974367c401b85ccbfabcbceb (patch) | |
| tree | 374b4b466f1137eeea4881011e0d84be3c8f8093 /package | |
| parent | 5d56c728d73ae05600e3aac4a6d4572587c3109e (diff) | |
| parent | d60178f7efa99ea5a67a1c352c785a12afb24c90 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/DirectFB/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files/src/etc/network/if-pre-up.d/04-wireless | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/package/DirectFB/Makefile b/package/DirectFB/Makefile index 682c763ec..a8ad055e9 100644 --- a/package/DirectFB/Makefile +++ b/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 \ diff --git a/package/base-files/src/etc/network/if-pre-up.d/04-wireless b/package/base-files/src/etc/network/if-pre-up.d/04-wireless index f1905c33c..030502efc 100755 --- a/package/base-files/src/etc/network/if-pre-up.d/04-wireless +++ b/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 ] || { |