From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from vms173017pub.verizon.net (vms173017pub.verizon.net [206.46.173.17]) by arago-project.org (Postfix) with ESMTPS id 52FB05299C for ; Thu, 28 Apr 2016 19:46:39 +0000 (UTC) Received: from vz-proxy-l003.mx.aol.com ([64.236.82.155]) by vms173017.mailsrvcs.net (Oracle Communications Messaging Server 7.0.5.32.0 64bit (built Jul 16 2014)) with ESMTPA id <0O6D008AM09CS750@vms173017.mailsrvcs.net> for meta-arago@arago-project.org; Thu, 28 Apr 2016 14:46:24 -0500 (CDT) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=EdU1O6SC c=1 sm=1 tr=0 a=i+tV1o3iWEoTTvx3QNPGxA==:117 a=kj9zAlcOel0A:10 a=kziv93cY1bsA:10 a=HihYlcsHAAAA:8 a=sozttTNsAAAA:8 a=z17zrtLhX3PR0ckdwJ4A:9 a=CjuIK1q_8ugA:10 Received: by 100.15.86.14 with SMTP id 320eaa0e; Thu, 28 Apr 2016 19:46:24 GMT Received: by gandalf.denix.org (Postfix, from userid 1000) id 8C4BE161FD1; Thu, 28 Apr 2016 15:46:23 -0400 (EDT) Date: Thu, 28 Apr 2016 15:46:23 -0400 From: Denys Dmytriyenko To: meta-arago@arago-project.org Message-id: <20160428194623.GA17066@denix.org> References: <20160127210049.58111529C9@arago-project.org> MIME-version: 1.0 In-reply-to: <20160127210049.58111529C9@arago-project.org> User-Agent: Mutt/1.5.20 (2009-06-14) Cc: Gou@denix.org Subject: Re: [arago-commits] Gou, Hongmei : weston-init: update init scripts related to restarting Weston X-BeenThere: meta-arago@arago-project.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Arago metadata layer for TI SDKs - OE-Core/Yocto compatible List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2016 19:46:39 -0000 Content-type: text/plain; charset=us-ascii Content-disposition: inline So, I was looking into Weston init script lately for another reason and noticed there was a hole in its logic. From the logs I came to this commit made few months ago. Particularly, I'm interested why the first part of the change was made: * Bypass restarting Weston if SD card has calibration file already This seems incorrect, because if calibration file is only available on SD card, it has to be copied to /etc and in order to take immediate effect, udev has to be reloaded and weston has to be restarted, which how it used to be before. Why is this now bypassed? Please provide details of what this change is meant to address and how is it supposed to work. Thanks. -- Denys On Wed, Jan 27, 2016 at 09:00:49PM +0000, Arago Project git wrote: > Module: meta-arago > Branch: master > Commit: b057be5db06e0f2e0ebb649841e64f60a997c2c1 > URL: http://arago-project.org/git/meta-arago.git?a=commit;h=b057be5db06e0f2e0ebb649841e64f60a997c2c1 > > Author: Gou, Hongmei > Date: Thu Jan 28 01:48:05 2016 +0000 > > weston-init: update init scripts related to restarting Weston > > * Bypass restarting Weston if SD card has calibration file already > > * Increase the sleep time before Weston is restarted > It takes some time to complete the Weston termination procedure. > If Weston is restarted before the previous instance is fully > terminated, the restart of Weston will fail. > > Signed-off-by: Hongmei Gou > Signed-off-by: Eric Ruei > Signed-off-by: Denys Dmytriyenko > > --- > > .../recipes-graphics/wayland/weston-init.bbappend | 2 +- > .../recipes-graphics/wayland/weston-init/init | 7 ++++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend > index d9e15b6..4b5ad93 100644 > --- a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend > +++ b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend > @@ -1,4 +1,4 @@ > -PR_append = "-arago4" > +PR_append = "-arago5" > > FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" > > diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init/init b/meta-arago-distro/recipes-graphics/wayland/weston-init/init > index 2e2ae36..494584f 100644 > --- a/meta-arago-distro/recipes-graphics/wayland/weston-init/init > +++ b/meta-arago-distro/recipes-graphics/wayland/weston-init/init > @@ -63,8 +63,9 @@ case "$1" in > # Check if SD card has a calibration rules file > SD_CALUDEV_FILE=/run/media/mmcblk0p1/ws-calibrate.rules > if [ "$SD_MOUNTED" = "1" -a -f "$SD_CALUDEV_FILE" ] ; then > - # Copy it over to udev location > + # Copy it over to udev location, and done > cp "$SD_CALUDEV_FILE" "$WS_CALUDEV_FILE" > + exit 0 > else > # Run a calibration app and save output to udev rules > echo "Calibrating touchscreen (first time only)" > @@ -85,7 +86,7 @@ case "$1" in > udevadm control --reload > udevadm trigger > killproc weston > - sleep 1 > + sleep 2 > openvt -c 4 -f runWeston > ;; > > @@ -96,7 +97,7 @@ case "$1" in > > restart) > $0 stop > - sleep 1 > + sleep 2 > $0 start > ;; > > > _______________________________________________ > arago-commits mailing list > arago-commits@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/arago-commits >