update kernel 3.4.x, fixes for lemote yeelong users

Config.in

@@ -121,8 +121,8 @@ config ADK_KERNEL_VERSION_3_11_10
 	prompt "3.11.10"
 	boolean
 
-config ADK_KERNEL_VERSION_3_4_71
+config ADK_KERNEL_VERSION_3_4_82
-	prompt "3.4.71"
+	prompt "3.4.82"
 	boolean
 
 endchoice
@@ -132,7 +132,7 @@ config ADK_KERNEL_VERSION
 	default "3.13.5" if ADK_KERNEL_VERSION_3_13_5
 	default "3.12.13" if ADK_KERNEL_VERSION_3_12_13
 	default "3.11.10" if ADK_KERNEL_VERSION_3_11_10
-	default "3.4.71" if ADK_KERNEL_VERSION_3_4_71
+	default "3.4.82" if ADK_KERNEL_VERSION_3_4_82
 	help
 
 config ADK_KERNEL_COMP_GZIP_RASPBERRY_PI

mk/kernel-ver.mk

@@ -22,9 +22,9 @@ KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		59f352d3f4e2cdf6755f79e09fa09176
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_4_71),y)
+ifeq ($(ADK_KERNEL_VERSION_3_4_82),y)
-KERNEL_VERSION:=	3.4.71
+KERNEL_VERSION:=	3.4.82
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		d6183a3809c6d3f6779043b6e9f482ca
+KERNEL_MD5SUM:=		9ee57efa65417a7a9ac931122c2b7377
 endif

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

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)
 		}
 		;;
 	*)

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
 		}
 		;;
 	*)

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

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}

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_64),y)
-ifeq ($(ADK_LINUX_MIPS),y)
+ifeq ($(ADK_TARGET_ABI_N32),y)
 TARGET_CFLAGS+=		-DNS_PTR_LE_32
 endif
 XAKE_FLAGS+=		USE_64=1

scripts/create-pkg

@@ -2,6 +2,7 @@
 topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
 
 mkdir -p $topdir/target/packages/pkg-enabled
+rm $topdir/target/packages/pkg-enabled/* 2>/dev/null
 count=1
 for i in $(ls $topdir/target/packages/pkg-available/);do
 	cd $topdir/target/packages/pkg-enabled &&

target/config/Config.in.runtime

@@ -204,10 +204,30 @@ config SIMPLE_NETWORK_CONFIG_ETH0_BC
 
 endmenu
 
+menu "wlan0 Configuration"
+depends on ADK_SIMPLE_NETWORK_CONFIG && \
+	ADK_TARGET_SYSTEM_LEMOTE_YEELONG || \
+	ADK_TARGET_SYSTEM_RASPBERRY_PI || \
+	ADK_TARGET_SYSTEM_IBM_X40
 
+choice
+	prompt "Type"
+	default SIMPLE_NETWORK_CONFIG_WLAN0_TYPE_NONE
+
+config SIMPLE_NETWORK_CONFIG_WLAN0_TYPE_DHCP
+	bool "DHCP"
+
+config SIMPLE_NETWORK_CONFIG_WLAN0_TYPE_STATIC
+	bool "static IP configuration"
+
+endchoice
+endmenu
 
 menu "eth1 Configuration"
-depends on ADK_SIMPLE_NETWORK_CONFIG
+depends on ADK_SIMPLE_NETWORK_CONFIG && \
+	!ADK_TARGET_SYSTEM_LEMOTE_YEELONG && \
+	!ADK_TARGET_SYSTEM_RASPBERRY_PI && \
+	!ADK_TARGET_SYSTEM_IBM_X40
 
 choice
 	prompt "Type"

target/linux/config/Config.in.netfilter.ip4

@@ -36,7 +36,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
 
 config ADK_KPACKAGE_KMOD_FULL_NAT
 	tristate "Meta package for Full NAT"
-	select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_71
+	select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_82
 	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_11_10
 	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_12_11
 	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_13_5
@@ -44,7 +44,7 @@ config ADK_KPACKAGE_KMOD_FULL_NAT
 config ADK_KPACKAGE_KMOD_NF_NAT
 	tristate 'Full NAT'
 	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
-	depends on ADK_KERNEL_VERSION_3_4_71
+	depends on ADK_KERNEL_VERSION_3_4_82
 	help
 	  The Full NAT option allows masquerading, port forwarding and other
 	  forms of full Network Address Port Translation.  It is controlled by

target/packages/pkg-available/console

@@ -0,0 +1,31 @@
+config ADK_PKG_CONSOLE
+	boolean "Choose packages for a desktop system without X"
+	default n
+	select ADK_PACKAGE_ALSA_UTILS
+	select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER
+	select ADK_PACKAGE_SCREEN
+	select ADK_PACKAGE_SUDO
+	select ADK_PACKAGE_LINKS
+	select ADK_PACKAGE_ELINKS
+	select ADK_PACKAGE_LYNX
+	select ADK_PACKAGE_KEYCHAIN
+	select ADK_PACKAGE_OPENSSH_CLIENT
+	select ADK_PACKAGE_OPENSSH_CLIENT_UTILS
+	select ADK_PACKAGE_OPENSSH_SERVER
+	select ADK_PACKAGE_MKSH
+	select ADK_PACKAGE_MKSH_FULL
+	select ADK_PACKAGE_MUTT
+	select ADK_PACKAGE_IRSSI
+	select ADK_PACKAGE_IRSSI_WITH_SSL
+	select ADK_PACKAGE_IRSSI_WITH_IPV6
+	select ADK_PACKAGE_MPG123
+	select ADK_PACKAGE_MPLAYER
+	select ADK_PACKAGE_MPC
+	select ADK_PACKAGE_RTORRENT
+	select ADK_PACKAGE_WPA_SUPPLICANT
+	select ADK_PACKAGE_WPA_SUPPLICANT_WITH_OPENSSL
+	select ADK_PACKAGE_TCPDUMP
+	select ADK_PACKAGE_VIM
+	select ADK_PACKAGE_WIRELESS_TOOLS if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+	select ADK_PACKAGE_IW if ADK_TARGET_SYSTEM_IBM_X40
+	select ADK_KPACKAGE_KMOD_USB_STORAGE

target/packages/pkg-available/development

@@ -2,7 +2,6 @@ config ADK_PKG_DEVELOPMENT
 	bool "Compile a ADK development system"
 	default n
 	select ADK_PACKAGE_BASH
-	select ADK_PACKAGE_BC
 	select ADK_PACKAGE_BINUTILS
 	select ADK_PACKAGE_BZIP2
 	select ADK_PACKAGE_DIFFUTILS
@@ -23,7 +22,6 @@ config ADK_PKG_DEVELOPMENT
 	select ADK_PACKAGE_MAKE
 	select ADK_PACKAGE_MKFONTDIR
 	select ADK_PACKAGE_PATCH
-	select ADK_PACKAGE_PKGCONF
 	select ADK_PACKAGE_PERL
 	select BUSYBOX_STAT
 	select BUSYBOX_FEATURE_STAT_FORMAT
@@ -34,14 +32,9 @@ config ADK_PKG_DEVELOPMENT
 	select ADK_PACKAGE_ZLIB_DEV
 	select ADK_PACKAGE_XZ
 	select ADK_PACKAGE_WGET
-	# optional
+	select ADK_PACKAGE_WGET_WITH_OPENSSL
 	select ADK_PACKAGE_STRACE
 	select ADK_PACKAGE_GDB
-	select ADK_PACKAGE_FLEX
-	select ADK_PACKAGE_BISON
-	select ADK_PACKAGE_AUTOCONF
-	select ADK_PACKAGE_AUTOMAKE
-	select ADK_PACKAGE_LIBTOOL
 	help
 	  After bootstrapping a Linux system you might want to
 	  switch to native builds with your target. 

target/packages/pkg-available/xorg

@@ -1,17 +1,7 @@
 config ADK_PKG_XORG
-	bool "Choose packages for graphical system with Xorg"
+	bool "Choose packages for graphical desktop system with Xorg"
 	default n
-	select ADK_PACKAGE_ALSA_UTILS
+	select ADK_PKG_CONSOLE
-	select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER
-	select ADK_PACKAGE_SCREEN
-	select ADK_PACKAGE_SUDO
-	select ADK_PACKAGE_LYNX
-	select ADK_PACKAGE_KEYCHAIN
-	select ADK_PACKAGE_OPENSSH_CLIENT
-	select ADK_PACKAGE_OPENSSH_CLIENT_UTILS
-	select ADK_PACKAGE_OPENSSH_SERVER
-	select ADK_PACKAGE_MKSH
-	select ADK_PACKAGE_MKSH_FULL
 	select ADK_PACKAGE_RXVT_UNICODE
 	select ADK_PACKAGE_FIREFOX
 	select ADK_PACKAGE_XTERM
@@ -21,7 +11,6 @@ config ADK_PKG_XORG
 	select ADK_PACKAGE_XF86_INPUT_MOUSE
 	select ADK_PACKAGE_XF86_VIDEO_INTEL if ADK_TARGET_SYSTEM_IBM_X40
 	select ADK_PACKAGE_XF86_VIDEO_SILICONMOTION if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	select ADK_PACKAGE_XF86_VIDEO_INTEL if ADK_TARGET_SYSTEM_TAROX_PC
 	select ADK_PACKAGE_XF86_VIDEO_CIRRUS if ADK_TARGET_SYSTEM_QEMU_I686
 	select ADK_PACKAGE_XF86_VIDEO_CIRRUS if ADK_TARGET_SYSTEM_QEMU_X86_64
 	select ADK_PACKAGE_FONT_MISC_MISC
@@ -31,14 +20,5 @@ config ADK_PKG_XORG
 	select ADK_PACKAGE_FEH
 	select ADK_PACKAGE_XINIT
 	select ADK_PACKAGE_EVILWM
-	select ADK_PACKAGE_IRSSI
-	select ADK_PACKAGE_IRSSI_WITH_SSL
-	select ADK_PACKAGE_IRSSI_WITH_IPV6
 	select ADK_PACKAGE_DILLO
-	select ADK_PACKAGE_MPLAYER
-	select ADK_PACKAGE_MPC
-	select ADK_PACKAGE_WPA_SUPPLICANT
-	select ADK_PACKAGE_WPA_SUPPLICANT_WITH_OPENSSL
 	select ADK_PACKAGE_XRDB
-	select ADK_PACKAGE_VIM
-	select ADK_KPACKAGE_KMOD_USB_STORAGE

toolchain/gcc/Makefile

@@ -209,10 +209,12 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
 	# fix linking g++ apps with libtool
 	@-test -d $(STAGING_TARGET_DIR)/lib32 && \
 		cd $(STAGING_TARGET_DIR)/lib32 && \
-		ln -sf libstdc++.so.6.0.17 libstdc++.so
+		ln -sf libstdc++.so.6.0.17 libstdc++.so && \
+		ln -sf libstdc++.so.6.0.17 libstdc++.so.6
 	@-test -d $(STAGING_TARGET_DIR)/lib64 && \
 		cd $(STAGING_TARGET_DIR)/lib64 && \
-		ln -sf libstdc++.so.6.0.17 libstdc++.so
+		ln -sf libstdc++.so.6.0.17 libstdc++.so && \
+		ln -sf libstdc++.so.6.0.17 libstdc++.so.6
 	# cleanup unneeded docs
 	rm -rf $(STAGING_HOST_DIR)/share
 	touch $@