diff options
Diffstat (limited to 'external/poky/meta/recipes-graphics/wayland/weston-init')
| -rw-r--r-- | external/poky/meta/recipes-graphics/wayland/weston-init/71-weston-drm.rules | 2 | ||||
| -rw-r--r-- | external/poky/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini | 2 | ||||
| -rw-r--r-- | external/poky/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini | 0 | ||||
| -rw-r--r-- | external/poky/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini | 0 | ||||
| -rwxr-xr-x | external/poky/meta/recipes-graphics/wayland/weston-init/weston-start | 29 | ||||
| -rw-r--r-- | external/poky/meta/recipes-graphics/wayland/weston-init/weston.env | 0 | ||||
| -rw-r--r-- | external/poky/meta/recipes-graphics/wayland/weston-init/weston.ini | 75 | ||||
| -rw-r--r-- | external/poky/meta/recipes-graphics/wayland/weston-init/weston@.service (renamed from external/poky/meta/recipes-graphics/wayland/weston-init/weston.service) | 12 |
8 files changed, 107 insertions, 13 deletions
diff --git a/external/poky/meta/recipes-graphics/wayland/weston-init/71-weston-drm.rules b/external/poky/meta/recipes-graphics/wayland/weston-init/71-weston-drm.rules new file mode 100644 index 00000000..1a1b8bbd --- /dev/null +++ b/external/poky/meta/recipes-graphics/wayland/weston-init/71-weston-drm.rules @@ -0,0 +1,2 @@ +ACTION=="add", SUBSYSTEM=="graphics", KERNEL=="fb0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="weston@root.service" +ACTION=="add", SUBSYSTEM=="drm", KERNEL=="card0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="weston@root.service" diff --git a/external/poky/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini b/external/poky/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini new file mode 100644 index 00000000..17ebd7fd --- /dev/null +++ b/external/poky/meta/recipes-graphics/wayland/weston-init/qemuall/weston.ini @@ -0,0 +1,2 @@ +[core] +backend=fbdev-backend.so diff --git a/external/poky/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini b/external/poky/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/external/poky/meta/recipes-graphics/wayland/weston-init/qemux86-64/weston.ini diff --git a/external/poky/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini b/external/poky/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/external/poky/meta/recipes-graphics/wayland/weston-init/qemux86/weston.ini diff --git a/external/poky/meta/recipes-graphics/wayland/weston-init/weston-start b/external/poky/meta/recipes-graphics/wayland/weston-init/weston-start index e72fbaaa..ccc70934 100755 --- a/external/poky/meta/recipes-graphics/wayland/weston-init/weston-start +++ b/external/poky/meta/recipes-graphics/wayland/weston-init/weston-start @@ -5,8 +5,8 @@ export PATH="/sbin:/usr/sbin:/bin:/usr/bin" usage() { - cat <<EOF - $0 [<openvt arguments>] [-- <weston options>] + cat <<EOF + $0 [<openvt arguments>] [-- <weston options>] EOF } @@ -27,10 +27,19 @@ if [ -n "$WAYLAND_DISPLAY" ]; then echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet." exit 1 fi + +if [ -n "$WESTON_USER" ]; then + if [ -z "$WESTON_TTY" ]; then + echo "ERROR: If you have WESTON_USER variable set, you also need WESTON_TTY." + exit 1 + fi + weston_args_user="-u $WESTON_USER -t $WESTON_TTY" +fi + if [ -n "$DISPLAY" ]; then launcher="weston" else - launcher="weston-launch --" + launcher="weston-launch $weston_args_user --" fi openvt_args="-s" @@ -59,11 +68,15 @@ if [ -d "$modules_dir" ]; then fi if test -z "$XDG_RUNTIME_DIR"; then - export XDG_RUNTIME_DIR=/run/user/`id -u` - if ! test -d "$XDG_RUNTIME_DIR"; then - mkdir --parents $XDG_RUNTIME_DIR - chmod 0700 $XDG_RUNTIME_DIR - fi + export XDG_RUNTIME_DIR=/run/user/`id -u ${WESTON_USER}` + if ! test -d "$XDG_RUNTIME_DIR"; then + mkdir --parents $XDG_RUNTIME_DIR + chmod 0700 $XDG_RUNTIME_DIR + fi + if [ -n "$WESTON_USER" ] + then + chown $WESTON_USER:$WESTON_USER $XDG_RUNTIME_DIR + fi fi exec openvt $openvt_args -- $launcher $weston_args --log=@LOCALSTATEDIR@/log/weston.log diff --git a/external/poky/meta/recipes-graphics/wayland/weston-init/weston.env b/external/poky/meta/recipes-graphics/wayland/weston-init/weston.env new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/external/poky/meta/recipes-graphics/wayland/weston-init/weston.env diff --git a/external/poky/meta/recipes-graphics/wayland/weston-init/weston.ini b/external/poky/meta/recipes-graphics/wayland/weston-init/weston.ini new file mode 100644 index 00000000..1e6dff68 --- /dev/null +++ b/external/poky/meta/recipes-graphics/wayland/weston-init/weston.ini @@ -0,0 +1,75 @@ +# configuration file for Weston + +[core] +#modules=xwayland.so,cms-colord.so +#shell=desktop-shell.so +#gbm-format=xrgb2101010 +require-input=false + +#[shell] +#background-image=/usr/share/backgrounds/gnome/Aqua.jpg +#background-color=0xff002244 +#background-type=tile +#clock-format=minutes +#panel-color=0x90ff0000 +#locking=true +#animation=zoom +#startup-animation=fade +#binding-modifier=ctrl +#num-workspaces=6 +#cursor-theme=whiteglass +#cursor-size=24 + +#lockscreen-icon=/usr/share/icons/gnome/256x256/actions/lock.png +#lockscreen=/usr/share/backgrounds/gnome/Garden.jpg +#homescreen=/usr/share/backgrounds/gnome/Blinds.jpg +#animation=fade + +#[launcher] +#icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png +#path=/usr/bin/gnome-terminal + +#[launcher] +#icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png +#path=/usr/bin/weston-terminal + +#[launcher] +#icon=/usr/share/icons/hicolor/24x24/apps/google-chrome.png +#path=/usr/bin/google-chrome + +#[launcher] +#icon=/usr/share/icons/gnome/24x24/apps/arts.png +#path=/build/weston-0lEgCh/weston-1.11.0/weston-flower + +#[input-method] +#path=/usr/lib/weston/weston-keyboard + +#[output] +#name=LVDS1 +#mode=1680x1050 +#transform=90 +#icc_profile=/usr/share/color/icc/colord/Bluish.icc + +#[output] +#name=VGA1 +#mode=173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync +#transform=flipped + +#[output] +#name=X1 +#mode=1024x768 +#transform=flipped-90 + +#[libinput] +#enable_tap=true + +#[touchpad] +#constant_accel_factor = 50 +#min_accel_factor = 0.16 +#max_accel_factor = 1.0 + +#[screen-share] +#command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize + +#[xwayland] +#path=/usr/bin/Xwayland diff --git a/external/poky/meta/recipes-graphics/wayland/weston-init/weston.service b/external/poky/meta/recipes-graphics/wayland/weston-init/weston@.service index 18f72626..39e19301 100644 --- a/external/poky/meta/recipes-graphics/wayland/weston-init/weston.service +++ b/external/poky/meta/recipes-graphics/wayland/weston-init/weston@.service @@ -1,13 +1,15 @@ [Unit] Description=Weston Wayland Compositor RequiresMountsFor=/run +Conflicts=plymouth-quit.service +After=systemd-user-sessions.service plymouth-quit-wait.service [Service] -User=root +User=%i PAMName=login EnvironmentFile=-/etc/default/weston -ExecStart=/usr/bin/weston-start -v -e -- $OPTARGS - -[Install] -WantedBy=multi-user.target +StandardError=journal +PermissionsStartOnly=true +IgnoreSIGPIPE=no +ExecStart=/usr/bin/weston-start -v -e -- $OPTARGS |