CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

mpd: move systemd support from meta-systemd back to meta-multimedia

Browse Source 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa 2013-04-13 13:36:23 +02:00
parent 0638208514
commit 05fbf94558
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb
View File

@ -6,7 +6,7 @@ HOMEPAGE ="http://sourceforge.net/projects/musicpd"
DEPENDS = "alsa-lib libsamplerate0 libsndfile1 libvorbis libogg faad2 ffmpeg curl sqlite bzip2 pulseaudio \
${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad lame libid3tag', d)}"
PR = "r1"
PR = "r4"
SRC_URI = " \
${SOURCEFORGE_MIRROR}/musicpd/${PN}/${PV}/${PN}-${PV}.tar.bz2 \
@ -16,9 +16,10 @@ SRC_URI = " \
SRC_URI[md5sum] = "da3f3d6617a877192db4c6f53504cd38"
SRC_URI[sha256sum] = "b18cdb1b779ca2ab323e212a0af4a567b7da4881a4e96868a8979bdfdbe7c2e8"
inherit autotools useradd
inherit autotools useradd systemd
EXTRA_OECONF = "enable_bzip2=yes"
EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
do_install_append() {
install -d ${D}/${localstatedir}/lib/mpd/music
@ -36,8 +37,19 @@ do_install_append() {
-e 's|%log_file%|${localstatedir}/log/mpd.log|' \
-e 's|%state_file%|${localstatedir}/lib/mpd/state|' \
${D}/${sysconfdir}/mpd.conf
if [ -e ${D}/${systemd_unitdir}/system/mpd.service ] ; then
sed -i \
's|^ExecStart=.*|ExecStart=${bindir}/mpd --no-daemon|' \
${D}/${systemd_unitdir}/system/mpd.service
fi
}
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "mpd.service"
USERADD_PACKAGES = "${PN}"
USERADD_PARAM_${PN} = " \
--system --no-create-home \

16
meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend
View File

@ -1,16 +0,0 @@
PRINC := "${@int(PRINC) + 2}"
inherit systemd
EXTRA_OECONF += "--with-systemdsystemunitdir=${systemd_unitdir}/system"
do_install_append() {
sed -i \
's|^ExecStart=.*|ExecStart=${bindir}/mpd --no-daemon|' \
${D}/${systemd_unitdir}/system/mpd.service
}
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
SYSTEMD_SERVICE_${PN} = "mpd.service"