Jelajahi Sumber

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

Waldemar Brodkorb 10 tahun lalu
induk
melakukan
0241f2121f

+ 3 - 2
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.
+

+ 9 - 6
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.
+

+ 1 - 0
target/packages/pkg-available/test

@@ -7,3 +7,4 @@ config ADK_PKG_TEST
 	help
 	  Package collection used to build adk-test-framework root
 	  filesystem.
+

+ 3 - 0
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.
+