From 24092f8e8b58464e33d163d8dee9e864895b50a5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 24 Oct 2013 16:02:44 +0200 Subject: update package collection, vpn stuff is just openvpn, no need for package collection, reduce laptop/desktop to xorg --- target/packages/pkg-available/desktop | 37 ------------------------------ target/packages/pkg-available/laptop | 39 -------------------------------- target/packages/pkg-available/mpdbox | 1 - target/packages/pkg-available/vpn-client | 18 --------------- target/packages/pkg-available/vpn-server | 27 ---------------------- 5 files changed, 122 deletions(-) delete mode 100644 target/packages/pkg-available/desktop delete mode 100644 target/packages/pkg-available/laptop delete mode 100644 target/packages/pkg-available/vpn-client delete mode 100644 target/packages/pkg-available/vpn-server (limited to 'target/packages') 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/laptop b/target/packages/pkg-available/laptop deleted file mode 100644 index 4810a71fc..000000000 --- a/target/packages/pkg-available/laptop +++ /dev/null @@ -1,39 +0,0 @@ -config ADK_PKG_LAPTOP - bool "Choose packages for my laptop 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_IBM_X40 - select ADK_PACKAGE_XF86_VIDEO_SILICONMOTION if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - 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_DILLO - select ADK_PACKAGE_MPLAYER - select ADK_PACKAGE_MPC - select ADK_PACKAGE_WPA_SUPPLICANT - select ADK_PACKAGE_WPA_SUPPLICANT_WITH_OPENSSL - select ADK_KPACKAGE_KMOD_USB_STORAGE diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox index cedb79b04..d3e73cb6b 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 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. -- cgit v1.2.3 From 1c2328a04fd17ddb2009d2f94ec075c7180e4ef5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 31 Oct 2013 18:00:37 +0100 Subject: add new package collection --- target/packages/pkg-available/xorg | 42 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 target/packages/pkg-available/xorg (limited to 'target/packages') diff --git a/target/packages/pkg-available/xorg b/target/packages/pkg-available/xorg new file mode 100644 index 000000000..5a41eede2 --- /dev/null +++ b/target/packages/pkg-available/xorg @@ -0,0 +1,42 @@ +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_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 + 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_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_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_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 -- cgit v1.2.3 From fbe47cba997e4f2f2dbaa6af0583dbec2e5d130c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 2 Nov 2013 12:03:09 +0100 Subject: remove dependencies to libiconv,pkg-config and file. use pkgconf and libiconv-tiny instead. fixes glib compile on systems without libiconv/ native iconv implementation --- target/packages/pkg-available/development | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'target/packages') 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 -- cgit v1.2.3 From 22e24d73762b2cfc79797f94d9e2d9e3f070c418 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 4 Nov 2013 13:51:33 +0100 Subject: resolve merge conflict --- target/packages/pkg-available/mpdbox | 1 + 1 file changed, 1 insertion(+) (limited to 'target/packages') diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox index d3e73cb6b..810d546e5 100644 --- a/target/packages/pkg-available/mpdbox +++ b/target/packages/pkg-available/mpdbox @@ -34,6 +34,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 -- cgit v1.2.3 From 36f7c1031ee62f73830b67c805e2fce2656331b2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 6 Nov 2013 17:39:58 +0100 Subject: enable cirrus vga for qemu when xorg collection choosen, enable usb for qemu-x86/qemu-x86-64 --- target/packages/pkg-available/xorg | 2 ++ 1 file changed, 2 insertions(+) (limited to 'target/packages') diff --git a/target/packages/pkg-available/xorg b/target/packages/pkg-available/xorg index 5a41eede2..fdb5667da 100644 --- a/target/packages/pkg-available/xorg +++ b/target/packages/pkg-available/xorg @@ -22,6 +22,8 @@ config ADK_PKG_XORG 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 -- cgit v1.2.3