From c62b3642dc22fdaef30cd1f06f1f91a4ead697bd Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Fri, 5 Oct 2018 17:53:30 +0200
Subject: [PATCH] Remove unnecessary source of /etc/deviceinfo

---
 main/postmarketos-ui-plasma-mobile/APKBUILD                | 2 +-
 .../postmarketos-ui-plasma-mobile.post-install             | 2 --
 main/postmarketos-ui-weston/APKBUILD                       | 7 +++----
 .../postmarketos-ui-weston.post-install                    | 2 --
 main/postmarketos-ui-xfce4/APKBUILD                        | 2 +-
 .../postmarketos-ui-xfce4.post-install                     | 2 --
 6 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/main/postmarketos-ui-plasma-mobile/APKBUILD b/main/postmarketos-ui-plasma-mobile/APKBUILD
index 35b1f80e6..451f9eab5 100644
--- a/main/postmarketos-ui-plasma-mobile/APKBUILD
+++ b/main/postmarketos-ui-plasma-mobile/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=postmarketos-ui-plasma-mobile
 pkgver=1
-pkgrel=17
+pkgrel=18
 pkgdesc="(Wayland) Mobile variant of KDE Plasma, optimized for touchscreen (aarch64, x86_64 or hardware acceleration required!)"
 url="https://wiki.postmarketos.org/wiki/Plasma_Mobile"
 arch="noarch"
diff --git a/main/postmarketos-ui-plasma-mobile/postmarketos-ui-plasma-mobile.post-install b/main/postmarketos-ui-plasma-mobile/postmarketos-ui-plasma-mobile.post-install
index 3ab6a550c..8e9803edf 100644
--- a/main/postmarketos-ui-plasma-mobile/postmarketos-ui-plasma-mobile.post-install
+++ b/main/postmarketos-ui-plasma-mobile/postmarketos-ui-plasma-mobile.post-install
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-. /etc/deviceinfo
-
 # Autologin on tty1, let busybox autoconfigure 2-6
 autologin="$(getent passwd 10000 | cut -d ":" -f 1)"
 for i in 1 2 3 4 5 6; do
diff --git a/main/postmarketos-ui-weston/APKBUILD b/main/postmarketos-ui-weston/APKBUILD
index 6a5f8c6e6..2a52a3cab 100644
--- a/main/postmarketos-ui-weston/APKBUILD
+++ b/main/postmarketos-ui-weston/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=postmarketos-ui-weston
 pkgver=4
-pkgrel=5
+pkgrel=6
 pkgdesc="(Wayland) Reference compositor (demo, not a phone interface)"
 url="https://postmarketos.org"
 arch="x86_64 armhf aarch64"
@@ -12,7 +12,7 @@ depends="weston-clients weston weston-shell-desktop weston-backend-fbdev
 makedepends=""
 install="$pkgname.post-install"
 subpackages=""
-source="start_weston.sh weston.ini.default $install"
+source="start_weston.sh weston.ini.default"
 options="!check"
 
 package() {
@@ -22,5 +22,4 @@ package() {
 		"$pkgdir"/etc/xdg/weston/weston.ini.default
 }
 sha512sums="6c278d6018e7a1eea1e7285a93dc2fc6c0598c96e8cc5dc094e98be4d07edc6a5a10332d6f12f64ae7a9489b375a67b24e553569e71b274d1b681a0c4658450d  start_weston.sh
-b712c9d4c846437656781656ec15e9b7e238a9244e0b77bf84b67f6661d44f68718330706f69ccb8b4d7f6182b8f17f273018ca461c0c40e49b9185f6eec168d  weston.ini.default
-d8f748b896c5cc474b76cc9d87a0becb4e44ae7220f5cb9468f2e0ecabdc2207739754064489b8e21cd87214058f2a5c6c24cff1688e2eb50999b2feea3f9217  postmarketos-ui-weston.post-install"
+b712c9d4c846437656781656ec15e9b7e238a9244e0b77bf84b67f6661d44f68718330706f69ccb8b4d7f6182b8f17f273018ca461c0c40e49b9185f6eec168d  weston.ini.default"
diff --git a/main/postmarketos-ui-weston/postmarketos-ui-weston.post-install b/main/postmarketos-ui-weston/postmarketos-ui-weston.post-install
index 44ee3f01d..9c17e2a8e 100644
--- a/main/postmarketos-ui-weston/postmarketos-ui-weston.post-install
+++ b/main/postmarketos-ui-weston/postmarketos-ui-weston.post-install
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-. /etc/deviceinfo
-
 # Autologin on tty1, let busybox autoconfigure 2-6
 autologin="$(getent passwd 10000 | cut -d ":" -f 1)"
 for i in 1 2 3 4 5 6; do
diff --git a/main/postmarketos-ui-xfce4/APKBUILD b/main/postmarketos-ui-xfce4/APKBUILD
index 605ff8000..57c09d56f 100644
--- a/main/postmarketos-ui-xfce4/APKBUILD
+++ b/main/postmarketos-ui-xfce4/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=postmarketos-ui-xfce4
 pkgver=0.2
-pkgrel=3
+pkgrel=4
 pkgdesc="(X11) Lightweight GTK+2 desktop (stylus recommended)"
 url="https://gitlab.com/postmarketOS/xfce4-phone"
 arch="noarch"
diff --git a/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-install b/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-install
index b919f2df4..999ddb4cd 100644
--- a/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-install
+++ b/main/postmarketos-ui-xfce4/postmarketos-ui-xfce4.post-install
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-. /etc/deviceinfo
-
 # Autologin on tty1, let busybox autoconfigure 2-6
 autologin="$(getent passwd 10000 | cut -d ":" -f 1)"
 for i in 1 2 3 4 5 6; do