aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-graphics
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-16 21:08:59 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-19 02:45:28 +0200
commit823d41b46a9d3cc223bd66e13b655558d9e6a361 (patch)
treef30dd5899fe05f1d4d228bc884f913003a34bf48 /meta-oe/recipes-graphics
parent7425fdd9a25b77fb5bf32cd4d0d8b83c121c1e7a (diff)
downloadmeta-openembedded-823d41b46a9d3cc223bd66e13b655558d9e6a361.tar.gz
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@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics')
-rw-r--r--meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb11
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 aa85c8c979..d5e461a47a 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"