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 | 7 |
1 files changed, 5 insertions, 2 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 a77c56445c..7f4e1e29f1 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 | |||
@@ -10,6 +10,7 @@ SRC_URI = "file://xserver-nodm \ | |||
10 | file://gplv2-license.patch \ | 10 | file://gplv2-license.patch \ |
11 | file://xserver-nodm.service.in \ | 11 | file://xserver-nodm.service.in \ |
12 | file://xserver-nodm.conf.in \ | 12 | file://xserver-nodm.conf.in \ |
13 | file://capability.conf \ | ||
13 | " | 14 | " |
14 | 15 | ||
15 | S = "${WORKDIR}" | 16 | S = "${WORKDIR}" |
@@ -19,7 +20,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
19 | 20 | ||
20 | inherit update-rc.d systemd distro_features_check | 21 | inherit update-rc.d systemd distro_features_check |
21 | 22 | ||
22 | REQUIRED_DISTRO_FEATURES = "x11" | 23 | REQUIRED_DISTRO_FEATURES = "x11 ${@oe.utils.conditional('ROOTLESS_X', '1', 'pam', '', d)}" |
23 | 24 | ||
24 | PACKAGECONFIG ??= "blank" | 25 | PACKAGECONFIG ??= "blank" |
25 | # dpms and screen saver will be on only if 'blank' is in PACKAGECONFIG | 26 | # dpms and screen saver will be on only if 'blank' is in PACKAGECONFIG |
@@ -40,6 +41,8 @@ do_install() { | |||
40 | if [ "${ROOTLESS_X}" = "1" ] ; then | 41 | if [ "${ROOTLESS_X}" = "1" ] ; then |
41 | XUSER_HOME="/home/xuser" | 42 | XUSER_HOME="/home/xuser" |
42 | XUSER="xuser" | 43 | XUSER="xuser" |
44 | install -D capability.conf ${D}${sysconfdir}/security/capability.conf | ||
45 | sed -i "s:@USER@:${XUSER}:" ${D}${sysconfdir}/security/capability.conf | ||
43 | else | 46 | else |
44 | XUSER_HOME=${ROOT_HOME} | 47 | XUSER_HOME=${ROOT_HOME} |
45 | XUSER="root" | 48 | XUSER="root" |
@@ -60,7 +63,7 @@ do_install() { | |||
60 | fi | 63 | fi |
61 | } | 64 | } |
62 | 65 | ||
63 | RDEPENDS_${PN} = "xinit ${@oe.utils.conditional('ROOTLESS_X', '1', 'xuser-account', '', d)}" | 66 | RDEPENDS_${PN} = "xinit ${@oe.utils.conditional('ROOTLESS_X', '1', 'xuser-account libcap libcap-bin', '', d)}" |
64 | 67 | ||
65 | INITSCRIPT_NAME = "xserver-nodm" | 68 | INITSCRIPT_NAME = "xserver-nodm" |
66 | INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ." | 69 | INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ." |