[oe-commits] Martin Jansa : xserver-nodm-init: install . service and conf only with systemd in DISTRO_FEATURES
git at git.openembedded.org
git at git.openembedded.org
Fri Apr 19 00:43:05 UTC 2013
Module: meta-openembedded.git
Branch: master
Commit: 823d41b46a9d3cc223bd66e13b655558d9e6a361
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=823d41b46a9d3cc223bd66e13b655558d9e6a361
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Tue Apr 16 21:08:59 2013 +0200
xserver-nodm-init: install .service and conf only with systemd in DISTRO_FEATURES
* Otavio reported unpackaged files without systemd enabled
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
.../xserver-nodm-init/xserver-nodm-init_2.0.bb | 11 +++++++----
1 files 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"
More information about the Openembedded-commits
mailing list