fails to package when systemd is used see http://errors.yoctoproject.org/Errors/Details/198188/
On Wed, Oct 31, 2018 at 12:17 PM Max Kellermann <[email protected]> wrote: > > From: Max Kellermann <[email protected]> > > Most of the changes are because of MPD's switch from autotools to > Meson. > > Signed-off-by: Max Kellermann <[email protected]> > --- > .../recipes-multimedia/musicpd/mpd_0.20.22.bb | 99 ----------------- > .../recipes-multimedia/musicpd/mpd_0.21.bb | 101 ++++++++++++++++++ > 2 files changed, 101 insertions(+), 99 deletions(-) > delete mode 100644 meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb > create mode 100644 meta-multimedia/recipes-multimedia/musicpd/mpd_0.21.bb > > diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb > b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb > deleted file mode 100644 > index 6c6ad4237..000000000 > --- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb > +++ /dev/null > @@ -1,99 +0,0 @@ > -SUMMARY = "Music Player Daemon" > -LICENSE = "GPLv2" > -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" > -HOMEPAGE ="http://www.musicpd.org"; > - > -inherit autotools useradd systemd pkgconfig > - > -DEPENDS += " \ > - curl \ > - sqlite3 \ > - ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ > - yajl \ > - boost \ > - icu \ > - dbus \ > - expat \ > -" > - > -SRC_URI = " \ > - git://github.com/MusicPlayerDaemon/MPD;branch=v0.20.x \ > - file://mpd.conf.in \ > -" > -SRCREV = "9274bc15bc41bbe490fde847f8422468cc20375d" > -S = "${WORKDIR}/git" > - > -EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', > '--with-systemdsystemunitdir=${systemd_unitdir}/system/', > '--without-systemdsystemunitdir', d)}" > - > -PACKAGECONFIG ??= "alsa ao bzip2 daemon ffmpeg fifo flac fluidsynth iso9660 > jack libsamplerate libwrap httpd mms mpg123 modplug sndfile upnp openal opus > oss recorder vorbis wavpack zlib" > -PACKAGECONFIG += "${@bb.utils.contains('LICENSE_FLAGS', 'commercial', 'aac', > '', d)}" > - > -PACKAGECONFIG[aac] = "--enable-aac,--disable-aac,faad2" > -PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" > -PACKAGECONFIG[ao] = "--enable-ao,--disable-ao,libao" > -PACKAGECONFIG[audiofile] = "--enable-audiofile,--disable-audiofile,audiofile" > -PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2" > -PACKAGECONFIG[cdioparanoia] = > "--enable-cdio-paranoia,--disable-cdio-paranoia,libcdio-paranoia" > -PACKAGECONFIG[daemon] = "--enable-daemon,--disable-daemon" > -PACKAGECONFIG[ffmpeg] = "--enable-ffmpeg,--disable-ffmpeg,ffmpeg" > -PACKAGECONFIG[fifo] = "--enable-fifo,--disable-fifo" > -PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" > -PACKAGECONFIG[fluidsynth] = > "--enable-fluidsynth,--disable-fluidsynth,fluidsynth" > -PACKAGECONFIG[httpd] = "--enable-httpd-output,--disable-httpd-output" > -PACKAGECONFIG[id3tag] = "--enable-id3,--disable-id3,libid3tag" > -PACKAGECONFIG[iso9660] = "--enable-iso9660,--disable-iso9660,libcdio" > -PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" > -PACKAGECONFIG[lame] = "--enable-lame-encoder,--disable-lame-encoder,lame" > -PACKAGECONFIG[libsamplerate] = "--enable-lsr,--disable-lsr,libsamplerate0" > -PACKAGECONFIG[libwrap] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" > -PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" > -PACKAGECONFIG[mms] = "--enable-mms,--disable-mms,libmms" > -PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug" > -PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123" > -PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" > -PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus libogg" > -PACKAGECONFIG[oss] = "--enable-oss,--disable-oss," > -PACKAGECONFIG[recorder] = > "--enable-recorder-output,--disable-recorder-output" > -PACKAGECONFIG[smb] = "--enable-smbclient,--disable-smbclient,samba" > -PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1" > -PACKAGECONFIG[upnp] = "--enable-upnp,--disable-upnp,libupnp" > -PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis libogg" > -PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" > -PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" > - > -do_configure_prepend() { > - sed -i -e 's|libsystemd-daemon|libsystemd|' ${S}/configure.ac > -} > - > -do_install_append() { > - install -o mpd -d \ > - ${D}/${localstatedir}/lib/mpd \ > - ${D}/${localstatedir}/lib/mpd/playlists > - install -m775 -o mpd -g mpd -d \ > - ${D}/${localstatedir}/lib/mpd/music > - > - install -d ${D}/${sysconfdir} > - install -m 644 ${WORKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf > - sed -i \ > - -e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \ > - -e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \ > - -e 's|%db_file%|${localstatedir}/lib/mpd/mpd.db|' \ > - -e 's|%log_file%|${localstatedir}/log/mpd.log|' \ > - -e 's|%state_file%|${localstatedir}/lib/mpd/state|' \ > - ${D}/${sysconfdir}/mpd.conf > - > - # we don't need the icon > - rm -rf ${D}${datadir}/icons > -} > - > -RPROVIDES_${PN} += "${PN}-systemd" > -RREPLACES_${PN} += "${PN}-systemd" > -RCONFLICTS_${PN} += "${PN}-systemd" > -SYSTEMD_SERVICE_${PN} = "mpd.socket" > - > -USERADD_PACKAGES = "${PN}" > -USERADD_PARAM_${PN} = " \ > - --system --no-create-home \ > - --home ${localstatedir}/lib/mpd \ > - --groups audio \ > - --user-group mpd" > diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.21.bb > b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.21.bb > new file mode 100644 > index 000000000..c18b0ea28 > --- /dev/null > +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.21.bb > @@ -0,0 +1,101 @@ > +SUMMARY = "Music Player Daemon" > +LICENSE = "GPLv2" > +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" > +HOMEPAGE ="http://www.musicpd.org"; > + > +inherit meson useradd systemd pkgconfig > + > +DEPENDS += " \ > + curl \ > + sqlite3 \ > + ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)} \ > + yajl \ > + boost \ > + icu \ > + dbus \ > + expat \ > +" > + > +SRC_URI = " \ > + git://github.com/MusicPlayerDaemon/MPD;branch=v0.21.x \ > + file://mpd.conf.in \ > +" > +SRCREV = "795789e79d4ea1cc6555323ff6f8e33abc676278" > +S = "${WORKDIR}/git" > + > +EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', > '-Dsystemd_system_unit_dir=${systemd_unitdir}/system > -Dsystemd_user_unit_dir=${systemd_unitdir}/user', '', d)}" > + > +PACKAGECONFIG ??= "alsa ao bzip2 daemon ffmpeg fifo flac fluidsynth iso9660 > jack libsamplerate libwrap httpd mms mpg123 modplug sndfile upnp openal opus > oss recorder vorbis wavpack zlib" > +PACKAGECONFIG += "${@bb.utils.contains('LICENSE_FLAGS', 'commercial', 'aac', > '', d)}" > + > +PACKAGECONFIG[aac] = "-Dfaad=enabled,-Dfaad=disabled,faad2" > +PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" > +PACKAGECONFIG[ao] = "-Dao=enabled,-Dao=disabled,libao" > +PACKAGECONFIG[audiofile] = > "-Daudiofile=enabled,-Daudiofile=disabled,audiofile" > +PACKAGECONFIG[bzip2] = "-Dbzip2=enabled,-Dbzip2=disabled,bzip2" > +PACKAGECONFIG[cdioparanoia] = > "-Dcdio=enabled-paranoia,-Dcdio=disabled-paranoia,libcdio-paranoia" > +PACKAGECONFIG[daemon] = "-Ddaemon=enabled,-Ddaemon=false" > +PACKAGECONFIG[ffmpeg] = "-Dffmpeg=enabled,-Dffmpeg=disabled,ffmpeg" > +PACKAGECONFIG[fifo] = "-Dfifo=true,-Dfifo=false" > +PACKAGECONFIG[flac] = "-Dflac=enabled,-Dflac=disabled,flac" > +PACKAGECONFIG[fluidsynth] = > "-Dfluidsynth=enabled,-Dfluidsynth=disabled,fluidsynth" > +PACKAGECONFIG[httpd] = "-Dhttpd=true,-Dhttpd=false" > +PACKAGECONFIG[id3tag] = "-Did3tag=enabled,-Did3tag=disabled,libid3tag" > +PACKAGECONFIG[iso9660] = "-Diso9660=enabled,-Diso9660=disabled,libcdio" > +PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack" > +PACKAGECONFIG[lame] = "-Dlame=enabled,-Dlame=disabled,lame" > +PACKAGECONFIG[libsamplerate] = > "-Dlibsamplerate=enabled,-Dlibsamplerate=disabled,libsamplerate0" > +PACKAGECONFIG[libwrap] = "-Dlibwrap=enabled,-Dlibwrap=disabled,tcp-wrappers" > +PACKAGECONFIG[mad] = "-Dmad=enabled,-Dmad=disabled,libmad" > +PACKAGECONFIG[mms] = "-Dmms=enabled,-Dmms=disabled,libmms" > +PACKAGECONFIG[modplug] = "-Dmodplug=enabled,-Dmodplug=disabled,libmodplug" > +PACKAGECONFIG[mpg123] = "-Dmpg123=enabled,-Dmpg123=disabled,mpg123" > +PACKAGECONFIG[openal] = "-Dopenal=enabled,-Dopenal=disabled,openal-soft" > +PACKAGECONFIG[opus] = "-Dopus=enabled,-Dopus=disabled,libopus libogg" > +PACKAGECONFIG[oss] = "-Doss=enabled,-Doss=disabled," > +PACKAGECONFIG[qobuz] = "-Dqobuz=enabled,-Dqobuz=disabled,curl yajl libgcrypt" > +PACKAGECONFIG[recorder] = "-Drecorder=true,-Drecorder=false" > +PACKAGECONFIG[smb] = "-Dsmbclient=enabled,-Dsmbclient=disabled,samba" > +PACKAGECONFIG[sndfile] = "-Dsndfile=enabled,-Dsndfile=disabled,libsndfile1" > +PACKAGECONFIG[tidal] = "-Dtidal=enabled,-Dtidal=disabled,curl yajl" > +PACKAGECONFIG[udisks] = "-Dudisks=enabled,-Dudisks=disabled,dbus,udisks2" > +PACKAGECONFIG[upnp] = "-Dupnp=enabled,-Dupnp=disabled,libupnp" > +PACKAGECONFIG[vorbis] = "-Dvorbis=enabled,-Dvorbis=disabled,libvorbis libogg" > +PACKAGECONFIG[wavpack] = "-Dwavpack=enabled,-Dwavpack=disabled,wavpack" > +PACKAGECONFIG[zlib] = "-Dzlib=enabled,-Dzlib=disabled,zlib" > + > +do_install_append() { > + install -o mpd -d \ > + ${D}/${localstatedir}/lib/mpd \ > + ${D}/${localstatedir}/lib/mpd/playlists > + install -m775 -o mpd -g mpd -d \ > + ${D}/${localstatedir}/lib/mpd/music > + > + install -d ${D}/${sysconfdir} > + install -m 644 ${WORKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf > + sed -i \ > + -e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \ > + -e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \ > + -e 's|%db_file%|${localstatedir}/lib/mpd/mpd.db|' \ > + -e 's|%log_file%|${localstatedir}/log/mpd.log|' \ > + -e 's|%state_file%|${localstatedir}/lib/mpd/state|' \ > + ${D}/${sysconfdir}/mpd.conf > + > + # we don't need the icon > + rm -rf ${D}${datadir}/icons > + > + # we don't need the systemd user unit > + rm -rf ${D}${systemd_unitdir}/user > +} > + > +RPROVIDES_${PN} += "${PN}-systemd" > +RREPLACES_${PN} += "${PN}-systemd" > +RCONFLICTS_${PN} += "${PN}-systemd" > +SYSTEMD_SERVICE_${PN} = "mpd.socket" > + > +USERADD_PACKAGES = "${PN}" > +USERADD_PARAM_${PN} = " \ > + --system --no-create-home \ > + --home ${localstatedir}/lib/mpd \ > + --groups audio \ > + --user-group mpd" > -- > 2.19.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
