summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorAdrian <adrian.fiergolski@fastree3d.com>2021-03-15 16:01:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-20 18:54:56 +0000
commit991a49fb99dbb55803b1ae22f76e99256ad03996 (patch)
treee5d90359daac9feb4563bcb4057ad50f70214f8f /meta/recipes-graphics
parent7b9601d49c1a543e1c1c8efb150bb7bde0e37ab4 (diff)
downloadpoky-991a49fb99dbb55803b1ae22f76e99256ad03996.tar.gz
weston-init: Set $HOME variable for SysVinit manager
SysVinit sets by default the $HOME directory to "/" for the init scripts. It's picked then by the weston-launcher and make weston-terminal to have wrongly set $HOME environment variable for the root user. (From OE-Core rev: f5ddf5533b19a41be9e9cd403c2e7ded6da6f272) Signed-off-by: Adrian Fiergolski <adrian.fiergolski@fastree3d.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/wayland/weston-init.bb1
-rw-r--r--meta/recipes-graphics/wayland/weston-init/init1
2 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb
index 65d7b81dc5..6b78e6722f 100644
--- a/meta/recipes-graphics/wayland/weston-init.bb
+++ b/meta/recipes-graphics/wayland/weston-init.bb
@@ -30,6 +30,7 @@ DEFAULTBACKEND_x86-x32 = "fbdev"
30do_install() { 30do_install() {
31 if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then 31 if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then
32 install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston 32 install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston
33 sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}/${sysconfdir}/init.d/weston
33 fi 34 fi
34 install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini 35 install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini
35 install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston 36 install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston
diff --git a/meta/recipes-graphics/wayland/weston-init/init b/meta/recipes-graphics/wayland/weston-init/init
index d3e87c6cef..a849f29bcb 100644
--- a/meta/recipes-graphics/wayland/weston-init/init
+++ b/meta/recipes-graphics/wayland/weston-init/init
@@ -30,6 +30,7 @@ done
30case "$1" in 30case "$1" in
31 start) 31 start)
32 . /etc/profile 32 . /etc/profile
33 export HOME=ROOTHOME
33 34
34 weston-start -- $OPTARGS 35 weston-start -- $OPTARGS
35 ;; 36 ;;