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

Various small xfce4/Hildon fixes (#792)

Browse source 
* XFCE4/Hildon: Log to syslog, see also:
  <https://github.com/postmarketOS/pmbootstrap/pull/762>
* Fix XFCE4 didn't start in qemu-amd64, because it required
  libEGL.so.1, which is provided by mesa-egl. This is a dependency
  of device-qemu-amd64-x11 now. (It worked for Hildon and Weston,
  because they pull mesa-egl in with other packages.)
This commit is contained in:
Oliver Smith 2017-10-24 16:16:58 +00:00 committed by GitHub
parent a31d168635
commit a6d320df58
5 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
device/device-qemu-amd64/APKBUILD
View file

@ -1,6 +1,6 @@
pkgname=device-qemu-amd64 pkgname=device-qemu-amd64
pkgver=1 pkgver=1
pkgrel=8 pkgrel=9
pkgdesc="Simulated device in qemu with an x86 platform" pkgdesc="Simulated device in qemu with an x86 platform"
url="https://github.com/postmarketOS" url="https://github.com/postmarketOS"
arch="noarch" arch="noarch"
@ -26,7 +26,7 @@ mesa() {
x11() { x11() {
install_if="$pkgname xorg-server" install_if="$pkgname xorg-server"
depends="xf86-video-qxl" depends="xf86-video-qxl mesa-egl"
mkdir "$subpkgdir" mkdir "$subpkgdir"
} }

4
main/postmarketos-ui-hildon/APKBUILD
View file

@ -1,6 +1,6 @@
pkgname=postmarketos-ui-hildon pkgname=postmarketos-ui-hildon
pkgver=1 pkgver=1
pkgrel=2 pkgrel=3
pkgdesc="(X11) Lightweight GTK+2 UI (optimized for single-touch touchscreens)" pkgdesc="(X11) Lightweight GTK+2 UI (optimized for single-touch touchscreens)"
url="https://github.com/postmarketOS" url="https://github.com/postmarketOS"
arch="noarch" arch="noarch"
@ -29,6 +29,6 @@ package() {
install -D -m644 "$srcdir"/xinitrc_hildon.sh \ install -D -m644 "$srcdir"/xinitrc_hildon.sh \
"$pkgdir"/etc/postmarketos-ui/xinitrc_hildon.sh "$pkgdir"/etc/postmarketos-ui/xinitrc_hildon.sh
} }
sha512sums="c75466e0a279da1aec11605b422c0a0d91a6fc38c27cdd819fb277badc84e220bbd8b87b217123b3801411aae0b93f98c6c0b449a5a33fc725bd6279a39d9741 start_hildon.sh sha512sums="6c446fd2c0c50b10bf3bd4da93520b975f3632dab24c34eb33f22af7fdd2d96b8d7b605a4aee0c8e2544f56b7fd2dfc0ad39dc57b11cb2eb8c952f823d1b2987 start_hildon.sh
5ef5710bee7bde99e1f240eb8873239c452b55c6dc943930e181d091835824094cf56bf29ae1b34d792ba0ce27f76e30ea69f3c125dda3bf286eaaaba8c8e6ae xinitrc_hildon.sh 5ef5710bee7bde99e1f240eb8873239c452b55c6dc943930e181d091835824094cf56bf29ae1b34d792ba0ce27f76e30ea69f3c125dda3bf286eaaaba8c8e6ae xinitrc_hildon.sh
64007cebcfbb9d8cdc4db7f889722509e1090af0712802300611fb805e00e1de474e4e6b538d0d99be05ca25f983e94aab57e04b4cc8282ba0ae44609d1a7366 postmarketos-ui-hildon.post-install" 64007cebcfbb9d8cdc4db7f889722509e1090af0712802300611fb805e00e1de474e4e6b538d0d99be05ca25f983e94aab57e04b4cc8282ba0ae44609d1a7366 postmarketos-ui-hildon.post-install"

3
main/postmarketos-ui-hildon/start_hildon.sh
View file

@ -6,7 +6,8 @@
# display manager in the long run (#656). # display manager in the long run (#656).
if [ "$(id -u)" = "1000" ] && [ "$(tty)" = "/dev/tty1" ]; then if [ "$(id -u)" = "1000" ] && [ "$(tty)" = "/dev/tty1" ]; then
# Start X11 with Hildon # Start X11 with Hildon
startx /etc/postmarketos-ui/xinitrc_hildon.sh > ~/x11.log 2>&1 startx /etc/postmarketos-ui/xinitrc_hildon.sh 2>&1 | logger -t "$(whoami):x11"
# In case of failure, restart after 1s # In case of failure, restart after 1s
sleep 1 sleep 1

4
main/postmarketos-ui-xfce4/APKBUILD
View file

@ -1,6 +1,6 @@
pkgname=postmarketos-ui-xfce4 pkgname=postmarketos-ui-xfce4
pkgver=0.0 pkgver=0.0
pkgrel=4 pkgrel=5
pkgdesc="(X11) Lightweight GTK+2 desktop (stylus recommended)" pkgdesc="(X11) Lightweight GTK+2 desktop (stylus recommended)"
url="https://github.com/postmarketOS/xfce4-phone" url="https://github.com/postmarketOS/xfce4-phone"
arch="noarch" arch="noarch"
@ -18,6 +18,6 @@ package() {
install -d -m755 "$pkgdir"/etc/skel install -d -m755 "$pkgdir"/etc/skel
cp -a "${srcdir}/xfce4-phone-${pkgver}"/config "$pkgdir"/etc/skel/.config cp -a "${srcdir}/xfce4-phone-${pkgver}"/config "$pkgdir"/etc/skel/.config
} }
sha512sums="f51d88e1a4f8cd9156e62601c1b2ca40d3c6d7079480888471f21359f417398224722c42677cb28336efc8245d9b6b0851a2d1dc16b9f6c79d48ef284944b8b2 start_xfce4.sh sha512sums="34ad0048947b2cefe4de08592c479f717ae4b65a59f06aff9fc05b387ce6516d9f976a79e1efdf1c30a14ee2bc723fcf28f2aaac937f1e0787d95bd16a80332f start_xfce4.sh
916f80ebd1ab86c17bb09158ca470bbc53c1fac53771a38e2422672c29cb07fd35906804a5b00eb852e6f1d08abaf31a6db13452765d1cceefc06c57479d3984 postmarketos-ui-xfce4.post-install 916f80ebd1ab86c17bb09158ca470bbc53c1fac53771a38e2422672c29cb07fd35906804a5b00eb852e6f1d08abaf31a6db13452765d1cceefc06c57479d3984 postmarketos-ui-xfce4.post-install
758562d2820a11b2c96e1805e00450f78203e6fd224115c373825f041b344985490a84b74d2880b423d5606140d5ffb41e79b0a8eb3e5b9a0ce7874c4ccfb666 postmarketos-ui-xfce4-0.0.tar.gz" 758562d2820a11b2c96e1805e00450f78203e6fd224115c373825f041b344985490a84b74d2880b423d5606140d5ffb41e79b0a8eb3e5b9a0ce7874c4ccfb666 postmarketos-ui-xfce4-0.0.tar.gz"

9
main/postmarketos-ui-xfce4/start_xfce4.sh
View file

@ -1,6 +1,13 @@
#!/bin/sh
# XFCE4 autostart on tty1 (Autologin on tty1 is enabled in
# /etc/inittab by postmarketos-base post-install.hook).
# This is a temporary solution, we'll need something like a
# display manager in the long run (#656).
if [ "$(id -u)" = "1000" ] && [ "$(tty)" = "/dev/tty1" ]; then if [ "$(id -u)" = "1000" ] && [ "$(tty)" = "/dev/tty1" ]; then
startxfce4 > ~/x11.log 2>&1 # Start X11 with XFCE4
startxfce4 2>&1 | logger -t "$(whoami):x11"
# In case of failure, restart after 1s # In case of failure, restart after 1s
sleep 1 sleep 1