diff options
Diffstat (limited to 'meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb')
-rw-r--r-- | meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb index c2995f99ff..4e38b4da34 100644 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb | |||
@@ -1,8 +1,7 @@ | |||
1 | SUMMARY = "Simple Xserver Init Script (no dm)" | 1 | SUMMARY = "Simple Xserver Init Script (no dm)" |
2 | LICENSE = "GPLv2" | 2 | LICENSE = "GPL-2.0-only" |
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 3 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
4 | SECTION = "x11" | 4 | SECTION = "x11" |
5 | PR = "r31" | ||
6 | 5 | ||
7 | SRC_URI = "file://xserver-nodm \ | 6 | SRC_URI = "file://xserver-nodm \ |
8 | file://Xserver \ | 7 | file://Xserver \ |
@@ -52,9 +51,9 @@ do_install() { | |||
52 | sed -i "s:@NO_CURSOR_ARG@:${NO_CURSOR_ARG}:" ${D}${sysconfdir}/default/xserver-nodm | 51 | sed -i "s:@NO_CURSOR_ARG@:${NO_CURSOR_ARG}:" ${D}${sysconfdir}/default/xserver-nodm |
53 | 52 | ||
54 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then | 53 | if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then |
55 | install -d ${D}${systemd_unitdir}/system | 54 | install -d ${D}${systemd_system_unitdir} |
56 | install -m 0644 ${WORKDIR}/xserver-nodm.service.in ${D}${systemd_unitdir}/system/xserver-nodm.service | 55 | install -m 0644 ${S}/xserver-nodm.service.in ${D}${systemd_system_unitdir}/xserver-nodm.service |
57 | sed -i "s:@USER@:${XUSER}:" ${D}${systemd_unitdir}/system/xserver-nodm.service | 56 | sed -i "s:@USER@:${XUSER}:" ${D}${systemd_system_unitdir}/xserver-nodm.service |
58 | fi | 57 | fi |
59 | 58 | ||
60 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then | 59 | if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then |
@@ -63,10 +62,10 @@ do_install() { | |||
63 | fi | 62 | fi |
64 | } | 63 | } |
65 | 64 | ||
66 | RDEPENDS_${PN} = "xinit ${@oe.utils.conditional('ROOTLESS_X', '1', 'xuser-account libcap libcap-bin', '', d)}" | 65 | RDEPENDS:${PN} = "xinit ${@oe.utils.conditional('ROOTLESS_X', '1', 'xuser-account libcap libcap-bin', '', d)}" |
67 | 66 | ||
68 | INITSCRIPT_NAME = "xserver-nodm" | 67 | INITSCRIPT_NAME = "xserver-nodm" |
69 | INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ." | 68 | INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ." |
70 | SYSTEMD_SERVICE_${PN} = "xserver-nodm.service" | 69 | SYSTEMD_SERVICE:${PN} = "xserver-nodm.service" |
71 | 70 | ||
72 | RCONFLICTS_${PN} = "xserver-common (< 1.34-r9) x11-common" | 71 | RCONFLICTS:${PN} = "xserver-common (< 1.34-r9) x11-common" |