xserver-nodm-init: install .service and conf only with systemd in DISTRO_FEATURES
PATCH 1/2 xserver-nodm-init: install .service and conf only with systemd in DISTRO_FEATURES
* Otavio reported unpackaged files without systemd enabled
--- .../xserver-nodm-init/xserver-nodm-init_2.0.bb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb +7 -4
@@ -3,7 +3,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SECTION = "x11" -PR = "r21" +PR = "r22" SRC_URI = "file://xserver-nodm \ file://gplv2-license.patch \
@@ -23,9 +23,12 @@ do_install() { install xserver-nodm ${D}${sysconfdir}/init.d install -d ${D}${sysconfdir}/default - install -d ${D}${systemd_unitdir}/system - install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm - install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system + + if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_unitdir}/system + install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm + install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system + fi } RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit"
Signature · 1 line
1.8.1.5
PATCH 2/2 xinput-calibrator: install .service only with systemd in DISTRO_FEATURES
* Otavio reported unpackaged files without systemd enabled
--- .../recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +5 -3
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://src/calibrator.cpp;endline=22;md5=1bcba08f67cdb56f340 DEPENDS = "virtual/libx11 libxi" PV = "0.7.5+git${SRCPV}" -PR = "r5" +PR = "r6" inherit autotools systemd
@@ -26,8 +26,10 @@ do_install_append() { sed -i -e 's,^Exec=.*,Exec=${bindir}/xinput_calibrator_once.sh,' scripts/xinput_calibrator.desktop install -m 0644 scripts/xinput_calibrator.desktop ${D}${sysconfdir}/xdg/autostart - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/xinput-calibrator.service ${D}${systemd_unitdir}/system + if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/xinput-calibrator.service ${D}${systemd_unitdir}/system + fi } FILES_${PN} += "${sysconfdir}/xdg/autostart"
Signature · 1 line
1.8.1.5
Quoted 1 line · On Tuesday 16 April 2013 21:11:39 Martin Jansa wrote:
* Otavio reported unpackaged files without systemd enabled
We have this problem in a lot of recipes. I've filed this bug to fix it in systemd.bbclass itself:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=4309
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Quoted 7 lines · Paul Eggleton
Quoted 1 line · On Tuesday 16 April 2013 21:11:39 Martin Jansa wrote:
* Otavio reported unpackaged files without systemd enabled
We have this problem in a lot of recipes. I've filed this bug to fix it in systemd.bbclass itself:
Yes :/ maybe I should wait a bit more with moving them from meta-systemd to get reply here
http://lists.linuxtogo.org/pipermail/openembedded-core/2013-February/036169.html
Cheers,
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]