diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 13:36:23 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:22:03 +0200 |
| commit | 05fbf945581f512815abd8d0804ccffacbecff7b (patch) | |
| tree | 0e96b5bf698d979023c30af8d4d8c1da66099d09 | |
| parent | 0638208514d04557894f43213e2b5d5cf60f0a16 (diff) | |
| download | meta-openembedded-contrib-05fbf945581f512815abd8d0804ccffacbecff7b.tar.gz | |
mpd: move systemd support from meta-systemd back to meta-multimedia
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb | 16 | ||||
| -rw-r--r-- | meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend | 16 |
2 files changed, 14 insertions, 18 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 2b7e555078..a6b8898a4c 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" 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 \ diff --git a/meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend b/meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend deleted file mode 100644 index a3f5f3b2c7..0000000000 --- a/meta-systemd/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bbappend +++ /dev/null @@ -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" |