From 63b7969efd4c6b364c7f0706f88049c357ca4822 Mon Sep 17 00:00:00 2001
From: Kai Hernowski <kaiher99@mailbox.org>
Date: Tue, 16 Nov 2021 19:32:26 +0100
Subject: [PATCH] lg-vee7e: change to armv7 and gcc6 (MR 2689)

[ci:skip-build]: already built successfully in CI
---
 device/testing/device-lg-vee7e/APKBUILD          |  8 ++++----
 device/testing/device-lg-vee7e/deviceinfo        |  2 +-
 device/testing/linux-lg-vee7e/APKBUILD           | 16 +++++++++++++---
 ...nfig-lg-vee7e.armhf => config-lg-vee7e.armv7} |  0
 ...fs-Fix-proc-tid-fdinfo-fd-file-handling.patch |  1 +
 5 files changed, 19 insertions(+), 8 deletions(-)
 rename device/testing/linux-lg-vee7e/{config-lg-vee7e.armhf => config-lg-vee7e.armv7} (100%)
 create mode 120000 device/testing/linux-lg-vee7e/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch

diff --git a/device/testing/device-lg-vee7e/APKBUILD b/device/testing/device-lg-vee7e/APKBUILD
index 1d36b994e..5ec73f978 100644
--- a/device/testing/device-lg-vee7e/APKBUILD
+++ b/device/testing/device-lg-vee7e/APKBUILD
@@ -1,11 +1,11 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-lg-vee7e
 pkgdesc="LG Optimus L7 II"
-pkgver=0.1
-pkgrel=5
+pkgver=0.2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="armhf"
+arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base linux-lg-vee7e mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
@@ -21,5 +21,5 @@ package() {
 
 
 sha512sums="
-86f72e219f8068038b571612420415e07f83f1ce4b780ad0324b484a3add216c9fdb36919dd080576c3229d15447dded42ceec85530633e2a735ef6be1ac6cb8  deviceinfo
+27bf4587514aaea81ba9815226cd56ff2e1b311d97f85871ea829d507bc10a6b7d9bc1238dec175c498825487782c22b9cd9e97c5b0c9119d694f26432070aa3  deviceinfo
 "
diff --git a/device/testing/device-lg-vee7e/deviceinfo b/device/testing/device-lg-vee7e/deviceinfo
index a5d87437a..91cfb9f9e 100644
--- a/device/testing/device-lg-vee7e/deviceinfo
+++ b/device/testing/device-lg-vee7e/deviceinfo
@@ -6,7 +6,7 @@ deviceinfo_name="LG Optimus L7 II"
 deviceinfo_manufacturer="LG"
 deviceinfo_codename="lg-vee7e"
 deviceinfo_year="2013"
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_chassis="handset"
diff --git a/device/testing/linux-lg-vee7e/APKBUILD b/device/testing/linux-lg-vee7e/APKBUILD
index 8955940fe..8d578f82a 100644
--- a/device/testing/linux-lg-vee7e/APKBUILD
+++ b/device/testing/linux-lg-vee7e/APKBUILD
@@ -3,9 +3,9 @@
 
 pkgname=linux-lg-vee7e
 pkgver=3.4.0
-pkgrel=6
+pkgrel=8
 pkgdesc="LG Optimus L7 II kernel fork"
-arch="armhf"
+arch="armv7"
 _carch="arm"
 _flavor="lg-vee7e"
 url="https://kernel.org"
@@ -19,8 +19,16 @@ makedepends="
 	flex
 	openssl-dev
 	perl
+	gcc6
 "
 
+if [ "${CC:0:5}" != "gcc6-" ]; then
+	CC="gcc6-$CC"
+	HOSTCC="gcc6-gcc"
+	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
+fi
+
+
 # Source
 _repository="lge-kernel-lproj"
 _commit="8a90ec65502bde12a03c60d6756eea3e88c02917"
@@ -35,6 +43,7 @@ source="
 	static-inline-in-ftrace.h.patch
 	02_gpu-msm-fix-gcc5-compile.patch
 	0001-Makefile-fix-build-with-new-binutils.patch
+	linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch
 "
 builddir="$srcdir/$_repository-$_commit"
 _outdir="out"
@@ -57,7 +66,7 @@ package() {
 
 sha512sums="
 0124de18237d4ea6a367aab9b6474a05bc67a5db18f687b8f58d3a8a63d2569b3ea9a9c8e33dc78ae834f4cc8fd2ee1c64b6d6a2ea12f0c4821b1f29385a3d8d  linux-lg-vee7e-8a90ec65502bde12a03c60d6756eea3e88c02917.tar.gz
-ba3cb60f2ad27ed18e1bf43ec0c11b41f1d8066e06a3fbd82113f2602b88976776fd44d0bb4bf9bce05055cfc4879484155746eef29186954996adf04aff4c12  config-lg-vee7e.armhf
+ba3cb60f2ad27ed18e1bf43ec0c11b41f1d8066e06a3fbd82113f2602b88976776fd44d0bb4bf9bce05055cfc4879484155746eef29186954996adf04aff4c12  config-lg-vee7e.armv7
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
 2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
@@ -65,4 +74,5 @@ ba3cb60f2ad27ed18e1bf43ec0c11b41f1d8066e06a3fbd82113f2602b88976776fd44d0bb4bf9bc
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  static-inline-in-ftrace.h.patch
 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch
 ea8d5913bb28a2e1b7a22e7e2257c90b21b20382c4a08254b12dda1592c20cb5ec59ed4047ee8890380739889a7365ca087c398581f8702568d3cd575a59d158  0001-Makefile-fix-build-with-new-binutils.patch
+5e81c20b0b30c1ab09bd59f1e1b77fcce945a27de8144c68617ddc5e8f10e1f6fa8b1e4cd5d63e43511d61dace46fb26b14a6227a667b9718d44c8b81dbe6100  linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch
 "
diff --git a/device/testing/linux-lg-vee7e/config-lg-vee7e.armhf b/device/testing/linux-lg-vee7e/config-lg-vee7e.armv7
similarity index 100%
rename from device/testing/linux-lg-vee7e/config-lg-vee7e.armhf
rename to device/testing/linux-lg-vee7e/config-lg-vee7e.armv7
diff --git a/device/testing/linux-lg-vee7e/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch b/device/testing/linux-lg-vee7e/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch
new file mode 120000
index 000000000..93c8ae533
--- /dev/null
+++ b/device/testing/linux-lg-vee7e/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch
@@ -0,0 +1 @@
+../../.shared-patches/linux/linux3.4-vfs-Fix-proc-tid-fdinfo-fd-file-handling.patch
\ No newline at end of file