[Buildroot] [PATCH v4 1/2] package/mpd: remove unused, add mandatory configuration items

[Andreas Ziegler <br025@umbiko.net>]

The configuration file supplied by Buildroot is only a sample; it will
not start MPD on a default installation. In a production build, a custom
mpd.conf has to be supplied via rootfs overlay or on the target system.

Supply the necessary configuration items to start mpd in a default build,
and discard unused customizations. 

Signed-off-by: Andreas Ziegler <br025@umbiko.net>
---
Changes v2 -> v3:
	reintroduce Buildroot mpd.conf as fragment file
Changes v3 -> v4:
	drop deployment of upstream config file

 package/mpd/Config.in |  2 --
 package/mpd/mpd.conf  | 31 ++++++++-----------------------
 package/mpd/mpd.mk    |  2 --
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 1b6815e904..bbd6fc16e5 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -119,7 +119,6 @@ config BR2_PACKAGE_MPD_LIBSNDFILE
 
 config BR2_PACKAGE_MPD_MAD
 	bool "mad"
-	default y
 	select BR2_PACKAGE_MPD_ID3TAG
 	select BR2_PACKAGE_LIBMAD
 	help
@@ -244,7 +243,6 @@ comment "Output plugins"
 
 config BR2_PACKAGE_MPD_ALSA
 	bool "alsa"
-	default y
 	select BR2_PACKAGE_ALSA_LIB
 	select BR2_PACKAGE_ALSA_LIB_PCM
 	select BR2_PACKAGE_ALSA_LIB_MIXER
diff --git a/package/mpd/mpd.conf b/package/mpd/mpd.conf
index 5956b75e24..b9fba3179a 100644
--- a/package/mpd/mpd.conf
+++ b/package/mpd/mpd.conf
@@ -1,32 +1,17 @@
 #
-# Sample configuration file for mpd
-# This is a minimal configuration, see the manpage for more options
+# Buildroot mpd configuration
+# Example file: doc/mpdconf.example in the build directory
+# Documentation: http://mpd.readthedocs.io/latest/user.html
 #
 
-# Directory where the music is stored
-music_directory		"/var/lib/mpd/music"
-
-# Directory where user-made playlists are stored (RW)
-playlist_directory	"/var/lib/mpd/playlists"
-
-# Database file (RW)
-db_file			"/var/lib/mpd/database"
-
 # Log file (RW)
 log_file		"/var/log/mpd.log"
 
 # Process ID file (RW)
 pid_file		"/var/run/mpd.pid"
 
-# State file (RW)
-state_file		"/var/lib/mpd/state"
-
-# User id to run the daemon as
-#user			"nobody"
-
-# TCP socket binding
-bind_to_address		"any"
-#bind_to_address	"localhost"
-
-# Unix socket to listen on
-bind_to_address		"/var/lib/mpd/socket"
+# One output has to be defined
+audio_output {
+	type	"null"
+	name	"/dev/null"
+}
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index 4db0aee7cb..5852bbe73f 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -347,8 +347,6 @@ endif
 
 define MPD_INSTALL_EXTRA_FILES
 	$(INSTALL) -m 0644 -D package/mpd/mpd.conf $(TARGET_DIR)/etc/mpd.conf
-	mkdir -p $(TARGET_DIR)/var/lib/mpd/music
-	mkdir -p $(TARGET_DIR)/var/lib/mpd/playlists
 endef
 
 MPD_POST_INSTALL_TARGET_HOOKS += MPD_INSTALL_EXTRA_FILES
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot