From 51d2b47263f1ab16570ba96f9b896f433a448bb5 Mon Sep 17 00:00:00 2001
From: Kai Hernowski <kaiher99@mailbox.org>
Date: Mon, 15 Nov 2021 21:28:02 +0100
Subject: [PATCH] lg-vee7e: modenize aport (MR 2688)

[ci:skip-build] already built successfully in CI
---
 device/testing/linux-lg-vee7e/APKBUILD        | 26 ++++++++++++++-----
 ...cc10-extern_YYLOC_global_declaration.patch |  1 +
 2 files changed, 21 insertions(+), 6 deletions(-)
 create mode 120000 device/testing/linux-lg-vee7e/gcc10-extern_YYLOC_global_declaration.patch

diff --git a/device/testing/linux-lg-vee7e/APKBUILD b/device/testing/linux-lg-vee7e/APKBUILD
index d70a64687..8955940fe 100644
--- a/device/testing/linux-lg-vee7e/APKBUILD
+++ b/device/testing/linux-lg-vee7e/APKBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linux-lg-vee7e
 pkgver=3.4.0
-pkgrel=5
+pkgrel=6
 pkgdesc="LG Optimus L7 II kernel fork"
 arch="armhf"
 _carch="arm"
@@ -11,7 +11,15 @@ _flavor="lg-vee7e"
 url="https://kernel.org"
 license="GPL-2.0-only"
 options="!strip !check !tracedeps pmb:cross-native"
-makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev devicepkg-dev"
+makedepends="
+	bash
+	bc
+	bison
+	devicepkg-dev
+	flex
+	openssl-dev
+	perl
+"
 
 # Source
 _repository="lge-kernel-lproj"
@@ -22,12 +30,14 @@ source="
 	$_config
 	gcc7-give-up-on-ilog2-const-optimizations.patch
 	gcc8-fix-put-user.patch
+	gcc10-extern_YYLOC_global_declaration.patch
 	timeconst.pl-Eliminate-Perl-warning.patch
 	static-inline-in-ftrace.h.patch
 	02_gpu-msm-fix-gcc5-compile.patch
 	0001-Makefile-fix-build-with-new-binutils.patch
 "
 builddir="$srcdir/$_repository-$_commit"
+_outdir="out"
 
 prepare() {
 	default_prepare
@@ -36,19 +46,23 @@ prepare() {
 
 build() {
 	unset LDFLAGS
-	make ARCH="$_carch" CC="${CC:-gcc}" \
+	make O="$_outdir" ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
 }
 
 package() {
-	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
+	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" \
+		"$_flavor" "$_outdir"
 }
 
-sha512sums="0124de18237d4ea6a367aab9b6474a05bc67a5db18f687b8f58d3a8a63d2569b3ea9a9c8e33dc78ae834f4cc8fd2ee1c64b6d6a2ea12f0c4821b1f29385a3d8d  linux-lg-vee7e-8a90ec65502bde12a03c60d6756eea3e88c02917.tar.gz
+sha512sums="
+0124de18237d4ea6a367aab9b6474a05bc67a5db18f687b8f58d3a8a63d2569b3ea9a9c8e33dc78ae834f4cc8fd2ee1c64b6d6a2ea12f0c4821b1f29385a3d8d  linux-lg-vee7e-8a90ec65502bde12a03c60d6756eea3e88c02917.tar.gz
 ba3cb60f2ad27ed18e1bf43ec0c11b41f1d8066e06a3fbd82113f2602b88976776fd44d0bb4bf9bce05055cfc4879484155746eef29186954996adf04aff4c12  config-lg-vee7e.armhf
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
+2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
 1fcfb5f06a2bfdcc55d53054ca80d1b989599a39a5379d057a0724fc405187d74da4309a650e70b9c79d39444e81923cfc5c9199ed8c0a77c83dcd7998446bb7  timeconst.pl-Eliminate-Perl-warning.patch
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  static-inline-in-ftrace.h.patch
 7be03a9e78b7ac330a54b1f00509caa0621a95c0c55901878ad757f9dd69cc05ba2c8b5ea987063ae1224f92c4d090d515fa5d369e7755181a4871b0d0f82881  02_gpu-msm-fix-gcc5-compile.patch
-ea8d5913bb28a2e1b7a22e7e2257c90b21b20382c4a08254b12dda1592c20cb5ec59ed4047ee8890380739889a7365ca087c398581f8702568d3cd575a59d158  0001-Makefile-fix-build-with-new-binutils.patch"
+ea8d5913bb28a2e1b7a22e7e2257c90b21b20382c4a08254b12dda1592c20cb5ec59ed4047ee8890380739889a7365ca087c398581f8702568d3cd575a59d158  0001-Makefile-fix-build-with-new-binutils.patch
+"
diff --git a/device/testing/linux-lg-vee7e/gcc10-extern_YYLOC_global_declaration.patch b/device/testing/linux-lg-vee7e/gcc10-extern_YYLOC_global_declaration.patch
new file mode 120000
index 000000000..fe99abf4d
--- /dev/null
+++ b/device/testing/linux-lg-vee7e/gcc10-extern_YYLOC_global_declaration.patch
@@ -0,0 +1 @@
+../../.shared-patches/linux/gcc10-extern_YYLOC_global_declaration.patch
\ No newline at end of file