From 42697d3b5bba2b66b743b4f888535870de500337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Attila=20Sz=C3=B6ll=C5=91si?= <ata@openmailbox.org>
Date: Sat, 2 Sep 2017 01:57:28 +0200
Subject: [PATCH] "Fix" udev issue on sony-amami (#496)

---
 aports/device/device-sony-amami/APKBUILD         | 9 ++++++---
 aports/device/device-sony-amami/fb-workaround.sh | 2 +-
 aports/device/device-sony-amami/udev-hack.sh     | 7 +++++++
 3 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 aports/device/device-sony-amami/udev-hack.sh

diff --git a/aports/device/device-sony-amami/APKBUILD b/aports/device/device-sony-amami/APKBUILD
index fa81db9c..627e6a4c 100644
--- a/aports/device/device-sony-amami/APKBUILD
+++ b/aports/device/device-sony-amami/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=device-sony-amami
 pkgver=1
-pkgrel=8
+pkgrel=9
 pkgdesc="Sony Xperia Z1 Compact"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -9,7 +9,7 @@ depends="linux-sony-amami mkbootimg"
 makedepends=""
 install=""
 subpackages=""
-source="deviceinfo 90-android.rules fb-workaround.sh"
+source="deviceinfo 90-android.rules fb-workaround.sh udev-hack.sh"
 options="!check"
 
 build() {
@@ -23,8 +23,11 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android.rules
 	install -D -m644 "$srcdir"/fb-workaround.sh \
 		"$pkgdir"/etc/profile.d/fb-workaround.sh
+	install -D -m644 "$srcdir"/udev-hack.sh \
+		"$pkgdir"/etc/profile.d/00-udev-hack.sh
 }
 
 sha512sums="75fbe457b65025aaa5b1c5ef9b3ecf796556c88f4c44add878c1a36400c6bbd2433238563b0cb14044a5b7ccaf0c217344f653bb9d0227cfe51fc1b55f9d5d87  deviceinfo
 1dd1196aa9abe0308a0841147e7e5c6eb50da742cfc3194b90ef22a62d034b43ddade70384b78ab38fa0177da5a822f2a40f1386f4ecd591e2ecc80cb679133a  90-android.rules
-13f36f33cfae5e759b3889bc4e308324fd9bcf1cc7b097bbbe3646f1243b3bc06e1b1594cc8578c52c304a2b5006babd978c5b3f258769892e80552457889f99  fb-workaround.sh"
+281937447a73c18e8eec195cbf485fcd513aec20b8df559c26b89fbefa5872c41865cba2440e2cc8a9cc76801bca9ab61f9562c536c6f5f10c925e3ca7f372f3  fb-workaround.sh
+4f528656c4febb18742e89552dfe7fdc824ed4ad6ad2777d20b4f55040edd93d8e3ea657baabcdbe77bd0fb4bd3d23e5e0b2dae574f0df6723b2e26216ee81e1  udev-hack.sh"
diff --git a/aports/device/device-sony-amami/fb-workaround.sh b/aports/device/device-sony-amami/fb-workaround.sh
index e8f1f6cc..860e1411 100644
--- a/aports/device/device-sony-amami/fb-workaround.sh
+++ b/aports/device/device-sony-amami/fb-workaround.sh
@@ -1,6 +1,6 @@
 main() {
 	# Wait untill graphical enviroment is running
-	sleep 135
+	sleep 5
 	# Workaround for buggy graphics driver
 	for i in 1 2
 	do
diff --git a/aports/device/device-sony-amami/udev-hack.sh b/aports/device/device-sony-amami/udev-hack.sh
new file mode 100644
index 00000000..6fbc1a52
--- /dev/null
+++ b/aports/device/device-sony-amami/udev-hack.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ -e /lib/udev/v4l_id ]; then
+	mv /lib/udev/v4l_id /lib/udev/v4l_id_
+	echo "WARNING: v4l_id hangs with the current kernel."
+	echo "=> Moved it from /lib/udev/v4l_id to /lib/udev/v4l_id_"
+fi