From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1ioqmm-0001wM-P9 for ptxdist@pengutronix.de; Tue, 07 Jan 2020 16:28:50 +0100 Received: by mail-wr1-x430.google.com with SMTP id y17so54440140wrh.5 for ; Tue, 07 Jan 2020 07:28:48 -0800 (PST) From: =?UTF-8?q?Guillermo=20Rodr=C3=ADguez?= Date: Tue, 7 Jan 2020 16:28:40 +0100 Message-Id: <20200107152840.386-1-guille.rodriguez@gmail.com> In-Reply-To: <20191212125457.26860-1-guille.rodriguez@gmail.com> References: <20191212125457.26860-1-guille.rodriguez@gmail.com> MIME-Version: 1.0 Subject: [ptxdist] [PATCH v2] weston: Add init script List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Cc: =?UTF-8?q?Guillermo=20Rodr=C3=ADguez?= Signed-off-by: Guillermo Rodriguez --- v2: Proper handling of init script and link projectroot/etc/init.d/weston-init | 29 +++++++++++++++++++++++++++++ rules/weston-bbinit.in | 8 ++++++++ rules/weston.in | 5 +++++ rules/weston.make | 11 +++++++++++ 4 files changed, 53 insertions(+) create mode 100644 projectroot/etc/init.d/weston-init create mode 100644 rules/weston-bbinit.in diff --git a/projectroot/etc/init.d/weston-init b/projectroot/etc/init.d/weston-init new file mode 100644 index 000000000..fa6b96b07 --- /dev/null +++ b/projectroot/etc/init.d/weston-init @@ -0,0 +1,29 @@ +#!/bin/sh + +start() { + OPENVT_ARGS="-c 1 -s" + WESTON_ARGS="--log=/var/log/weston.log" + + test -f /etc/default/weston-init && . /etc/default/weston-init + + if [ -z "$XDG_RUNTIME_DIR" ]; then + export XDG_RUNTIME_DIR=/run/xdg + mkdir -p "$XDG_RUNTIME_DIR" + chmod 0700 "$XDG_RUNTIME_DIR" + fi + + echo "Starting Weston" + exec openvt $OPENVT_ARGS -- weston $WESTON_ARGS +} + +stop() { + echo "Stopping Weston" + killall -q weston +} + +case $1 in + start|stop) $1 ;; + restart) stop ; sleep 1 ; start ;; + + *) echo "Usage: $0 {start|stop|restart}"; exit 1 ;; +esac diff --git a/rules/weston-bbinit.in b/rules/weston-bbinit.in new file mode 100644 index 000000000..f0994d27e --- /dev/null +++ b/rules/weston-bbinit.in @@ -0,0 +1,8 @@ +## SECTION=initmethod_bbinit + +config WESTON_BBINIT_LINK + string + depends on WESTON_STARTSCRIPT + prompt "weston-init" + default "S92weston-init" + diff --git a/rules/weston.in b/rules/weston.in index d2ef2119b..75945d7e6 100644 --- a/rules/weston.in +++ b/rules/weston.in @@ -75,6 +75,11 @@ config WESTON_LAUNCH weston-launch is a setuid-root program which does privileged operations on Weston's behalf +config WESTON_STARTSCRIPT + bool + default INITMETHOD_BBINIT + prompt "install /etc/init.d/weston-init" + config WESTON_SYSTEMD bool default INITMETHOD_SYSTEMD diff --git a/rules/weston.make b/rules/weston.make index 4c38fd2d1..eaabebe61 100644 --- a/rules/weston.make +++ b/rules/weston.make @@ -171,6 +171,17 @@ ifdef PTXCONF_WESTON_SYSTEMD @$(call install_lib, weston, 0, 0, 0644, weston/systemd-notify) endif +ifdef PTXCONF_INITMETHOD_BBINIT +ifdef PTXCONF_WESTON_STARTSCRIPT + @$(call install_alternative, weston, 0, 0, 0755, /etc/init.d/weston-init) +ifneq ($(call remove_quotes,$(PTXCONF_WESTON_BBINIT_LINK)),) + @$(call install_link, weston, \ + ../init.d/weston-init, \ + /etc/rc.d/$(PTXCONF_WESTON_BBINIT_LINK)) +endif +endif +endif + @$(call install_copy, weston, 0, 0, 0755, -, /usr/libexec/weston-simple-im) @$(call install_copy, weston, 0, 0, 0755, -, /usr/libexec/weston-desktop-shell) @$(call install_copy, weston, 0, 0, 0755, -, /usr/libexec/weston-keyboard) -- 2.21.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de