forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Fix #633: start postmarketos-demos with weston (#648)

Browse source 
* Remove udev trigger/settle, because we start it properly now
* Try for 10 seconds to start postmarketos-demos, wait 0.5s after each try
This commit is contained in:
Oliver Smith 2017-10-04 15:28:39 +00:00 • committed by GitHub
parent dbbdf7cfa4
commit a68b9e0e40
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
main/postmarketos-ui-weston/APKBUILD
View file

@ -1,6 +1,6 @@
pkgname=postmarketos-ui-weston pkgname=postmarketos-ui-weston
pkgver=1 pkgver=2
pkgrel=5 pkgrel=1
pkgdesc="Meta package for weston" pkgdesc="Meta package for weston"
url="https://github.com/postmarketOS" url="https://github.com/postmarketOS"
arch="noarch" arch="noarch"
@ -18,5 +18,5 @@ package() {
install -D -m644 "$srcdir"/start_weston.sh \ install -D -m644 "$srcdir"/start_weston.sh \
"$pkgdir"/etc/profile.d/start_weston.sh "$pkgdir"/etc/profile.d/start_weston.sh
} }
sha512sums="432a27be3dbc83be2bee14a663d6e8c3fe1285daaeb1e08566bf1e8504cf3a680a688f15aae5c849849debe20655e01e735e1f7a3fe94bd28d083bbb0198a9f2 start_weston.sh sha512sums="57e664ed513ed002b3beadcda2977e750078881b9dd720fc8f7273b1082441d9767ef586923676651b48d5c4315b5d6acff5fc517ce3694cfe4d42ff4fab0f65 start_weston.sh
94a690ed8f86c23620fa437bdcae01a851dfd9d8ffa64802be53dbb6bcd4f71cd59145f45c08a45ddd85082890095610946e6baa51fb4e9dc0b982fdc5ec2dc3 postmarketos-ui-weston.post-install" 94a690ed8f86c23620fa437bdcae01a851dfd9d8ffa64802be53dbb6bcd4f71cd59145f45c08a45ddd85082890095610946e6baa51fb4e9dc0b982fdc5ec2dc3 postmarketos-ui-weston.post-install"

14
main/postmarketos-ui-weston/start_weston.sh
View file

@ -17,10 +17,16 @@ if test -z "${XDG_RUNTIME_DIR}"; then
WESTON_OPTS=" --pixman-type=${deviceinfo_weston_pixman_type}" WESTON_OPTS=" --pixman-type=${deviceinfo_weston_pixman_type}"
fi fi
udevadm trigger # #633: Weston doesn't support autostarting applications (yet), so
udevadm settle # we try to run postmarketos-demos for 10 seconds, until it succeeds.
# Workaround! See #633 for discussing a proper fix (
(sleep 3; postmarketos-demos) & for i in $(seq 0 19); do
sleep 0.5
postmarketos-demos && break
done
) &
weston ${WESTON_OPTS} >/tmp/weston.log 2>&1 weston ${WESTON_OPTS} >/tmp/weston.log 2>&1
# In case of failure, restart after 1s # In case of failure, restart after 1s