Unify names of scripts and patches (#557)

- 90-android.rules -> 90-android-touch-dev.rules
- reduce_lzo_compression.patch -> 02_reduce_lzo_compression.patch
- mdss_fb_refresh_rate.patch -> 02_mdss_fb_refresh_rate.patch
- aeea3592a13bf12861943e44fc48f1f270941f8d.patch -> 00_fix_return_address.patch
- gpu-msm-fix-gcc5-compile.patch -> 02_gpu-msm-fix-gcc5-compile.patch
- udev-hack.sh -> udev-v4l-hack.sh
- Separate udev-v4l-hack.sh from profile.sh

device/device-huawei-angler/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=device-huawei-angler
 pkgver=1
-pkgrel=0
+pkgrel=1
 pkgdesc="Huawei Nexus 6P"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -9,7 +9,7 @@ depends="linux-huawei-angler mkbootimg"
 makedepends=""
 install=""
 subpackages=""
-source="deviceinfo 90-android.rules"
+source="deviceinfo 90-android-touch-dev.rules"
 options="!check"
 
 build() {
@@ -19,9 +19,9 @@ build() {
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
 		"$pkgdir/etc/deviceinfo"
-	install -D -m644 "$srcdir"/90-android.rules \
-		"$pkgdir"/etc/udev/rules.d/90-android.rules
+	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
+		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
 sha512sums="3bb53698b5fbfdd0522aaaf56966ea228cd79bea05c9af14d988604b1294d93a3a991107d5483845fc0064cf44d9f9ef54f9cbc517959f0327318b1902b9ee86  deviceinfo
-155aa9c8bd0e202917c7f55312eaaa189114864d89bbf7fdbdcc4fe146af3c7c781a6e76b0030046383dee823465a994d6954408248cc2f43e48af40869d6b25  90-android.rules"
+155aa9c8bd0e202917c7f55312eaaa189114864d89bbf7fdbdcc4fe146af3c7c781a6e76b0030046383dee823465a994d6954408248cc2f43e48af40869d6b25  90-android-touch-dev.rules"

device/device-lg-d855/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=device-lg-d855
 pkgver=1
-pkgrel=7
+pkgrel=8
 pkgdesc="LG G3 International"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -9,7 +9,7 @@ depends="linux-lg-d855 mkbootimg"
 makedepends=""
 install=""
 subpackages=""
-source="deviceinfo 90-android.rules"
+source="deviceinfo 90-android-touch-dev.rules"
 options="!check"
 
 build() {
@@ -19,9 +19,9 @@ build() {
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
 		"$pkgdir/etc/deviceinfo"
-	install -D -m644 "$srcdir"/90-android.rules \
-		"$pkgdir"/etc/udev/rules.d/90-android.rules
+	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
+		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
 sha512sums="44f8fc5c4ed818b4358ac6fcd91f40684cb0f2fc7531e8d99d1f81e74d6ebaef787128872258b367189e6fd5ec367fb50de931025d9bbc095478797b83e7edac  deviceinfo
-ee25f3d0377f027d108593eb7953b8db49d7f05a5c36a0c8ca7e7849d15e3c217bc1ac97d77a66e28d2db4b81c0f50b905639911276da40321d2b6cca7f797df  90-android.rules"
+ee25f3d0377f027d108593eb7953b8db49d7f05a5c36a0c8ca7e7849d15e3c217bc1ac97d77a66e28d2db4b81c0f50b905639911276da40321d2b6cca7f797df  90-android-touch-dev.rules"

device/device-lg-hammerhead/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=device-lg-hammerhead
 pkgver=1
-pkgrel=9
+pkgrel=10
 pkgdesc="Google Nexus 5"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -13,6 +13,7 @@ source="
 	deviceinfo
 	initfs-hook.sh
 	90-android-touch-dev.rules
+	udev-v4l-hack.sh
 	profile.sh
 	bcmdhd.cal
 "
@@ -31,6 +32,8 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 	install -D -m644 "$srcdir"/profile.sh \
 		"$pkgdir"/etc/profile.d/00-$pkgname.sh
+	install -D -m644 "$srcdir"/udev-v4l-hack.sh \
+		"$pkgdir"/etc/profile.d/00-udev-v4l-hack.sh
 	install -D -m644 "$srcdir"/bcmdhd.cal \
 		"$pkgdir"/etc/wifi/bcmdhd.cal
 }
@@ -38,5 +41,6 @@ package() {
 sha512sums="ae9c9dd5f297021b32733c91e7629f7a65986e33c0bca1d60d08d4a077ab4262093f52ef075bd076a07d714893139d44b1bd7d405095cfab427da095d0b7746d  deviceinfo
 8590967fa10388a890fdfafdb1070b9ab22dc89e06a3a8834806c772191e3b67de7b914b0d68e5ddf581cee715cb90f3f24abcb8762c415ff328c6da23e55d52  initfs-hook.sh
 ee25f3d0377f027d108593eb7953b8db49d7f05a5c36a0c8ca7e7849d15e3c217bc1ac97d77a66e28d2db4b81c0f50b905639911276da40321d2b6cca7f797df  90-android-touch-dev.rules
-2f7cdf558a6bff56fd343d29a1ca6c27e75715bedfad661700dfcfb01acd1bdfcfecdfccf619f1e56c1e6331be146f8882a14d3a2cd33830e9d00bb6118971a3  profile.sh
+4f528656c4febb18742e89552dfe7fdc824ed4ad6ad2777d20b4f55040edd93d8e3ea657baabcdbe77bd0fb4bd3d23e5e0b2dae574f0df6723b2e26216ee81e1  udev-v4l-hack.sh
+d04013c17caf77a87ebea167dbe48f7efa9c9d3123c5743d359f3ea8ccc6b268fa021535a4bf8291eb4a352f0c92f6eb527da0db340421f53bc1cc439a453306  profile.sh
 32652ef366694f34dec31f316a38aca96700e3a5a3eac1f8d192e3c5de7b91e480b1c0fcd8e7c80a51692dc3737020ebbb2e5d3779436e82fb18822089c63055  bcmdhd.cal"

device/device-lg-hammerhead/profile.sh

@@ -1,12 +1,5 @@
 #!/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
-
-
 # Run a few weston demos, because the postmarketos-demos program depends
 # on xwayland for now (Alpine's GTK3 isn't configured for Wayland
 # support yet.)

device/device-lg-mako/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=device-lg-mako
 pkgver=2
-pkgrel=8
+pkgrel=9
 pkgdesc="Google Nexus 4"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -9,7 +9,7 @@ depends="linux-lg-mako mkbootimg"
 makedepends=""
 install=""
 subpackages=""
-source="deviceinfo initfs-hook.sh 90-android-touch-dev.rules profile.sh"
+source="deviceinfo initfs-hook.sh 90-android-touch-dev.rules profile.sh udev-v4l-hack.sh"
 options="!check"
 
 build() {
@@ -25,9 +25,12 @@ package() {
 		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 	install -D -m644 "$srcdir"/profile.sh \
 		"$pkgdir"/etc/profile.d/00-$pkgname.sh
+	install -D -m644 "$srcdir"/udev-v4l-hack.sh \
+		"$pkgdir"/etc/profile.d/00-udev-v4l-hack.sh
 }
 
 sha512sums="cbfc1af79cd91bd62adccf22cbfa00f1d6edf35a9e6893a90e09852c014224b2593523ef3eeacd2c05a7a711f0c88c48dc09a7665aaac71e5abe632c71c607aa  deviceinfo
 8590967fa10388a890fdfafdb1070b9ab22dc89e06a3a8834806c772191e3b67de7b914b0d68e5ddf581cee715cb90f3f24abcb8762c415ff328c6da23e55d52  initfs-hook.sh
 ee25f3d0377f027d108593eb7953b8db49d7f05a5c36a0c8ca7e7849d15e3c217bc1ac97d77a66e28d2db4b81c0f50b905639911276da40321d2b6cca7f797df  90-android-touch-dev.rules
-2f7cdf558a6bff56fd343d29a1ca6c27e75715bedfad661700dfcfb01acd1bdfcfecdfccf619f1e56c1e6331be146f8882a14d3a2cd33830e9d00bb6118971a3  profile.sh"
+d04013c17caf77a87ebea167dbe48f7efa9c9d3123c5743d359f3ea8ccc6b268fa021535a4bf8291eb4a352f0c92f6eb527da0db340421f53bc1cc439a453306  profile.sh
+4f528656c4febb18742e89552dfe7fdc824ed4ad6ad2777d20b4f55040edd93d8e3ea657baabcdbe77bd0fb4bd3d23e5e0b2dae574f0df6723b2e26216ee81e1  udev-v4l-hack.sh"

device/device-lg-mako/profile.sh

@@ -1,12 +1,5 @@
 #!/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
-
-
 # Run a few weston demos, because the postmarketos-demos program depends
 # on xwayland for now (Alpine's GTK3 isn't configured for Wayland
 # support yet.)

device/device-motorola-titan/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=device-motorola-titan
 pkgver=1
-pkgrel=10
+pkgrel=11
 pkgdesc="Motorola Moto G 2014"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -9,7 +9,7 @@ depends="linux-motorola-titan mkbootimg"
 makedepends=""
 install=""
 subpackages=""
-source="deviceinfo 90-android-touch-dev.rules initfs-hook.sh profile.sh"
+source="deviceinfo 90-android-touch-dev.rules initfs-hook.sh profile.sh udev-v4l-hack.sh"
 options="!check"
 
 build() {
@@ -25,9 +25,12 @@ package() {
 		"$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-${pkgname}.sh
 	install -D -m644 "$srcdir"/profile.sh \
 		"$pkgdir"/etc/profile.d/00-$pkgname.sh
+	install -D -m644 "$srcdir"/udev-v4l-hack.sh \
+		"$pkgdir"/etc/profile.d/00-udev-v4l-hack.sh
 }
 
 sha512sums="09abd5f4681d9479650cfa64fcbc58528827017757539c3faf142ca92e8537691f9fb88f5d84ece086af7f23be2ac03e196f49ae708a832f1331f40cc96bab29  deviceinfo
 f37e6324abf0b0fc8a3d360d6d11bb0648090a438a55ca7f04a9d494719e687ce445ae107ace642edf293afb6ca82615bcb5d0ddb6c46c1a7f8ee3c213b7c5c4  90-android-touch-dev.rules
 8590967fa10388a890fdfafdb1070b9ab22dc89e06a3a8834806c772191e3b67de7b914b0d68e5ddf581cee715cb90f3f24abcb8762c415ff328c6da23e55d52  initfs-hook.sh
-2f7cdf558a6bff56fd343d29a1ca6c27e75715bedfad661700dfcfb01acd1bdfcfecdfccf619f1e56c1e6331be146f8882a14d3a2cd33830e9d00bb6118971a3  profile.sh"
+d04013c17caf77a87ebea167dbe48f7efa9c9d3123c5743d359f3ea8ccc6b268fa021535a4bf8291eb4a352f0c92f6eb527da0db340421f53bc1cc439a453306  profile.sh
+4f528656c4febb18742e89552dfe7fdc824ed4ad6ad2777d20b4f55040edd93d8e3ea657baabcdbe77bd0fb4bd3d23e5e0b2dae574f0df6723b2e26216ee81e1  udev-v4l-hack.sh"

device/device-motorola-titan/profile.sh

@@ -1,12 +1,5 @@
 #!/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
-
-
 # Run a few weston demos, because the postmarketos-demos program depends
 # on xwayland for now (Alpine's GTK3 isn't configured for Wayland
 # support yet.)

device/device-motorola-titan/udev-v4l-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

device/device-oneplus-bacon/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=device-oneplus-bacon
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="OnePlus One"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -9,7 +9,7 @@ depends="linux-oneplus-bacon linux-firmware mkbootimg"
 makedepends=""
 install=""
 subpackages=""
-source="90-android.rules deviceinfo"
+source="90-android-touch-dev.rules deviceinfo"
 options="!check"
 
 build() {
@@ -17,11 +17,11 @@ build() {
 }
 
 package() {
-	install -D -m644 "$srcdir"/90-android.rules \
-		"$pkgdir"/etc/udev/rules.d/90-android.rules
+	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
+		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 	install -D -m644 "$srcdir"/deviceinfo \
 		"$pkgdir"/etc/deviceinfo
 }
 
-sha512sums="155aa9c8bd0e202917c7f55312eaaa189114864d89bbf7fdbdcc4fe146af3c7c781a6e76b0030046383dee823465a994d6954408248cc2f43e48af40869d6b25  90-android.rules
+sha512sums="155aa9c8bd0e202917c7f55312eaaa189114864d89bbf7fdbdcc4fe146af3c7c781a6e76b0030046383dee823465a994d6954408248cc2f43e48af40869d6b25  90-android-touch-dev.rules
 54c9a25dfbfff8381009f1e49e8b22bb89bd1decf3f9900e67f4f2c9e6b25db4715d4b72e7d9d9791d7d637971e0ac40086746d29c324ffe009b02b06a0b8a30  deviceinfo"

device/device-samsung-i9070/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=device-samsung-i9070
 pkgver=1
-pkgrel=10
+pkgrel=11
 pkgdesc="Samsung Galaxy S Advance"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -12,7 +12,7 @@ subpackages=""
 source="
 	deviceinfo
 	initfs-hook.sh
-	90-android.rules
+	90-android-touch-dev.rules
 	modules-load.conf
 "
 options="!check"
@@ -26,13 +26,13 @@ package() {
 		"$pkgdir/etc/deviceinfo"
 	install -D -m644 "$srcdir"/initfs-hook.sh \
 		"$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-${pkgname}.sh
-	install -D -m644 "$srcdir"/90-android.rules \
-		"$pkgdir"/etc/udev/rules.d/90-android.rules
+	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
+		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 	install -D -m644 "$srcdir"/modules-load.conf \
 		"$pkgdir"/etc/modules-load.d/00-${pkgname}.conf
 }
 
 sha512sums="7e11955f8db3ce3a2645d8efe162d1a1989ed79373b16384360301d2b84e26fa244696ad420d83cba2ad80a5663967394e3ea6a7d066c7e49d1cbbcb87dda0e3  deviceinfo
 098187f6ab56d2542f98f1b5fbcf493431f665a4300db05e859357366e39b02a3d508bfd94c1d1bd7c669261e7ef0d4e1aef1fdbb15541fe34f3f48a6caa247f  initfs-hook.sh
-ffa8ba47539f0b4a931c560811d7842c7f5270631066c270322859c1ef77e63fba09a8462c2533bd6d095056b2c7936c2d4fc4e225f3cff45169f121bf93d8ed  90-android.rules
+ffa8ba47539f0b4a931c560811d7842c7f5270631066c270322859c1ef77e63fba09a8462c2533bd6d095056b2c7936c2d4fc4e225f3cff45169f121bf93d8ed  90-android-touch-dev.rules
 61e8becbf6fa7c1c6c42e481083f5981ae7af33a48cbc53e817d8ac2c6a8e4f67a54b32ae3b8f5f25f7b412165a849dc93a629110dc47b0d16927bf2a12eb7e1  modules-load.conf"

device/device-samsung-i9100/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=device-samsung-i9100
 pkgver=1
-pkgrel=8
+pkgrel=9
 pkgdesc="Samsung Galaxy SII"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -9,7 +9,7 @@ depends="linux-samsung-i9100"
 makedepends=""
 install=""
 subpackages=""
-source="deviceinfo 90-android.rules"
+source="deviceinfo 90-android-touch-dev.rules"
 options="!check"
 
 build() {
@@ -19,9 +19,9 @@ build() {
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
 		"$pkgdir/etc/deviceinfo"
-	install -D -m644 "$srcdir"/90-android.rules \
-		"$pkgdir"/etc/udev/rules.d/90-android.rules
+	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
+		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
 sha512sums="64f8526a8db3d428e83f826c22f41a589bed29381f3b3160446a401c44196d044dd6f2f895c080b0c45a6ad8c173439bb6127195329c3df677fd8408d4c69f85  deviceinfo
-8aead706ddb118a44de7d049f07d10a27e727d17724058d132e4ec4fa73fed29c9ccfe03f02aca459c922ec0fbba24e171fe3c76e33f7c5462631e3dd5506e36  90-android.rules"
+8aead706ddb118a44de7d049f07d10a27e727d17724058d132e4ec4fa73fed29c9ccfe03f02aca459c922ec0fbba24e171fe3c76e33f7c5462631e3dd5506e36  90-android-touch-dev.rules"

device/device-samsung-n7100/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=device-samsung-n7100
 pkgver=1
-pkgrel=7
+pkgrel=8
 pkgdesc="Samsung Galaxy Note II (GSM)"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -9,7 +9,7 @@ depends="linux-samsung-n7100 mkbootimg"
 makedepends=""
 install=""
 subpackages=""
-source="deviceinfo 90-android.rules"
+source="deviceinfo 90-android-touch-dev.rules"
 options="!check"
 
 build() {
@@ -19,9 +19,9 @@ build() {
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
 		"$pkgdir/etc/deviceinfo"
-	install -D -m644 "$srcdir"/90-android.rules \
-		"$pkgdir"/etc/udev/rules.d/90-android.rules
+	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
+		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 }
 
 sha512sums="f6dc28a228219db4c3883dfa11454529271e00794d6705e6e51369e1def5512db2b74fda52b5855f2dd10bc1c155a24cfdb2d751373edcd1cd3677e1e59eff65  deviceinfo
-8aead706ddb118a44de7d049f07d10a27e727d17724058d132e4ec4fa73fed29c9ccfe03f02aca459c922ec0fbba24e171fe3c76e33f7c5462631e3dd5506e36  90-android.rules"
+8aead706ddb118a44de7d049f07d10a27e727d17724058d132e4ec4fa73fed29c9ccfe03f02aca459c922ec0fbba24e171fe3c76e33f7c5462631e3dd5506e36  90-android-touch-dev.rules"

device/device-sony-amami/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=device-sony-amami
 pkgver=1
-pkgrel=9
+pkgrel=10
 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 udev-hack.sh"
+source="deviceinfo 90-android-touch-dev.rules fb-workaround.sh udev-v4l-hack.sh"
 options="!check"
 
 build() {
@@ -19,15 +19,15 @@ build() {
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
 		"$pkgdir/etc/deviceinfo"
-	install -D -m644 "$srcdir"/90-android.rules \
-		"$pkgdir"/etc/udev/rules.d/90-android.rules
+	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
+		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.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
+	install -D -m644 "$srcdir"/udev-v4l-hack.sh \
+		"$pkgdir"/etc/profile.d/00-udev-v4l-hack.sh
 }
 
 sha512sums="75fbe457b65025aaa5b1c5ef9b3ecf796556c88f4c44add878c1a36400c6bbd2433238563b0cb14044a5b7ccaf0c217344f653bb9d0227cfe51fc1b55f9d5d87  deviceinfo
-1dd1196aa9abe0308a0841147e7e5c6eb50da742cfc3194b90ef22a62d034b43ddade70384b78ab38fa0177da5a822f2a40f1386f4ecd591e2ecc80cb679133a  90-android.rules
+1dd1196aa9abe0308a0841147e7e5c6eb50da742cfc3194b90ef22a62d034b43ddade70384b78ab38fa0177da5a822f2a40f1386f4ecd591e2ecc80cb679133a  90-android-touch-dev.rules
 281937447a73c18e8eec195cbf485fcd513aec20b8df559c26b89fbefa5872c41865cba2440e2cc8a9cc76801bca9ab61f9562c536c6f5f10c925e3ca7f372f3  fb-workaround.sh
-4f528656c4febb18742e89552dfe7fdc824ed4ad6ad2777d20b4f55040edd93d8e3ea657baabcdbe77bd0fb4bd3d23e5e0b2dae574f0df6723b2e26216ee81e1  udev-hack.sh"
+4f528656c4febb18742e89552dfe7fdc824ed4ad6ad2777d20b4f55040edd93d8e3ea657baabcdbe77bd0fb4bd3d23e5e0b2dae574f0df6723b2e26216ee81e1  udev-v4l-hack.sh"

device/device-sony-amami/udev-v4l-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

device/device-sony-aries/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=device-sony-aries
 pkgver=1
-pkgrel=8
+pkgrel=9
 pkgdesc="Sony Xperia Z3 Compact"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -9,7 +9,7 @@ depends="linux-sony-aries mkbootimg"
 makedepends=""
 install=""
 subpackages=""
-source="deviceinfo 90-android.rules fb-workaround.sh"
+source="deviceinfo 90-android-touch-dev.rules fb-workaround.sh"
 options="!check"
 
 build() {
@@ -19,12 +19,12 @@ build() {
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
 		"$pkgdir/etc/deviceinfo"
-	install -D -m644 "$srcdir"/90-android.rules \
-		"$pkgdir"/etc/udev/rules.d/90-android.rules
+	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
+		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules
 	install -D -m644 "$srcdir"/fb-workaround.sh \
 		"$pkgdir"/etc/profile.d/fb-workaround.sh
 }
 
 sha512sums="f8d6a912d39b5d30c0364b6bceb39c079e6438352c91ed5acfe3c7835115d83954633659b0264ae9752b930ddcb09b2297634448dfdd488008b85309b0ad1c50  deviceinfo
-1dd1196aa9abe0308a0841147e7e5c6eb50da742cfc3194b90ef22a62d034b43ddade70384b78ab38fa0177da5a822f2a40f1386f4ecd591e2ecc80cb679133a  90-android.rules
+1dd1196aa9abe0308a0841147e7e5c6eb50da742cfc3194b90ef22a62d034b43ddade70384b78ab38fa0177da5a822f2a40f1386f4ecd591e2ecc80cb679133a  90-android-touch-dev.rules
 13f36f33cfae5e759b3889bc4e308324fd9bcf1cc7b097bbbe3646f1243b3bc06e1b1594cc8578c52c304a2b5006babd978c5b3f258769892e80552457889f99  fb-workaround.sh"

device/device-sony-castor-windy/APKBUILD

@@ -9,7 +9,7 @@ depends="mkbootimg linux-sony-castor-windy linux-firmware firmware-adreno"
 makedepends=""
 install=""
 subpackages=""
-source="modules-load.conf deviceinfo 90-android.rules brcmfmac4339-sdio.txt"
+source="modules-load.conf deviceinfo 90-android-touch-dev.rules brcmfmac4339-sdio.txt"
 options="!check"
 
 build() {
@@ -21,12 +21,12 @@ package() {
             "$pkgdir/etc/deviceinfo"
         install -D -m644 "$srcdir/brcmfmac4339-sdio.txt" \
             "$pkgdir/lib/firmware/brcm/brcmfmac4339-sdio.txt"
-        install -D -m644 "$srcdir/90-android.rules" \
-            "$pkgdir/etc/udev/rules.d/90-android.rules"
+        install -D -m644 "$srcdir/90-android-touch-dev.rules" \
+            "$pkgdir/etc/udev/rules.d/90-android-touch-dev.rules"
         install -D -m644 "$srcdir"/modules-load.conf \
             "$pkgdir"/etc/modules-load.d/00-${pkgname}.conf
 }
 sha512sums="d8ce60ea7acaabf627ddca2f0887a4cda46f313b7aaf7934bef2fef8a6e0798ccefab849e4571e4e3fcd06ae34c1a6efe3b58b401e2e443416f6200e6d4ea769  modules-load.conf
 050c5ec58629a0af80b43d5e1724875f7085fa41e61cb264ba56cf9f19526cc1dc47a8838120e5cc8a84265f9de63061b17f8e213c8a1ac8475bf928ab67a0bf  deviceinfo
-d309bc3ef26a30ea24be87bd3120eef9cd9fe1d09812ce35f1a9e8d291d5c5ca5651b7fa5a61fb155d8fb98b7df7104ab35c087b96b66ba0b0a54d7e7c5985ff  90-android.rules
+d309bc3ef26a30ea24be87bd3120eef9cd9fe1d09812ce35f1a9e8d291d5c5ca5651b7fa5a61fb155d8fb98b7df7104ab35c087b96b66ba0b0a54d7e7c5985ff  90-android-touch-dev.rules
 b99a1bc0d430a261b6ab0b5ea12f2e996ab24ece6fe40ff57357697f4db976394c655a7c7a63e7c985f6356126a6b1d920eb0077817cb65ae18250f404282a68  brcmfmac4339-sdio.txt"

device/device-sony-yuga/APKBUILD

@@ -1,6 +1,6 @@
 pkgname=device-sony-yuga
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="Sony Xperia Z"
 url="https://github.com/postmarketOS"
 arch="noarch"
@@ -9,7 +9,7 @@ depends="linux-sony-yuga mkbootimg"
 makedepends=""
 install=""
 subpackages=""
-source="deviceinfo 90-android.rules fb-workaround.sh udev-hack.sh"
+source="deviceinfo 90-android-touch-dev.rules fb-workaround.sh udev-v4l-hack.sh"
 options="!check"
 
 build() {
@@ -19,15 +19,15 @@ build() {
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
 		"$pkgdir/etc/deviceinfo"
-	install -D -m644 "$srcdir"/90-android.rules \
-		"$pkgdir"/etc/udev/rules.d/90-android.rules
+	install -D -m644 "$srcdir"/90-android-touch-dev.rules \
+		"$pkgdir"/etc/udev/rules.d/90-android-touch-dev.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
+	install -D -m644 "$srcdir"/udev-v4l-hack.sh \
+		"$pkgdir"/etc/profile.d/00-udev-v4l-hack.sh
 }
 
 sha512sums="36cd49c24305e86601124c70f9bbc990866dcffa2202956a450ab4049b7a00e23c93ae6869f094a9e2a5b42ce7a1407d0f73341e0c07b2e695295cc50fefa81e  deviceinfo
-1dd1196aa9abe0308a0841147e7e5c6eb50da742cfc3194b90ef22a62d034b43ddade70384b78ab38fa0177da5a822f2a40f1386f4ecd591e2ecc80cb679133a  90-android.rules
+1dd1196aa9abe0308a0841147e7e5c6eb50da742cfc3194b90ef22a62d034b43ddade70384b78ab38fa0177da5a822f2a40f1386f4ecd591e2ecc80cb679133a  90-android-touch-dev.rules
 281937447a73c18e8eec195cbf485fcd513aec20b8df559c26b89fbefa5872c41865cba2440e2cc8a9cc76801bca9ab61f9562c536c6f5f10c925e3ca7f372f3  fb-workaround.sh
-4f528656c4febb18742e89552dfe7fdc824ed4ad6ad2777d20b4f55040edd93d8e3ea657baabcdbe77bd0fb4bd3d23e5e0b2dae574f0df6723b2e26216ee81e1  udev-hack.sh"
+4f528656c4febb18742e89552dfe7fdc824ed4ad6ad2777d20b4f55040edd93d8e3ea657baabcdbe77bd0fb4bd3d23e5e0b2dae574f0df6723b2e26216ee81e1  udev-v4l-hack.sh"

device/device-sony-yuga/udev-v4l-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

device/linux-htc-ace/APKBUILD

@@ -19,7 +19,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=2
+pkgrel=3
 arch="armhf"
 pkgdesc="HTC Desire kernel from OpenDesireProject"
 url="https://github.com/OpenDesireProject/android_kernel_htc_msm7x30"
@@ -31,7 +31,7 @@ source="
 	$pkgname-$_hash.tar.gz::https://github.com/OpenDesireProject/android_kernel_htc_msm7x30/archive/${_hash}.tar.gz
 	$_config
 	compiler-gcc6.h
-	gpu-msm-fix-gcc5-compile.patch
+	02_gpu-msm-fix-gcc5-compile.patch
 "
 subpackages=""
 license="GPL2"
@@ -107,4 +107,4 @@ package() {
 sha512sums="34b3f66b0860a624a9dc132ebc25c7bca3a55a452dfb91bd4194b000ad17644b270eea82fdda82fa081f570d59da3b181506685f69d595ef6e37b7744b196371  linux-htc-ace-887cd64b8361ac89ac56810460947a537112bdc9.tar.gz
 7c9e04eb5873b39b1b398cb9c5e29dc4e6c0a80f1cf83abe5cc403e278ae5c850921c2d783b09d21cd46652a581dc4fd9924efdeae4a1add35e803d78f7de6a5  config-htc-ace.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
-2962e853aea3bec3cfea762584a6722023c5c9041994065a7ee75b6c4584121890d6dd1ac74317a2bb8069bff49583a9cccd73cca539665a76713465e05a2cf6  gpu-msm-fix-gcc5-compile.patch"
+2962e853aea3bec3cfea762584a6722023c5c9041994065a7ee75b6c4584121890d6dd1ac74317a2bb8069bff49583a9cccd73cca539665a76713465e05a2cf6  02_gpu-msm-fix-gcc5-compile.patch"

device/linux-lg-d855/APKBUILD

@@ -20,7 +20,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=4
+pkgrel=5
 arch="armhf"
 pkgdesc="LG G3 kernel from LineageOS"
 url="https://github.com/LineageOS/android_kernel_lge_g3"
@@ -32,7 +32,7 @@ source="
 	$pkgname-$_hash.tar.gz::https://github.com/LineageOS/android_kernel_${_vendor}_g3/archive/${_hash}.tar.gz
 	$_config
 	compiler-gcc6.h
-	gpu-msm-fix-gcc5-compile.patch
+	02_gpu-msm-fix-gcc5-compile.patch
 "
 subpackages=""
 license="GPL2"
@@ -104,4 +104,4 @@ package() {
 sha512sums="bccf7faebded67c76804593cdf5f45b1da97ca1873cbc44ac64bd5a8dc9f09824ac1824f6c11beff8ad311bdac3d13a29e08723ec5a2d9861f878f5ef6aad87d  linux-lg-d855-efce7b0879c76224f5bf37d8a1025eaed99192b0.tar.gz
 d99b0ce33d5a4e7cba98c6503d1199139f169dde5269f806873d809629ac4f0897dc88dafa18b0fd32771631e0ebb37dc7289b06e7a7515394c283c726e3081e  config-lg-d855.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
-7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  gpu-msm-fix-gcc5-compile.patch"
+7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch"

device/linux-lg-hammerhead/APKBUILD

@@ -20,7 +20,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=6
+pkgrel=7
 arch="armhf"
 pkgdesc="LineageOS kernel for Nexus 5 hammerhead"
 url="https://github.com/LineageOS/android_kernel_lge_hammerhead"
@@ -32,8 +32,8 @@ source="
 	$pkgname-$_hash.tar.gz::https://github.com/LineageOS/android_kernel_lge_hammerhead/archive/${_hash}.tar.gz
 	${_config}
 	compiler-gcc6.h
-	aeea3592a13bf12861943e44fc48f1f270941f8d.patch
-	gpu-msm-fix-gcc5-compile.patch
+	00_fix_return_address.patch
+	02_gpu-msm-fix-gcc5-compile.patch
 "
 subpackages=""
 license="GPL2"
@@ -119,5 +119,5 @@ package() {
 sha512sums="06efc786722f904c5e37657c96b96fb3e6b005837aac3c63a75751a80d7ff5800af072e3095bbdf32f3ac602125f98ad6f99f82892d19668fe320874b720f543  linux-lg-hammerhead-1dae34efb7d2399073ca371c953aafd2ed503849.tar.gz
 a1ab65fcababe36e181a15f904a57a3958781d9b7f39b0376592130771037a539fcb58801051358ac7f9e5651e8316959f2bf508444b5e415df8b6672aafa16e  config-lg-hammerhead.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
-ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  aeea3592a13bf12861943e44fc48f1f270941f8d.patch
-7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  gpu-msm-fix-gcc5-compile.patch"
+ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
+7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch"

device/linux-lg-lenok/APKBUILD

@@ -22,7 +22,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=4
+pkgrel=5
 arch="armhf"
 pkgdesc="G Watch R kernel"
 url="https://github.com/Tsunamical/kernel_lge_bass-lenok"
@@ -34,7 +34,7 @@ source="
 	$pkgname-$_hash.tar.gz::${url}/archive/${_hash}.tar.gz
 	$_config
 	compiler-gcc6.h
-	refresh_rate.patch
+	02_mdss_fb_refresh_rate.patch
 "
 subpackages=""
 license="GPL2"
@@ -106,4 +106,4 @@ package() {
 sha512sums="4b639fcb5baf60ddc16bca43450d8d7dead6fdfdfab5da13ab2ffc8ae25056610de1aee0abc57737f3d4ac7417685bcefd2303c34b110ce749e1d65abbcf8bee  linux-lg-lenok-f383838578f56e03687c81ac7d6de12eafbd85f4.tar.gz
 2ca943fca8eefeacb0e8677ed3db5c0e27b0a643cb4b54afa0750df1f9accd23a9bd194905cf1cac6a8d1fae3aa480edd24ff737ad7e230de351c30a9400e592  config-lg-lenok.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
-2ab69ffa7940611fbaeba3f5ccca89e53530ea4603c815b329f137e717c2812e1049e29996d74f963d7d67166d1529589f6272367e77ee1e467e437661be1d12  refresh_rate.patch"
+a8c955bf718f155011e980f3d0948be98e1fee5649f418299a4851780543019daf7afa406aa7b0829375645107e4e6fbf241026b0cabe2b2ac895a47df83d2d8  02_mdss_fb_refresh_rate.patch"

device/linux-lg-mako/APKBUILD

@@ -20,7 +20,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=4
+pkgrel=5
 arch="armhf"
 pkgdesc="Nexus 4 kernel from LineageOS"
 url="https://github.com/LineageOS/lge-kernel-mako"
@@ -32,7 +32,7 @@ source="
 	$pkgname-$_hash.tar.gz::https://github.com/LineageOS/${_vendor}-kernel-mako/archive/${_hash}.tar.gz
 	$_config
 	compiler-gcc6.h
-	gpu-msm-fix-gcc5-compile.patch
+	02_gpu-msm-fix-gcc5-compile.patch
 "
 subpackages=""
 license="GPL2"
@@ -104,4 +104,4 @@ package() {
 sha512sums="744b7eb2f0abc60492a0e01c75814d9086fd572b909bffb6ee5f7ffaf7e9f335b13df33eb467bd9b1b192f57eb258737db52072d575130ce476552dbd1a707ff  linux-lg-mako-1495bfcf93f9e0e896331f29e1850387c31d6714.tar.gz
 091f0a6d604653098e3d06a834fa3d4a9c34cbdb4b742c949950bada118e58cc858dce817e763023fe7ac5dd7ae17930ef7a3de765e5b7d84b1971572dbf37a1  config-lg-mako.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
-7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  gpu-msm-fix-gcc5-compile.patch"
+7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch"

device/linux-motorola-titan/APKBUILD

@@ -24,7 +24,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=3
+pkgrel=4
 arch="armhf"
 pkgdesc="Motorola Moto G 2014 kernel from LineageOS"
 url="https://github.com/LineageOS/android_kernel_motorola_msm8226"
@@ -36,10 +36,10 @@ source="
     $pkgname-$_hash.tar.gz::https://github.com/LineageOS/android_kernel_motorola_msm8226/archive/${_hash}.tar.gz
     $_config
     compiler-gcc6.h
-    changes1.patch
-    gcc5-compile.patch
+    00_fix_return_address.patch
+    02_mdss_fb_refresh_rate.patch
+    multiple-fixes-gcc-5.patch
     Wno-error.patch
-    mdss_fb_refresh_rate.patch
 "
 subpackages=""
 license="GPL2"
@@ -112,7 +112,7 @@ package() {
 sha512sums="565d1e2f7fe5fa62f9b8273ebdfec56457d36f05ad09fc4fed3ad4e4d00ff6079af59acad65e3e43d3fcde1b1f5105e2fc98518131f1262cd846f3288294f8b8  linux-motorola-titan-09cff47d6b79b73ecc3461e227abf09faaa9e754.tar.gz
 9975a82511dc20ef0c771a84e1021e9358575a3c50847750567d03d3bccef088b099bcfa7145d5358f6c49c22dbbf401f49da3e60f87dc6486a1394119e77f3a  config-motorola-titan.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
-00bd2504cb922204c3b6a9ce243918f44d12f08e12f64535b9ec9f91d827160c4d5da85c3b84788a5f92d9eca63552265a203916505918367e2d397edbe148a8  changes1.patch
-4c13711fdcdce3ac0c4d30b79da7a331a9f32d46ad0b9572419b82d58db6eed76f728a340848d66a6378702749c56247439abb26fc1df0d3f5cfd1ef5b53acf9  gcc5-compile.patch
-d77966385f1aeb17fad6c3989766e874fea9d5818433d0c92c106dfd9aa3065102f018afb38678b0d741192d9efa4ede0ac4278802bf0878e3dec62dec64f50c  Wno-error.patch
-a8c955bf718f155011e980f3d0948be98e1fee5649f418299a4851780543019daf7afa406aa7b0829375645107e4e6fbf241026b0cabe2b2ac895a47df83d2d8  mdss_fb_refresh_rate.patch"
+ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
+a8c955bf718f155011e980f3d0948be98e1fee5649f418299a4851780543019daf7afa406aa7b0829375645107e4e6fbf241026b0cabe2b2ac895a47df83d2d8  02_mdss_fb_refresh_rate.patch
+4c13711fdcdce3ac0c4d30b79da7a331a9f32d46ad0b9572419b82d58db6eed76f728a340848d66a6378702749c56247439abb26fc1df0d3f5cfd1ef5b53acf9  multiple-fixes-gcc-5.patch
+d77966385f1aeb17fad6c3989766e874fea9d5818433d0c92c106dfd9aa3065102f018afb38678b0d741192d9efa4ede0ac4278802bf0878e3dec62dec64f50c  Wno-error.patch"

device/linux-motorola-titan/changes1.patch

@@ -1,25 +0,0 @@
---- a/arch/arm/include/asm/ftrace.h
-+++ b/arch/arm/include/asm/ftrace.h
-@@ -45,7 +45,7 @@
- 
- #else
- 
--extern inline void *return_address(unsigned int level)
-+static inline void *return_address(unsigned int level)
- {
-    return NULL;
- }
---- a/arch/arm/kernel/return_address.c
-+++ b/arch/arm/kernel/return_address.c
-@@ -58,11 +58,6 @@
- 
- #else /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) */
- 
--void *return_address(unsigned int level)
--{
--	return NULL;
--}
--
- #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
- 
- EXPORT_SYMBOL_GPL(return_address);

device/linux-oneplus-bacon/APKBUILD

@@ -18,7 +18,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=1
+pkgrel=2
 arch="armhf"
 pkgdesc="LineageOS kernel for OnePlus One"
 url="https://github.com/LineageOS/android_kernel_oneplus_msm8974"
@@ -30,7 +30,7 @@ source="
 	$pkgname-$_version.tar.gz::https://github.com/LineageOS/android_kernel_oneplus_msm8974/archive/${_version}.tar.gz
 	${_config}
 	compiler-gcc6.h
-	gpu-msm-fix-gcc5-compile.patch
+	02_gpu-msm-fix-gcc5-compile.patch
 "
 subpackages=""
 license="GPL2"
@@ -124,4 +124,4 @@ package() {
 sha512sums="3f2a599435799e8722ff20295dc438c1c8a303142ec73daf4f549dea1ed202271cf64d9bff9f781aaa0bebf6662a7e4061c2e9653d45c7936d2337c46a0f0789  linux-oneplus-bacon-lineage-15.0.tar.gz
 2939fdd0d54b56d9198b5b2527c2a3c647c74f658221c60b457bb68b5f5b1c3949876ae511ef5278766cf268d69fad8b25ca30d3fb807a8221b8d11769dfcf4a  config-oneplus-bacon.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
-7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  gpu-msm-fix-gcc5-compile.patch"
+7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch"

device/linux-sony-amami/APKBUILD

@@ -22,7 +22,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=6
+pkgrel=7
 arch="armhf"
 pkgdesc="Sony Xperia Z1 Compact kernel"
 url="https://github.com/sonyxperiadev/kernel"
@@ -34,7 +34,7 @@ source="
 	$pkgname-$_hash.tar.gz::https://github.com/sonyxperiadev/kernel/archive/${_hash}.tar.gz
 	$_config
 	compiler-gcc6.h
-	mdss_fb_refresh_rate.patch
+	02_mdss_fb_refresh_rate.patch
 "
 subpackages=""
 license="GPL2"
@@ -107,4 +107,4 @@ package() {
 sha512sums="cd4af23a9a6898e7f1807758f8ba0c9e99b0e31e4452df2fe05632da1f28366773e403d17d81872ff00d78e620d079aa510759b6763b13e6e74392be0d726ea3  linux-sony-amami-d78970c1afd9fad52cb4402c7bcb9701e8a06d41.tar.gz
 dd345d9f7f499ecbba274c274351fe174cd189f000b3459ca7e7e2d234740bc1fc0ed5ce69eaac8509f5867efd2699df35d64b03d1643da01ba1401e599bbaa7  config-sony-amami.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
-a8c955bf718f155011e980f3d0948be98e1fee5649f418299a4851780543019daf7afa406aa7b0829375645107e4e6fbf241026b0cabe2b2ac895a47df83d2d8  mdss_fb_refresh_rate.patch"
+a8c955bf718f155011e980f3d0948be98e1fee5649f418299a4851780543019daf7afa406aa7b0829375645107e4e6fbf241026b0cabe2b2ac895a47df83d2d8  02_mdss_fb_refresh_rate.patch"

device/linux-sony-aries/02_mdss_fb_refresh_rate.patch

@@ -8,6 +8,6 @@ index b37fd1e07ac1..1f091a261d22 100644
  	var->hsync_len = panel_info->lcdc.h_pulse_width;
 -	var->pixclock = panel_info->clk_rate / 1000;
 +	var->pixclock = 1000000 / 60;
-
+ 
  	/*
  	 * Store the cont splash state in the var reserved[3] field.

device/linux-sony-aries/APKBUILD

@@ -22,7 +22,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=2
+pkgrel=3
 arch="armhf"
 pkgdesc="Sony Xperia Z3 Compact kernel"
 url="https://github.com/sonyxperiadev/kernel"
@@ -34,7 +34,7 @@ source="
 	$pkgname-$_hash.tar.gz::https://github.com/sonyxperiadev/kernel/archive/${_hash}.tar.gz
 	$_config
 	compiler-gcc6.h
-	mdss_fb_refresh_rate.patch
+	02_mdss_fb_refresh_rate.patch
 "
 subpackages=""
 license="GPL2"
@@ -107,4 +107,4 @@ package() {
 sha512sums="e6b36c25be89d17b43d24cde6ab199012113ffa3fac438780cc9b05f83f13e84b1977cb078069d19dba1a78005cd7c8534d8fd0660c134ae388ea7f0d32c41b1  linux-sony-aries-b1ceda7b02ea29c526d329884db1e9f2694ab394.tar.gz
 0df5781942db4a9e391f0ddde057b3075ee18a0e0ceb4bec17bd2b9febe48376b790e66a86d72f0fe66a24943ebafa457fcd0b44b942f191266c715128d12f8f  config-sony-aries.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
-a8c955bf718f155011e980f3d0948be98e1fee5649f418299a4851780543019daf7afa406aa7b0829375645107e4e6fbf241026b0cabe2b2ac895a47df83d2d8  mdss_fb_refresh_rate.patch"
+a8c955bf718f155011e980f3d0948be98e1fee5649f418299a4851780543019daf7afa406aa7b0829375645107e4e6fbf241026b0cabe2b2ac895a47df83d2d8  02_mdss_fb_refresh_rate.patch"

device/linux-sony-yuga/APKBUILD

@@ -20,7 +20,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=1
+pkgrel=2
 arch="armhf"
 pkgdesc="Sony Xperia Z kernel"
 url="https://github.com/LineageOS/android_kernel_sony_apq8064"
@@ -32,10 +32,10 @@ source="
 	$pkgname-$_hash.tar.gz::https://github.com/LineageOS/android_kernel_sony_apq8064/archive/$_hash.tar.gz
 	$_config
 	compiler-gcc6.h
-        aeea3592a13bf12861943e44fc48f1f270941f8d.patch
+        00_fix_return_address.patch
         psmouse_base.patch
         kgsl_iommu_sync_lock.patch
-        reduce_lzo_compression.patch
+        02_reduce_lzo_compression.patch
 "
 subpackages=""
 license="GPL2"
@@ -108,7 +108,7 @@ package() {
 sha512sums="18f083088d8dd09263677c47d96802596bcf70e9e37cf8c9a886afd68225d573a5bef39fba155a9b1ba2074a45258a14aad720fe6af077278a49e40c747d817f  linux-sony-yuga-f164c6d1016cb34ac90c053acbebe6e47fdd400f.tar.gz
 fdb80d0b4c45fbd5e492abb9946752d834a4238e341aa57323e0b28f4a77fdbe5801ad8511c38c8b81ec6b364859f40496060dcca7e7306a0e95e522dcffbb94  config-sony-yuga.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
-ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  aeea3592a13bf12861943e44fc48f1f270941f8d.patch
+ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
 f7e31cfe422696922aec52002e56c58103183966edee3bb8e1995d33f8d37b07c32280a8ecc213874e358a6ff367418556a4542fba7e3c17e4b8e82e05c3a543  psmouse_base.patch
 448bad436377a22c93ac401b9aecb504fe8e84b9511a3dd28f3cc125f3725cc1168ef03dee9f8f1085a9fbb7910b9e75cd25a382ccce626b427c8e27f7c17ffc  kgsl_iommu_sync_lock.patch
-ef5b912c26fea4ab882592bdf7487942c64b123de8d25d08d976f29743f311742ee2f773bf2d110ddb5095f254dbb0bd4487c5cfce77311929082599199e7ebd  reduce_lzo_compression.patch"
+ef5b912c26fea4ab882592bdf7487942c64b123de8d25d08d976f29743f311742ee2f773bf2d110ddb5095f254dbb0bd4487c5cfce77311929082599199e7ebd  02_reduce_lzo_compression.patch"

device/linux-t2m-flame/00_fix_return_address.patch

@@ -0,0 +1,49 @@
+From aeea3592a13bf12861943e44fc48f1f270941f8d Mon Sep 17 00:00:00 2001
+From: Behan Webster <behanw@converseincode.com>
+Date: Wed, 24 Sep 2014 01:06:46 +0100
+Subject: [PATCH] ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
+
+With compilers which follow the C99 standard (like modern versions of gcc and
+clang), "extern inline" does the wrong thing (emits code for an externally
+linkable version of the inline function). In this case using static inline
+and removing the NULL version of return_address in return_address.c does
+the right thing.
+
+Signed-off-by: Behan Webster <behanw@converseincode.com>
+Reviewed-by: Mark Charlebois <charlebm@gmail.com>
+Acked-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+---
+ arch/arm/include/asm/ftrace.h    | 2 +-
+ arch/arm/kernel/return_address.c | 5 -----
+ 2 files changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
+index 39eb16b0066f2..bfe2a2f5a644e 100644
+--- a/arch/arm/include/asm/ftrace.h
++++ b/arch/arm/include/asm/ftrace.h
+@@ -45,7 +45,7 @@ void *return_address(unsigned int);
+ 
+ #else
+ 
+-extern inline void *return_address(unsigned int level)
++static inline void *return_address(unsigned int level)
+ {
+ 	return NULL;
+ }
+diff --git a/arch/arm/kernel/return_address.c b/arch/arm/kernel/return_address.c
+index fafedd86885dd..f6aa84d5b93c9 100644
+--- a/arch/arm/kernel/return_address.c
++++ b/arch/arm/kernel/return_address.c
+@@ -63,11 +63,6 @@ void *return_address(unsigned int level)
+ #warning "TODO: return_address should use unwind tables"
+ #endif
+ 
+-void *return_address(unsigned int level)
+-{
+-	return NULL;
+-}
+-
+ #endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) / else */
+ 
+ EXPORT_SYMBOL_GPL(return_address);

device/linux-t2m-flame/APKBUILD

@@ -20,7 +20,7 @@ case $pkgver in
 	*.*.*)  _kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=5
+pkgrel=6
 arch="armhf"
 pkgdesc="T2M flame kernel"
 url="https://github.com/mozilla-b2g/codeaurora_kernel_msm"
@@ -29,11 +29,11 @@ makedepends="dtbtool perl sed installkernel bash gmp-dev bc linux-headers elfuti
 options="!strip !check !tracedeps"
 install=
 source="
-	$pkgname-$_hash.zip::https://github.com/mozilla-b2g/codeaurora_kernel_msm/archive/${_hash}.zip
+	$pkgname-$_hash.tar.gz::https://github.com/mozilla-b2g/codeaurora_kernel_msm/archive/${_hash}.tar.gz
 	$_config
 	compiler-gcc6.h
-        gpu-msm-fix-gcc5-compile.patch
-        aeea3592a13bf12861943e44fc48f1f270941f8d.patch
+        00_fix_return_address.patch
+        02_gpu-msm-fix-gcc5-compile.patch
         add-missing-dtbs.patch
 "
 subpackages=""
@@ -119,9 +119,9 @@ package() {
 		"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
 }
 
-sha512sums="03532b82159d31e406594203f318f78aace500f997325149d161e1691c93c3bc54e903602d54d52dc8fbfe370828da3442f06f4a78b84b8370fa0ef5d9a05bef  linux-t2m-flame-03396c93577aafae7ca3603de1c74eafd30e7d54.zip
+sha512sums="76288c37192c92c7dfd7d9a7e1f8fb299f4e6fdc09e5ab9049efc5c1b67475b135821995999e1f96a13baba4605cf53908c5d29cf860ed4e94c9733add169a56  linux-t2m-flame-03396c93577aafae7ca3603de1c74eafd30e7d54.tar.gz
 28d4f4d0e1f0f55d06d05ad2a62560aa611f9611084b6653df9dd381323509c534227d1058acfad2c7bf014289b4f2a253ce47847c6fe5423688ec0998fb6056  config-t2m-flame.armhf
 d80980e9474c82ba0ef1a6903b434d8bd1b092c40367ba543e72d2c119301c8b2d05265740e4104ca1ac5d15f6c4aa49e8776cb44264a9a28dc551e0d1850dcc  compiler-gcc6.h
-7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  gpu-msm-fix-gcc5-compile.patch
-ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  aeea3592a13bf12861943e44fc48f1f270941f8d.patch
+ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
+7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch
 ee53d221cad0970316f16ff52927b9a133a2297b61a61976bd75c07b735b4c87d0a7e6b37d9a849460ec57f6da097801c9ae110b95f33756ca23a148ef86a1d2  add-missing-dtbs.patch"