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

6 files changed, 12 insertions, 91 deletions

diff --git a/target/packages/pkg-available/desktop b/target/packages/pkg-available/desktop
deleted file mode 100644
index de2e85381..000000000
--- a/target/packages/pkg-available/desktop
+++ /dev/null
@@ -1,37 +0,0 @@
-config ADK_PKG_DESKTOP
-	bool "Choose packages for my desktop system with X"
-	default n
-	select ADK_PACKAGE_SCREEN
-	select ADK_PACKAGE_VIM
-	select ADK_PACKAGE_SUDO
-	select ADK_PACKAGE_LYNX
-	select ADK_PACKAGE_KEYCHAIN
-	select ADK_PACKAGE_ALSA_UTILS
-	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_XTERM
-	select ADK_PACKAGE_XORG_SERVER
-	select ADK_PACKAGE_XORG_SERVER_WITH_DRI
-	select ADK_PACKAGE_XF86_INPUT_KEYBOARD
-	select ADK_PACKAGE_XF86_INPUT_MOUSE
-	select ADK_PACKAGE_XF86_VIDEO_INTEL if ADK_TARGET_SYSTEM_TAROX_PC
-	select ADK_PACKAGE_FONT_MISC_MISC
-	select ADK_PACKAGE_SETXKBMAP
-	select ADK_PACKAGE_XBINDKEYS
-	select ADK_PACKAGE_DISPLAY
-	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_XRDB
-	select ADK_PACKAGE_FIREFOX
-	select ADK_PACKAGE_DILLO
-	select ADK_PACKAGE_MPLAYER
-	select ADK_KPACKAGE_KMOD_USB_STORAGE
-	select ADK_KPACKAGE_KMOD_USB_HID
diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development
index 143166acd..72e0777ce 100644
--- a/target/packages/pkg-available/development
+++ b/target/packages/pkg-available/development
@@ -25,10 +25,8 @@ config ADK_PKG_DEVELOPMENT
 	select ADK_PACKAGE_MAKE
 	select ADK_PACKAGE_MKFONTDIR
 	select ADK_PACKAGE_PATCH
-	select ADK_PACKAGE_PKG_CONFIG
+	select ADK_PACKAGE_PKGCONF
 	select ADK_PACKAGE_MICROPERL
-	select ADK_PACKAGE_TSORT
-	select BUSYBOX_PATCH
 	select BUSYBOX_STAT
 	select BUSYBOX_FEATURE_STAT_FORMAT
 	select BUSYBOX_FEATURE_DD_IBS_OBS
diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox
index 1be2e75e0..4612e6a31 100644
--- a/target/packages/pkg-available/mpdbox
+++ b/target/packages/pkg-available/mpdbox
@@ -1,7 +1,6 @@
 config ADK_PKG_MPDBOX
 	bool "Choose packages for MPDBox system"
 	default n
-	select BUSYBOX_NTPD
 	select ADK_PACKAGE_LIBMPDCLIENT
 	select ADK_PACKAGE_MPC
 	select ADK_PACKAGE_MPD
@@ -36,6 +35,7 @@ config ADK_PKG_MPDBOX
 	select ADK_PACKAGE_PHP
 	select ADK_PACKAGE_PHP_MOD_SESSION
 	select ADK_PACKAGE_PHP_MOD_JSON
+	select ADK_PACKAGE_PHP_MOD_CURL
 	select ADK_PACKAGE_PHP_FASTCGI
 	select ADK_PACKAGE_SCREEN
 	select ADK_PACKAGE_VIM
diff --git a/target/packages/pkg-available/vpn-client b/target/packages/pkg-available/vpn-client
deleted file mode 100644
index 9075eeaa8..000000000
--- a/target/packages/pkg-available/vpn-client
+++ /dev/null
@@ -1,18 +0,0 @@
-config ADK_PKG_VPN_CLIENT
-	bool "Compile a OpenVPN client system"
-	default n
-	select ADK_PACKAGE_OPENVPN
-	select ADK_PACKAGE_OPENVPN_WITH_LZO
-	select ADK_PACKAGE_OPENVPN_WITH_MANAGEMENT
-	select ADK_PACKAGE_OPENVPN_CLIENT
-	select ADK_PACKAGE_OPENNTPD
-	select ADK_PACKAGE_IPTABLES
-	select ADK_PACKAGE_PPP
-	select ADK_PACKAGE_PPP_MOD_PPPOE
-	# optional
-	select ADK_PACKAGE_VIM
-	select ADK_PACKAGE_SCREEN
-	select ADK_PACKAGE_STRACE
-	select ADK_PACKAGE_TCPDUMP
-	help
-	 VPN Client system with OpenVPN.
diff --git a/target/packages/pkg-available/vpn-server b/target/packages/pkg-available/vpn-server
deleted file mode 100644
index 2057a0a45..000000000
--- a/target/packages/pkg-available/vpn-server
+++ /dev/null
@@ -1,27 +0,0 @@
-config ADK_PKG_VPN_SERVER
-	bool "Compile a OpenVPN server system"
-	default n
-	select ADK_PACKAGE_OPENVPN
-	select ADK_PACKAGE_OPENVPN_EASY_RSA
-	select ADK_PACKAGE_OPENVPN_WITH_LZO
-	select ADK_PACKAGE_OPENVPN_WITH_MANAGEMENT
-	select ADK_PACKAGE_OPENVPN_SERVER
-	select ADK_PACKAGE_OPENNTPD
-	select ADK_PACKAGE_IPTABLES
-	select ADK_PACKAGE_ICINGA
-	select ADK_PACKAGE_NAGIOS_PLUGINS
-	select ADK_PACKAGE_POSTFIX
-	select ADK_PACKAGE_MAILUTILS
-	select ADK_PACKAGE_PHP
-	select ADK_PACKAGE_PHP_FASTCGI
-	select ADK_PACKAGE_LIGHTTPD
-	select ADK_PACKAGE_LIGHTTPD_MOD_FASTCGI
-	select ADK_PACKAGE_PPP
-	select ADK_PACKAGE_PPP_MOD_PPPOE
-	# optional
-	select ADK_PACKAGE_VIM
-	select ADK_PACKAGE_SCREEN
-	select ADK_PACKAGE_STRACE
-	select ADK_PACKAGE_TCPDUMP
-	help
-	 VPN Server system with OpenVPN.
diff --git a/target/packages/pkg-available/laptop b/target/packages/pkg-available/xorg
index 4810a71fc..fdb5667da 100644
--- a/target/packages/pkg-available/laptop
+++ b/target/packages/pkg-available/xorg
@@ -1,18 +1,19 @@
-config ADK_PKG_LAPTOP
-	bool "Choose packages for my laptop system with X"
+config ADK_PKG_XORG
+	bool "Choose packages for graphical system with Xorg"
 	default n
+	select ADK_PACKAGE_ALSA_UTILS
+	select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER
 	select ADK_PACKAGE_SCREEN
-	select ADK_PACKAGE_VIM
 	select ADK_PACKAGE_SUDO
 	select ADK_PACKAGE_LYNX
 	select ADK_PACKAGE_KEYCHAIN
-	select ADK_PACKAGE_ALSA_UTILS
 	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
 	select ADK_PACKAGE_XORG_SERVER
 	select ADK_PACKAGE_XORG_SERVER_WITH_DRI
@@ -20,6 +21,9 @@ config ADK_PKG_LAPTOP
 	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
 	select ADK_PACKAGE_SETXKBMAP
 	select ADK_PACKAGE_XBINDKEYS
@@ -30,10 +34,11 @@ config ADK_PKG_LAPTOP
 	select ADK_PACKAGE_IRSSI
 	select ADK_PACKAGE_IRSSI_WITH_SSL
 	select ADK_PACKAGE_IRSSI_WITH_IPV6
-	select ADK_PACKAGE_XRDB
 	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