Re: [OE-core] [oe-core PATCH v7 11/13] weston-init: Add module support for the weston-start helper

[Burton, Ross]

On 17 May 2016 at 17:36, Otavio Salvador  wrote:

> +modules_dir=/usr/share/weston-start
>

Hard-coded paths in here (this, /run) - can these use symbols and get
replaced on do_install?

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core PATCH v7 11/13] weston-init: Add module support for the weston-start helper

[Otavio Salvador]

To make weston-start more flexible we now support module loading. For
such modules, following functions can be used:

 - add_weston_argument
 - add_openvt_argument

Signed-off-by: Otavio Salvador 
---

Changes in v7: None
Changes in v6: None
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2:
- Drop weston-lunch use as it requires PAM

 .../wayland/weston-init/weston-start   | 26 ++
 1 file changed, 26 insertions(+)

diff --git a/meta/recipes-graphics/wayland/weston-init/weston-start 
b/meta/recipes-graphics/wayland/weston-init/weston-start
index dc2b1ef..17b0c16 100755
--- a/meta/recipes-graphics/wayland/weston-init/weston-start
+++ b/meta/recipes-graphics/wayland/weston-init/weston-start
@@ -9,6 +9,19 @@ usage() {
 EOF
 }
 
+## Module support
+modules_dir=/usr/share/weston-start
+
+# Add weston extra argument
+add_weston_argument() {
+   weston_args="$weston_args $1"
+}
+
+# Add openvt extra argument
+add_openvt_argument() {
+   openvt_args="$openvt_args $1"
+}
+
 if test $# -lt 2; then
usage
exit 1
@@ -32,6 +45,19 @@ done
 
 weston_args=$*
 
+# Load and run modules
+if [ -d "$modules_dir" ]; then
+   for m in "$modules_dir"/*; do
+   # Skip backup files
+   if [ "`echo $m | sed -e 's/\~$//'`" != "$m" ]; then
+   continue
+   fi
+
+   # process module
+   . $m
+   done
+fi
+
 if test -z "$XDG_RUNTIME_DIR"; then
 export XDG_RUNTIME_DIR=/run/user/`id -u`
 mkdir --parents $XDG_RUNTIME_DIR
-- 
2.8.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core