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

18 files changed, 57 insertions, 33 deletions

diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 6e580f614..c28fd55a3 100644
--- a/target/config/Config.in.runtime
+++ b/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"
diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index e2bc1b1b2..cf33c02a2 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/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
diff --git a/target/linux/patches/3.4.71/bsd-compatibility.patch b/target/linux/patches/3.4.82/bsd-compatibility.patch
index 9e91a62de..9e91a62de 100644
--- a/target/linux/patches/3.4.71/bsd-compatibility.patch
+++ b/target/linux/patches/3.4.82/bsd-compatibility.patch
diff --git a/target/linux/patches/3.4.71/defaults.patch b/target/linux/patches/3.4.82/defaults.patch
index 58aae610b..58aae610b 100644
--- a/target/linux/patches/3.4.71/defaults.patch
+++ b/target/linux/patches/3.4.82/defaults.patch
diff --git a/target/linux/patches/3.4.71/gemalto.patch b/target/linux/patches/3.4.82/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.4.71/gemalto.patch
+++ b/target/linux/patches/3.4.82/gemalto.patch
diff --git a/target/linux/patches/3.4.71/lemote-rfkill.patch b/target/linux/patches/3.4.82/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.4.71/lemote-rfkill.patch
+++ b/target/linux/patches/3.4.82/lemote-rfkill.patch
diff --git a/target/linux/patches/3.4.71/module-alloc-size-check.patch b/target/linux/patches/3.4.82/module-alloc-size-check.patch
index a792ac60a..a792ac60a 100644
--- a/target/linux/patches/3.4.71/module-alloc-size-check.patch
+++ b/target/linux/patches/3.4.82/module-alloc-size-check.patch
diff --git a/target/linux/patches/3.4.71/non-static.patch b/target/linux/patches/3.4.82/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.4.71/non-static.patch
+++ b/target/linux/patches/3.4.82/non-static.patch
diff --git a/target/linux/patches/3.4.71/sparc-include.patch b/target/linux/patches/3.4.82/sparc-include.patch
index 2f8ffd061..2f8ffd061 100644
--- a/target/linux/patches/3.4.71/sparc-include.patch
+++ b/target/linux/patches/3.4.82/sparc-include.patch
diff --git a/target/linux/patches/3.4.71/startup.patch b/target/linux/patches/3.4.82/startup.patch
index 68e8987b0..68e8987b0 100644
--- a/target/linux/patches/3.4.71/startup.patch
+++ b/target/linux/patches/3.4.82/startup.patch
diff --git a/target/linux/patches/3.4.71/usb-defaults-off.patch b/target/linux/patches/3.4.82/usb-defaults-off.patch
index 31367108a..31367108a 100644
--- a/target/linux/patches/3.4.71/usb-defaults-off.patch
+++ b/target/linux/patches/3.4.82/usb-defaults-off.patch
diff --git a/target/linux/patches/3.4.71/uuid.patch b/target/linux/patches/3.4.82/uuid.patch
index ca23accdf..ca23accdf 100644
--- a/target/linux/patches/3.4.71/uuid.patch
+++ b/target/linux/patches/3.4.82/uuid.patch
diff --git a/target/linux/patches/3.4.71/vga-cons-default-off.patch b/target/linux/patches/3.4.82/vga-cons-default-off.patch
index 178aeeeb9..178aeeeb9 100644
--- a/target/linux/patches/3.4.71/vga-cons-default-off.patch
+++ b/target/linux/patches/3.4.82/vga-cons-default-off.patch
diff --git a/target/linux/patches/3.4.71/wlan-cf.patch b/target/linux/patches/3.4.82/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.4.71/wlan-cf.patch
+++ b/target/linux/patches/3.4.82/wlan-cf.patch
diff --git a/target/linux/patches/3.4.71/zlib-inflate.patch b/target/linux/patches/3.4.82/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.4.71/zlib-inflate.patch
+++ b/target/linux/patches/3.4.82/zlib-inflate.patch
diff --git a/target/packages/pkg-available/console b/target/packages/pkg-available/console
new file mode 100644
index 000000000..8cadcdecd
--- /dev/null
+++ b/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
diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development
index 7a6d5e14c..6da3a5564 100644
--- a/target/packages/pkg-available/development
+++ b/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. 
diff --git a/target/packages/pkg-available/xorg b/target/packages/pkg-available/xorg
index fdb5667da..b0e01f611 100644
--- a/target/packages/pkg-available/xorg
+++ b/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_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_PKG_CONSOLE
 	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