diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-07-11 17:29:05 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-07-11 17:29:48 +0200 |
| commit | 6222925ea120fc7acc520a79dd8bda0979b7a392 (patch) | |
| tree | 3c9bfa3095183d292f830fe3f4f53cbbb774e7a7 /package/mpd | |
| parent | a599610f7b2992a832561ce09b81c7d66409eb83 (diff) | |
make default mpdbox collection working out of the box
Diffstat (limited to 'package/mpd')
| -rw-r--r-- | package/mpd/Makefile | 5 | ||||
| -rw-r--r-- | package/mpd/files/mpd.conf | 4 | ||||
| -rw-r--r-- | package/mpd/files/mpd.init | 5 | ||||
| -rw-r--r-- | package/mpd/files/mpd.postinst | 4 |
4 files changed, 10 insertions, 8 deletions
diff --git a/package/mpd/Makefile b/package/mpd/Makefile index c12af7446..13cdf3a70 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= mpd PKG_VERSION:= 0.18.11 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= be23120f342250e8352f6499cb960fd2 PKG_DESCR:= music player daemon PKG_SECTION:= mm/audio @@ -254,7 +254,8 @@ CONFIGURE_ARGS+= --disable-opus endif mpd-install: - ${INSTALL_DIR} ${IDIR_MPD}/usr/bin ${IDIR_MPD}/etc/mpd/playlists + ${INSTALL_DIR} ${IDIR_MPD}/etc + ${INSTALL_DIR} ${IDIR_MPD}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/mpd ${IDIR_MPD}/usr/bin ${INSTALL_DATA} ./files/mpd.conf ${IDIR_MPD}/etc/mpd.conf diff --git a/package/mpd/files/mpd.conf b/package/mpd/files/mpd.conf index 9da4517fd..96fdb190e 100644 --- a/package/mpd/files/mpd.conf +++ b/package/mpd/files/mpd.conf @@ -1,7 +1,7 @@ # An example configuration file for MPD user "mpd" auto_update "no" -music_directory "/music" +music_directory "/media/music" playlist_directory "/data/mpd/playlists" state_file "/data/mpd/state" db_file "/data/mpd/database" @@ -9,6 +9,8 @@ pid_file "/var/run/mpd/mpd.pid" log_file "syslog" filesystem_charset "UTF-8" id3v1_encoding "UTF-8" +mixer_type "disabled" + # An example of an ALSA output audio_output { type "alsa" diff --git a/package/mpd/files/mpd.init b/package/mpd/files/mpd.init index a6d40652f..d6e111cbf 100644 --- a/package/mpd/files/mpd.init +++ b/package/mpd/files/mpd.init @@ -14,12 +14,13 @@ autostart) start) if [ ! -d /var/run/mpd ];then mkdir -p /var/run/mpd - chown mpd:mpd /var/run/mpd + chown mpd:audio /var/run/mpd fi if [ ! -d /data/mpd ];then mkdir -p /data/mpd - chown mpd:mpd /data/mpd fi + touch /data/mpd/state + chown -R mpd:audio /data/mpd mpd ;; stop) diff --git a/package/mpd/files/mpd.postinst b/package/mpd/files/mpd.postinst index d7ca3edbd..b2d75177c 100644 --- a/package/mpd/files/mpd.postinst +++ b/package/mpd/files/mpd.postinst @@ -1,6 +1,4 @@ #!/bin/sh . $IPKG_INSTROOT/etc/functions.sh add_rcconf mpd NO -gid=$(get_next_gid) -add_group mpd $gid -add_user mpd $(get_next_uid) $gid /music +add_user mpd $(get_next_uid) 7 /media/music |