[meta-oe][PATCH 1/2] xserver-nodm-init: install .service and conf only with systemd in DISTRO_FEATURES

[meta-oe][PATCH 1/2] xserver-nodm-init: install .service and conf only with systemd in DISTRO_FEATURES

[Martin Jansa]

* Otavio reported unpackaged files without systemd enabled

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../xserver-nodm-init/xserver-nodm-init_2.0.bb                | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
index aa85c8c..d5e461a 100644
--- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
+++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
@@ -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"
-- 
1.8.1.5

[meta-oe][PATCH 2/2] xinput-calibrator: install .service only with systemd in DISTRO_FEATURES

[Martin Jansa]

* Otavio reported unpackaged files without systemd enabled

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
index 593d465..640aef1 100644
--- a/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
+++ b/meta-oe/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
@@ -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"
-- 
1.8.1.5

Re: [meta-oe][PATCH 1/2] xserver-nodm-init: install .service and conf only with systemd in DISTRO_FEATURES

[Paul Eggleton]

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

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [meta-oe][PATCH 1/2] xserver-nodm-init: install .service and conf only with systemd in DISTRO_FEATURES

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 608 bytes --]

On Wed, Apr 17, 2013 at 09:51:45AM +0100, Paul Eggleton wrote:
> 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

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,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]