summaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-13 13:36:23 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-15 16:22:03 +0200
commit05fbf945581f512815abd8d0804ccffacbecff7b (patch)
tree0e96b5bf698d979023c30af8d4d8c1da66099d09 /meta-multimedia
parent0638208514d04557894f43213e2b5d5cf60f0a16 (diff)
downloadmeta-openembedded-05fbf945581f512815abd8d0804ccffacbecff7b.tar.gz
mpd: move systemd support from meta-systemd back to meta-multimedia
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r--meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb16
1 files changed, 14 insertions, 2 deletions
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb
index 2b7e55507..a6b8898a4 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb
@@ -6,7 +6,7 @@ HOMEPAGE ="http://sourceforge.net/projects/musicpd"
6DEPENDS = "alsa-lib libsamplerate0 libsndfile1 libvorbis libogg faad2 ffmpeg curl sqlite bzip2 pulseaudio \ 6DEPENDS = "alsa-lib libsamplerate0 libsndfile1 libvorbis libogg faad2 ffmpeg curl sqlite bzip2 pulseaudio \
7 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad lame libid3tag', d)}" 7 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad lame libid3tag', d)}"
8 8
9PR = "r1" 9PR = "r4"
10 10
11SRC_URI = " \ 11SRC_URI = " \
12 ${SOURCEFORGE_MIRROR}/musicpd/${PN}/${PV}/${PN}-${PV}.tar.bz2 \ 12 ${SOURCEFORGE_MIRROR}/musicpd/${PN}/${PV}/${PN}-${PV}.tar.bz2 \
@@ -16,9 +16,10 @@ SRC_URI = " \
16SRC_URI[md5sum] = "da3f3d6617a877192db4c6f53504cd38" 16SRC_URI[md5sum] = "da3f3d6617a877192db4c6f53504cd38"
17SRC_URI[sha256sum] = "b18cdb1b779ca2ab323e212a0af4a567b7da4881a4e96868a8979bdfdbe7c2e8" 17SRC_URI[sha256sum] = "b18cdb1b779ca2ab323e212a0af4a567b7da4881a4e96868a8979bdfdbe7c2e8"
18 18
19inherit autotools useradd 19inherit autotools useradd systemd
20 20
21EXTRA_OECONF = "enable_bzip2=yes" 21EXTRA_OECONF = "enable_bzip2=yes"
22EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
22 23
23do_install_append() { 24do_install_append() {
24 install -d ${D}/${localstatedir}/lib/mpd/music 25 install -d ${D}/${localstatedir}/lib/mpd/music
@@ -36,8 +37,19 @@ do_install_append() {
36 -e 's|%log_file%|${localstatedir}/log/mpd.log|' \ 37 -e 's|%log_file%|${localstatedir}/log/mpd.log|' \
37 -e 's|%state_file%|${localstatedir}/lib/mpd/state|' \ 38 -e 's|%state_file%|${localstatedir}/lib/mpd/state|' \
38 ${D}/${sysconfdir}/mpd.conf 39 ${D}/${sysconfdir}/mpd.conf
40
41 if [ -e ${D}/${systemd_unitdir}/system/mpd.service ] ; then
42 sed -i \
43 's|^ExecStart=.*|ExecStart=${bindir}/mpd --no-daemon|' \
44 ${D}/${systemd_unitdir}/system/mpd.service
45 fi
39} 46}
40 47
48RPROVIDES_${PN} += "${PN}-systemd"
49RREPLACES_${PN} += "${PN}-systemd"
50RCONFLICTS_${PN} += "${PN}-systemd"
51SYSTEMD_SERVICE_${PN} = "mpd.service"
52
41USERADD_PACKAGES = "${PN}" 53USERADD_PACKAGES = "${PN}"
42USERADD_PARAM_${PN} = " \ 54USERADD_PARAM_${PN} = " \
43 --system --no-create-home \ 55 --system --no-create-home \