summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-17 14:27:48 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-17 14:27:48 +0200
commit519db946405f2bfc0d205967e621ac03c420cd81 (patch)
tree944e197cf9bdf906ba408276a3dbc02f82ccbf24 /package
parentf16e906c9dae3ce783bb7ece087ec7d5ecc9f9b7 (diff)
put state file on /data and run as non-root again, as discussed with joern
Diffstat (limited to 'package')
-rw-r--r--package/mpd/Makefile8
-rw-r--r--package/mpd/files/mpd.conf6
-rw-r--r--package/mpd/files/mpd.init4
-rw-r--r--package/mpd/files/mpd.postinst3
4 files changed, 15 insertions, 6 deletions
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index df72f961d..6e90a503a 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -5,16 +5,18 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= mpd
PKG_VERSION:= 0.18.11
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= be23120f342250e8352f6499cb960fd2
PKG_DESCR:= music player daemon
PKG_SECTION:= mm/audio
-PKG_DEPENDS:= glib libstdcxx libiconv-tiny libmpdclient librt
-PKG_FDEPENDS:= glib libstdcxx libiconv-tiny libmpdclient librt
+PKG_DEPENDS:= glib libstdcxx libmpdclient librt
+PKG_FDEPENDS:= glib libstdcxx libmpdclient librt
PKG_BUILDDEP:= glib libmpdclient
PKG_URL:= http://www.musicpd.org/
PKG_SITES:= http://www.musicpd.org/download/mpd/0.18/
+PKG_BUILDDEP_UCLIBC:= libiconv-tiny
+
PKG_FLAVOURS_MPD:= WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR
PKG_FLAVOURS_MPD+= WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG
PKG_FLAVOURS_MPD+= WITH_SHOUT WITH_CURL WITH_SAMPLERATE WITH_HTTPD
diff --git a/package/mpd/files/mpd.conf b/package/mpd/files/mpd.conf
index d022a3069..300e67079 100644
--- a/package/mpd/files/mpd.conf
+++ b/package/mpd/files/mpd.conf
@@ -1,9 +1,9 @@
# An example configuration file for MPD
-user "root"
+user "mpd"
auto_update "no"
music_directory "/music"
-playlist_directory "/etc/mpd/playlists"
-state_file "/etc/mpd/state"
+playlist_directory "/data/mpd/playlists"
+state_file "/data/mpd/state"
db_file "/data/mpd/database"
pid_file "/var/run/mpd.pid"
log_file "syslog"
diff --git a/package/mpd/files/mpd.init b/package/mpd/files/mpd.init
index 1e8fe21df..abadb3ec2 100644
--- a/package/mpd/files/mpd.init
+++ b/package/mpd/files/mpd.init
@@ -12,6 +12,10 @@ autostart)
exec sh $0 start
;;
start)
+ if [ ! -d /data/mpd ];then
+ mkdir -p /data/mpd
+ chown mpd:mpd /data/mpd
+ fi
mpd
;;
stop)
diff --git a/package/mpd/files/mpd.postinst b/package/mpd/files/mpd.postinst
index b2d70b269..d7ca3edbd 100644
--- a/package/mpd/files/mpd.postinst
+++ b/package/mpd/files/mpd.postinst
@@ -1,3 +1,6 @@
#!/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