update kernel 3.4.x, fixes for lemote yeelong users

6 files changed, 19 insertions, 12 deletions

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 0b0f95950..7b0ececcd 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		65
+PKG_RELEASE:=		66
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 PKG_BUILDDEP:=		pkgconf-host file-host
@@ -111,11 +111,11 @@ ifneq (${ADK_SIMPLE_NETWORK_CONFIG},)
 	echo -e "auto lo\niface lo inet loopback" > ${IDIR_BASE_FILES}/etc/network/interfaces
 
 	# network config eth0
-	# configure nic with manual ip
+	# configure nic with dhcp
 ifeq (${SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC},y)
 	echo -e "\nauto eth0\niface eth0 inet dhcp" >> ${IDIR_BASE_FILES}/etc/network/interfaces
 endif
-	# configure nic with dhcp
+	# configure nic with manual ip
 ifeq (${SIMPLE_NETWORK_CONFIG_ETH0_TYPE_NIC_MANUAL},y)
 	echo -e "\nauto eth0\niface eth0 inet static" >> ${IDIR_BASE_FILES}/etc/network/interfaces
 	echo -e "  address ${SIMPLE_NETWORK_CONFIG_ETH0_IP}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
@@ -137,12 +137,17 @@ ifeq (${SIMPLE_NETWORK_CONFIG_ETH0_TYPE_BRIDGE_IP},y)
 	echo -e "  bridge-ports ${SIMPLE_NETWORK_CONFIG_ETH0_BRIDGE}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
 endif
 
+	# network config wlan0
+ifeq (${SIMPLE_NETWORK_CONFIG_WLAN0_TYPE_NIC},y)
+	echo -e "\nauto wlan0\niface wlan0 inet dhcp" >> ${IDIR_BASE_FILES}/etc/network/interfaces
+endif
+
 	# network config eth1
-	# configure nic with manual ip
+	# configure nic with dhcp
 ifeq (${SIMPLE_NETWORK_CONFIG_ETH1_TYPE_NIC},y)
 	echo -e "\nauto eth1\niface eth1 inet dhcp" >> ${IDIR_BASE_FILES}/etc/network/interfaces
 endif
-	# configure nic with dhcp
+	# configure nic with manual ip
 ifeq (${SIMPLE_NETWORK_CONFIG_ETH1_TYPE_NIC_MANUAL},y)
 	echo -e "\nauto eth1\niface eth1 inet static" >> ${IDIR_BASE_FILES}/etc/network/interfaces
 	echo -e "  address ${SIMPLE_NETWORK_CONFIG_ETH1_IP}" >> ${IDIR_BASE_FILES}/etc/network/interfaces
diff --git a/package/base-files/src/etc/network/if-post-down.d/03-wireless b/package/base-files/src/etc/network/if-post-down.d/03-wireless
index 86e0c73e1..67c01714e 100755
--- a/package/base-files/src/etc/network/if-post-down.d/03-wireless
+++ b/package/base-files/src/etc/network/if-post-down.d/03-wireless
@@ -1,4 +1,5 @@
-#!/bin/sh 
+#!/bin/sh
+set -x
 set -e 
 
 [ "${IFACE%%[0-9]*}" = "wlan" ] || exit 0
@@ -11,7 +12,7 @@ case "$IF_WIRELESS_MODE" in
 	sta)
 		[ "$IF_WIRELESS_SECURITY" != "none" ] && {
 			logger -t wireless "Killing wpa_supplicant"
-			pkill wpa_supplicant
+			kill -9 $(cat /var/run/wpa_supplicant.pid)
 		}
 		;;
 	*)
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 f69f273d0..98ac932df 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
@@ -107,7 +107,7 @@ case "$IF_WIRELESS_MODE" in
 		 	echo " psk=\"$IF_WIRELESS_PASSPHRASE\"" >> /tmp/wpa_supplicant.conf
 			echo " priority=5" >> /tmp/wpa_supplicant.conf
 			echo "}"  >> /tmp/wpa_supplicant.conf
-			wpa_supplicant -B -D${driver} -i${IFACE} -c/tmp/wpa_supplicant.conf
+			wpa_supplicant -B -D${driver} -i${IFACE} -P/var/run/wpa_supplicant.pid -c/tmp/wpa_supplicant.conf
 		}
 		;;
 	*)
diff --git a/package/firefox/files/firefox b/package/firefox/files/firefox
index fd372f5b5..339daaf09 100755
--- a/package/firefox/files/firefox
+++ b/package/firefox/files/firefox
@@ -1,2 +1,2 @@
 #!/bin/sh
-env LD_LIBRARY_PATH=/usr/lib/firefox-24.0 /usr/lib/firefox-24.0/firefox
+env LD_LIBRARY_PATH=/usr/lib/firefox-26.0 /usr/lib/firefox-26.0/firefox
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 51b470aae..d374fc5a5 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libpcap
 PKG_VERSION:=		1.5.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		33ba2f10f3a402cb5d34f5e2a904794a
 PKG_DESCR:=		a low-level packet capture library
 PKG_SECTION:=		libs
@@ -24,6 +24,7 @@ $(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
 CONFIGURE_ENV+=		ac_cv_linux_vers=26
 CONFIGURE_ARGS+=	--disable-yydebug \
 			--with-build-cc=$(CC_FOR_BUILD) \
+			--disable-dbus \
 			--without-libnl \
 			--with-pcap=linux
 TARGET_CFLAGS+=		${TARGET_CPPFLAGS}
diff --git a/package/nss/Makefile b/package/nss/Makefile
index 868dd5d4d..75921e8c5 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -30,8 +30,8 @@ $(eval $(call PKG_template,NSS,nss,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},
 CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
-ifneq ($(ADK_LINUX_64),)
-ifeq ($(ADK_LINUX_MIPS),y)
+ifeq ($(ADK_LINUX_64),y)
+ifeq ($(ADK_TARGET_ABI_N32),y)
 TARGET_CFLAGS+=		-DNS_PTR_LE_32
 endif
 XAKE_FLAGS+=		USE_64=1