summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2016-06-09 14:27:05 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-12 23:47:17 +0100
commit7950a90bcc6865236b55fcc9559f3d8327d65b3c (patch)
tree24034be48e44a364a6fef12fa076afcdaae2622a /meta
parentbe82bdd59296be434d3f5a97e563e3a7d208f285 (diff)
downloadpoky-7950a90bcc6865236b55fcc9559f3d8327d65b3c.tar.gz
weston-init: Use bitbake path variable
(From OE-Core rev: 537afef2209bef327a28234207d1ef7e4e596a6e) Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/wayland/weston-init.bb1
-rwxr-xr-xmeta/recipes-graphics/wayland/weston-init/weston-start2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb
index e4e2701af7..291cd16b2a 100644
--- a/meta/recipes-graphics/wayland/weston-init.bb
+++ b/meta/recipes-graphics/wayland/weston-init.bb
@@ -15,6 +15,7 @@ do_install() {
15 # Install weston-start script 15 # Install weston-start script
16 install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start 16 install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start
17 sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start 17 sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start
18 sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start
18} 19}
19 20
20inherit allarch update-rc.d distro_features_check systemd 21inherit allarch update-rc.d distro_features_check systemd
diff --git a/meta/recipes-graphics/wayland/weston-init/weston-start b/meta/recipes-graphics/wayland/weston-init/weston-start
index 72ba4b7079..4b41576103 100755
--- a/meta/recipes-graphics/wayland/weston-init/weston-start
+++ b/meta/recipes-graphics/wayland/weston-init/weston-start
@@ -69,4 +69,4 @@ if test -z "$XDG_RUNTIME_DIR"; then
69 chmod 0700 $XDG_RUNTIME_DIR 69 chmod 0700 $XDG_RUNTIME_DIR
70fi 70fi
71 71
72exec openvt $openvt_args -- $launcher $weston_args --log=/var/log/weston.log 72exec openvt $openvt_args -- $launcher $weston_args --log=@LOCALSTATEDIR@/log/weston.log