* Re: [arago-commits] Gou, Hongmei : weston-init: update init scripts related to restarting Weston [not found] <20160127210049.58111529C9@arago-project.org> @ 2016-04-28 19:46 ` Denys Dmytriyenko 2016-04-29 23:59 ` Denys Dmytriyenko 0 siblings, 1 reply; 4+ messages in thread From: Denys Dmytriyenko @ 2016-04-28 19:46 UTC (permalink / raw) To: meta-arago; +Cc: Gou 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 <h-gou@ti.com> > 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 <h-gou@ti.com> > Signed-off-by: Eric Ruei <e-ruei1@ti.com> > Signed-off-by: Denys Dmytriyenko <denys@ti.com> > > --- > > .../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 > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [arago-commits] Gou, Hongmei : weston-init: update init scripts related to restarting Weston 2016-04-28 19:46 ` [arago-commits] Gou, Hongmei : weston-init: update init scripts related to restarting Weston Denys Dmytriyenko @ 2016-04-29 23:59 ` Denys Dmytriyenko 2016-05-03 4:17 ` Denys Dmytriyenko 0 siblings, 1 reply; 4+ messages in thread From: Denys Dmytriyenko @ 2016-04-29 23:59 UTC (permalink / raw) To: meta-arago Ping. On Thu, Apr 28, 2016 at 03:46:23PM -0400, Denys Dmytriyenko wrote: > 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 <h-gou@ti.com> > > 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 <h-gou@ti.com> > > Signed-off-by: Eric Ruei <e-ruei1@ti.com> > > Signed-off-by: Denys Dmytriyenko <denys@ti.com> > > > > --- > > > > .../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 > > > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [arago-commits] Gou, Hongmei : weston-init: update init scripts related to restarting Weston 2016-04-29 23:59 ` Denys Dmytriyenko @ 2016-05-03 4:17 ` Denys Dmytriyenko 2016-05-04 16:03 ` Ruei, Eric 0 siblings, 1 reply; 4+ messages in thread From: Denys Dmytriyenko @ 2016-05-03 4:17 UTC (permalink / raw) To: meta-arago Hongmei, Eric, Jake, Ping again. I will be reverting this if not clarified. Thanks. -- Denys On Fri, Apr 29, 2016 at 07:59:44PM -0400, Denys Dmytriyenko wrote: > Ping. > > > On Thu, Apr 28, 2016 at 03:46:23PM -0400, Denys Dmytriyenko wrote: > > 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 <h-gou@ti.com> > > > 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 <h-gou@ti.com> > > > Signed-off-by: Eric Ruei <e-ruei1@ti.com> > > > Signed-off-by: Denys Dmytriyenko <denys@ti.com> > > > > > > --- > > > > > > .../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 > > > > > _______________________________________________ > > meta-arago mailing list > > meta-arago@arago-project.org > > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [arago-commits] Gou, Hongmei : weston-init: update init scripts related to restarting Weston 2016-05-03 4:17 ` Denys Dmytriyenko @ 2016-05-04 16:03 ` Ruei, Eric 0 siblings, 0 replies; 4+ messages in thread From: Ruei, Eric @ 2016-05-04 16:03 UTC (permalink / raw) To: Dmytriyenko, Denys, meta-arago@arago-project.org Hi, Denys: We are sorry for the late response. Hongmei and myself are finally able to discuss this change and reproduce the issue at PSDK 2.0.1 release. Please see our comments below. Best regards, Eric -----Original Message----- From: Dmytriyenko, Denys Sent: Tuesday, May 03, 2016 12:17 AM To: meta-arago@arago-project.org Cc: Gou, Hongmei; Ruei, Eric; Stiffler, Jacob Subject: Re: [meta-arago] [arago-commits] Gou, Hongmei : weston-init: update init scripts related to restarting Weston Hongmei, Eric, Jake, Ping again. I will be reverting this if not clarified. Thanks. -- Denys On Fri, Apr 29, 2016 at 07:59:44PM -0400, Denys Dmytriyenko wrote: > Ping. > > > On Thu, Apr 28, 2016 at 03:46:23PM -0400, Denys Dmytriyenko wrote: > > 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 > > You are right. It is incorrect and we need toi restart weston to pick up the calibration data. Therefore, we need to undo the change by removing "exit 0". However, we may need to keep the "sleep 2" change, which is required for PSDK 2.0.1 AM437x. Please see my comments close to the changes below. Eric > > > > 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 <h-gou@ti.com> > > > 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 <h-gou@ti.com> > > > Signed-off-by: Eric Ruei <e-ruei1@ti.com> > > > Signed-off-by: Denys Dmytriyenko <denys@ti.com> > > > > > > --- > > > > > > .../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 Undo both changes. Eric > > > 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 This change is needed for PDSK 2.0.1 AM437x (Weston 1.6 and DDK 1.9) Eric > > > openvt -c 4 -f runWeston > > > ;; > > > > > > @@ -96,7 +97,7 @@ case "$1" in > > > > > > restart) > > > $0 stop > > > - sleep 1 > > > + sleep 2 > > > $0 start I believe that this change is also not required. Eric > > > ;; > > > > > > > > > _______________________________________________ > > > arago-commits mailing list > > > arago-commits@arago-project.org > > > http://arago-project.org/cgi-bin/mailman/listinfo/arago-commits > > > > > _______________________________________________ > > meta-arago mailing list > > meta-arago@arago-project.org > > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-05-04 16:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20160127210049.58111529C9@arago-project.org>
2016-04-28 19:46 ` [arago-commits] Gou, Hongmei : weston-init: update init scripts related to restarting Weston Denys Dmytriyenko
2016-04-29 23:59 ` Denys Dmytriyenko
2016-05-03 4:17 ` Denys Dmytriyenko
2016-05-04 16:03 ` Ruei, Eric
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.