diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:16:26 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-10 16:16:26 +0100 |
| commit | 0241f2121f30dee91113e0e9619e618415f64de1 (patch) | |
| tree | e80732e69c07698ae59631ff8eea4092e5bf1963 | |
| parent | 5ab921af6386c3c9ba3f2dd8b3e0db9bfd8903f4 (diff) | |
| parent | 25f8e4c49f42c61bab6eb5241b00b7fe199b0fae (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | target/packages/pkg-available/console | 5 | ||||
| -rw-r--r-- | target/packages/pkg-available/mpdbox | 15 | ||||
| -rw-r--r-- | target/packages/pkg-available/test | 1 | ||||
| -rw-r--r-- | target/packages/pkg-available/xorg | 3 |
4 files changed, 16 insertions, 8 deletions
diff --git a/target/packages/pkg-available/console b/target/packages/pkg-available/console index 8cadcdecd..ef688a3af 100644 --- a/target/packages/pkg-available/console +++ b/target/packages/pkg-available/console @@ -12,8 +12,6 @@ config ADK_PKG_CONSOLE 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 @@ -29,3 +27,6 @@ config ADK_PKG_CONSOLE 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 + help + Support for Linux system without X. + diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox index ff3b685ca..6e0c29341 100644 --- a/target/packages/pkg-available/mpdbox +++ b/target/packages/pkg-available/mpdbox @@ -2,6 +2,9 @@ config ADK_PKG_MPDBOX bool "Choose packages for MPDBox system" default n select ADK_PACKAGE_MPDBOX + select ADK_PACKAGE_CIFS_UTILS + select ADK_PACKAGE_NFS_UTILS if ADK_TARGET_LIB_GLIBC + select ADK_PACKAGE_NFS_UTILS_CLIENT if ADK_TARGET_LIB_GLIBC select ADK_PACKAGE_LIBMPDCLIENT select ADK_PACKAGE_MPC select ADK_PACKAGE_MPD @@ -19,9 +22,9 @@ config ADK_PKG_MPDBOX select ADK_PACKAGE_MPD_WITH_CURL select ADK_PACKAGE_MPD_WITH_SAMPLERATE select ADK_PACKAGE_MPD_WITH_HTTPD - select ADK_PACKAGE_NFS_UTILS if !ADK_TARGET_LIB_MUSL - select ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS if !ADK_TARGET_LIB_MUSL - select ADK_PACKAGE_NFS_UTILS_CLIENT if !ADK_TARGET_LIB_MUSL + select ADK_PACKAGE_MPD_WITH_AVAHI + select ADK_PACKAGE_AVAHI_DAEMON + select ADK_PACKAGE_AVAHI_DNSCONFD select ADK_PACKAGE_CPUFREQUTILS select ADK_PACKAGE_FILE select ADK_PACKAGE_HTOP @@ -51,9 +54,9 @@ config ADK_PKG_MPDBOX select ADK_PACKAGE_VIM select ADK_PACKAGE_ALSA_UTILS select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER - select ADK_PACKAGE_MKSH - select ADK_PACKAGE_MKSH_FULL select ADK_KPACKAGE_KMOD_SND_INTEL8X0 if ADK_TARGET_SYSTEM_QEMU_I686 - select ADK_PACKAGE_CIFS_UTILS select ADK_KPACKAGE_KMOD_SND_USB_AUDIO select ADK_KPACKAGE_KMOD_USB_STORAGE + help + Create a small mpdbox. + diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test index d7bbcf26a..fe9204f9c 100644 --- a/target/packages/pkg-available/test +++ b/target/packages/pkg-available/test @@ -7,3 +7,4 @@ config ADK_PKG_TEST help Package collection used to build adk-test-framework root filesystem. + diff --git a/target/packages/pkg-available/xorg b/target/packages/pkg-available/xorg index b0e01f611..75ee6bb18 100644 --- a/target/packages/pkg-available/xorg +++ b/target/packages/pkg-available/xorg @@ -22,3 +22,6 @@ config ADK_PKG_XORG select ADK_PACKAGE_EVILWM select ADK_PACKAGE_DILLO select ADK_PACKAGE_XRDB + help + X desktop environment with EvilWM. + |