From: Otavio Salvador <otavio@ossystems.com.br> To: OpenEmbedded Core Mailing List <openembedded-core@lists.openembedded.org> Cc: prabhu.sundararaj@nxp.com, Otavio Salvador <otavio@ossystems.com.br>, meta-freescale Mailing List <meta-freescale@yoctoproject.org> Subject: [oe-core PATCH v3 4/8] weston-init: Rework init sequence to avoid code duplication Date: Wed, 4 May 2016 19:49:36 -0300 [thread overview] Message-ID: <1462402180-16861-5-git-send-email-otavio@ossystems.com.br> (raw) In-Reply-To: <1462402180-16861-1-git-send-email-otavio@ossystems.com.br> The new 'weston-start' script redcues the code duplication for SysV and SystemD based images. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- Changes in v3: - Fix log redirection - Fix argument pass for openvt Changes in v2: None meta/recipes-graphics/wayland/weston-init.bb | 4 ++- meta/recipes-graphics/wayland/weston-init/init | 9 +----- .../wayland/weston-init/weston-start | 36 ++++++++++++++++++++++ .../wayland/weston-init/weston.service | 5 +-- 4 files changed, 41 insertions(+), 13 deletions(-) create mode 100755 meta/recipes-graphics/wayland/weston-init/weston-start diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb index 4ad62cf..3a2251e 100644 --- a/meta/recipes-graphics/wayland/weston-init.bb +++ b/meta/recipes-graphics/wayland/weston-init.bb @@ -3,13 +3,15 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" SRC_URI = "file://init \ - file://weston.service" + file://weston.service \ + file://weston-start" S = "${WORKDIR}" do_install() { install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston install -Dm0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service + install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start } inherit allarch update-rc.d distro_features_check systemd diff --git a/meta/recipes-graphics/wayland/weston-init/init b/meta/recipes-graphics/wayland/weston-init/init index 2e938f4..5c925f4 100644 --- a/meta/recipes-graphics/wayland/weston-init/init +++ b/meta/recipes-graphics/wayland/weston-init/init @@ -31,14 +31,7 @@ case "$1" in start) . /etc/profile - # This is all a nasty hack - if test -z "$XDG_RUNTIME_DIR"; then - export XDG_RUNTIME_DIR=/run/user/root - mkdir --parents $XDG_RUNTIME_DIR - chmod 0700 $XDG_RUNTIME_DIR - fi - - openvt -s weston -- $OPTARGS + weston-start -s -- $OPTARGS ;; stop) diff --git a/meta/recipes-graphics/wayland/weston-init/weston-start b/meta/recipes-graphics/wayland/weston-init/weston-start new file mode 100755 index 0000000..5924c68 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston-init/weston-start @@ -0,0 +1,36 @@ +#!/bin/sh +# Copyright (C) 2016 O.S. Systems Software LTDA. + +export PATH="/sbin:/usr/sbin:/bin:/usr/bin" + +usage() { + cat <<EOF + $0 <openvt arguments> -- <weston options> +EOF +} + +if test $# -lt 2; then + usage + exit 1 +fi + +openvt_args="" +while [ -n "$1" ]; do + openvt_args="$openvt_args $1" + shift + + if [ "$1" = "--" ]; then + shift + break + fi +done + +weston_args=$* + +if test -z "$XDG_RUNTIME_DIR"; then + export XDG_RUNTIME_DIR=/run/user/`id -u` + mkdir --parents $XDG_RUNTIME_DIR + chmod 0700 $XDG_RUNTIME_DIR +fi + +exec openvt $openvt_args weston -- $weston_args 2>&1 > /var/log/weston.log diff --git a/meta/recipes-graphics/wayland/weston-init/weston.service b/meta/recipes-graphics/wayland/weston-init/weston.service index 4f1f7ff..f61d353 100644 --- a/meta/recipes-graphics/wayland/weston-init/weston.service +++ b/meta/recipes-graphics/wayland/weston-init/weston.service @@ -5,10 +5,7 @@ RequiresMountsFor=/run [Service] User=root EnvironmentFile=-/etc/default/weston -Environment="XDG_RUNTIME_DIR=/run/user/root" -ExecStartPre=/bin/mkdir -p /run/user/root -ExecStartPre=/bin/chmod 0700 /run/user/root -ExecStart=/usr/bin/openvt -v -e /usr/bin/weston -- $OPTARGS +ExecStart=/usr/bin/weston-start -v -e -- $OPTARGS [Install] WantedBy=multi-user.target -- 2.8.2
WARNING: multiple messages have this Message-ID (diff)
From: Otavio Salvador <otavio@ossystems.com.br> To: OpenEmbedded Core Mailing List <openembedded-core@lists.openembedded.org> Cc: prabhu.sundararaj@nxp.com, Otavio Salvador <otavio@ossystems.com.br>, neenareddy.busireddy@nxp.com, meta-freescale Mailing List <meta-freescale@yoctoproject.org> Subject: [oe-core PATCH v3 4/8] weston-init: Rework init sequence to avoid code duplication Date: Wed, 4 May 2016 19:49:36 -0300 [thread overview] Message-ID: <1462402180-16861-5-git-send-email-otavio@ossystems.com.br> (raw) In-Reply-To: <1462402180-16861-1-git-send-email-otavio@ossystems.com.br> The new 'weston-start' script redcues the code duplication for SysV and SystemD based images. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- Changes in v3: - Fix log redirection - Fix argument pass for openvt Changes in v2: None meta/recipes-graphics/wayland/weston-init.bb | 4 ++- meta/recipes-graphics/wayland/weston-init/init | 9 +----- .../wayland/weston-init/weston-start | 36 ++++++++++++++++++++++ .../wayland/weston-init/weston.service | 5 +-- 4 files changed, 41 insertions(+), 13 deletions(-) create mode 100755 meta/recipes-graphics/wayland/weston-init/weston-start diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb index 4ad62cf..3a2251e 100644 --- a/meta/recipes-graphics/wayland/weston-init.bb +++ b/meta/recipes-graphics/wayland/weston-init.bb @@ -3,13 +3,15 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" SRC_URI = "file://init \ - file://weston.service" + file://weston.service \ + file://weston-start" S = "${WORKDIR}" do_install() { install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston install -Dm0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service + install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start } inherit allarch update-rc.d distro_features_check systemd diff --git a/meta/recipes-graphics/wayland/weston-init/init b/meta/recipes-graphics/wayland/weston-init/init index 2e938f4..5c925f4 100644 --- a/meta/recipes-graphics/wayland/weston-init/init +++ b/meta/recipes-graphics/wayland/weston-init/init @@ -31,14 +31,7 @@ case "$1" in start) . /etc/profile - # This is all a nasty hack - if test -z "$XDG_RUNTIME_DIR"; then - export XDG_RUNTIME_DIR=/run/user/root - mkdir --parents $XDG_RUNTIME_DIR - chmod 0700 $XDG_RUNTIME_DIR - fi - - openvt -s weston -- $OPTARGS + weston-start -s -- $OPTARGS ;; stop) diff --git a/meta/recipes-graphics/wayland/weston-init/weston-start b/meta/recipes-graphics/wayland/weston-init/weston-start new file mode 100755 index 0000000..5924c68 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston-init/weston-start @@ -0,0 +1,36 @@ +#!/bin/sh +# Copyright (C) 2016 O.S. Systems Software LTDA. + +export PATH="/sbin:/usr/sbin:/bin:/usr/bin" + +usage() { + cat <<EOF + $0 <openvt arguments> -- <weston options> +EOF +} + +if test $# -lt 2; then + usage + exit 1 +fi + +openvt_args="" +while [ -n "$1" ]; do + openvt_args="$openvt_args $1" + shift + + if [ "$1" = "--" ]; then + shift + break + fi +done + +weston_args=$* + +if test -z "$XDG_RUNTIME_DIR"; then + export XDG_RUNTIME_DIR=/run/user/`id -u` + mkdir --parents $XDG_RUNTIME_DIR + chmod 0700 $XDG_RUNTIME_DIR +fi + +exec openvt $openvt_args weston -- $weston_args 2>&1 > /var/log/weston.log diff --git a/meta/recipes-graphics/wayland/weston-init/weston.service b/meta/recipes-graphics/wayland/weston-init/weston.service index 4f1f7ff..f61d353 100644 --- a/meta/recipes-graphics/wayland/weston-init/weston.service +++ b/meta/recipes-graphics/wayland/weston-init/weston.service @@ -5,10 +5,7 @@ RequiresMountsFor=/run [Service] User=root EnvironmentFile=-/etc/default/weston -Environment="XDG_RUNTIME_DIR=/run/user/root" -ExecStartPre=/bin/mkdir -p /run/user/root -ExecStartPre=/bin/chmod 0700 /run/user/root -ExecStart=/usr/bin/openvt -v -e /usr/bin/weston -- $OPTARGS +ExecStart=/usr/bin/weston-start -v -e -- $OPTARGS [Install] WantedBy=multi-user.target -- 2.8.2
next prev parent reply other threads:[~2016-05-04 22:50 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-05-04 22:49 [oe-core PATCH v3 0/8] Improve Xwayland integration Otavio Salvador 2016-05-04 22:49 ` Otavio Salvador 2016-05-04 22:49 ` [oe-core PATCH v3 1/8] weston: Enable XWayland when X11 and Wayland support are available Otavio Salvador 2016-05-04 22:49 ` Otavio Salvador 2016-05-04 22:49 ` [oe-core PATCH v3 2/8] weston: Remove XWayland dependencies on PACKAGECONFIG Otavio Salvador 2016-05-04 22:49 ` Otavio Salvador 2016-05-04 22:49 ` [oe-core PATCH v3 3/8] weston-init: Rework do_install to use install -D option Otavio Salvador 2016-05-04 22:49 ` Otavio Salvador 2016-05-04 22:49 ` Otavio Salvador [this message] 2016-05-04 22:49 ` [oe-core PATCH v3 4/8] weston-init: Rework init sequence to avoid code duplication Otavio Salvador 2016-05-04 22:49 ` [oe-core PATCH v3 5/8] weston-init: Error out if loading a nested instance Otavio Salvador 2016-05-04 22:49 ` Otavio Salvador 2016-05-04 22:49 ` [oe-core PATCH v3 6/8] weston-init: Add module support for the weston-start helper Otavio Salvador 2016-05-04 22:49 ` Otavio Salvador 2016-05-04 22:49 ` [oe-core PATCH v3 7/8] weston: Add Xwayland initialization support using weston-start Otavio Salvador 2016-05-04 22:49 ` Otavio Salvador 2016-05-04 22:49 ` [oe-core PATCH v3 8/8] core-image-weston: If X11 is enabled, add XWayland support Otavio Salvador 2016-05-04 22:49 ` Otavio Salvador
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1462402180-16861-5-git-send-email-otavio@ossystems.com.br \ --to=otavio@ossystems.com.br \ --cc=meta-freescale@yoctoproject.org \ --cc=openembedded-core@lists.openembedded.org \ --cc=prabhu.sundararaj@nxp.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.