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 | 5 |
1 files changed, 5 insertions, 0 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 a6d0d5eeea..62da11800c 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 | |||
@@ -6,6 +6,7 @@ PR = "r31" | |||
6 | 6 | ||
7 | SRC_URI = "file://xserver-nodm \ | 7 | SRC_URI = "file://xserver-nodm \ |
8 | file://Xserver \ | 8 | file://Xserver \ |
9 | file://X11 \ | ||
9 | file://gplv2-license.patch \ | 10 | file://gplv2-license.patch \ |
10 | file://xserver-nodm.service.in \ | 11 | file://xserver-nodm.service.in \ |
11 | file://xserver-nodm.conf.in \ | 12 | file://xserver-nodm.conf.in \ |
@@ -29,6 +30,9 @@ do_install() { | |||
29 | install xserver-nodm.conf.in ${D}${sysconfdir}/default/xserver-nodm | 30 | install xserver-nodm.conf.in ${D}${sysconfdir}/default/xserver-nodm |
30 | install -d ${D}${sysconfdir}/xserver-nodm | 31 | install -d ${D}${sysconfdir}/xserver-nodm |
31 | install Xserver ${D}${sysconfdir}/xserver-nodm/Xserver | 32 | install Xserver ${D}${sysconfdir}/xserver-nodm/Xserver |
33 | install -d ${D}${sysconfdir}/X11/Xsession.d | ||
34 | install X11/Xsession.d/* ${D}${sysconfdir}/X11/Xsession.d/ | ||
35 | install X11/Xsession ${D}${sysconfdir}/X11/ | ||
32 | 36 | ||
33 | BLANK_ARGS="${@bb.utils.contains('PACKAGECONFIG', 'blank', '', '-s 0 -dpms', d)}" | 37 | BLANK_ARGS="${@bb.utils.contains('PACKAGECONFIG', 'blank', '', '-s 0 -dpms', d)}" |
34 | if [ "${ROOTLESS_X}" = "1" ] ; then | 38 | if [ "${ROOTLESS_X}" = "1" ] ; then |
@@ -59,3 +63,4 @@ INITSCRIPT_NAME = "xserver-nodm" | |||
59 | INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ." | 63 | INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ." |
60 | SYSTEMD_SERVICE_${PN} = "xserver-nodm.service" | 64 | SYSTEMD_SERVICE_${PN} = "xserver-nodm.service" |
61 | 65 | ||
66 | RCONFLICTS_${PN} = "xserver-common (< 1.34-r9) x11-common" | ||