From 65c0da83a0958b0355b07088027c46c503ba0147 Mon Sep 17 00:00:00 2001
From: Nihal Jere <nihal@nihaljere.xyz>
Date: Wed, 16 Dec 2020 16:51:09 -0600
Subject: [PATCH] testing/linux-motorola-channel: upgrade to 4.9.206 (MR 1817)

[ci:skip-build]: already built successfully in CI
---
 device/testing/linux-motorola-channel/APKBUILD       | 12 ++++++------
 .../linux-motorola-channel/fix_intree_dtc.patch      | 11 +++++++++++
 ...ux4.2-gcc10-extern_YYLOC_global_declaration.patch |  1 -
 3 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 device/testing/linux-motorola-channel/fix_intree_dtc.patch
 delete mode 120000 device/testing/linux-motorola-channel/linux4.2-gcc10-extern_YYLOC_global_declaration.patch

diff --git a/device/testing/linux-motorola-channel/APKBUILD b/device/testing/linux-motorola-channel/APKBUILD
index 7529d9bab..8af3a3e5c 100644
--- a/device/testing/linux-motorola-channel/APKBUILD
+++ b/device/testing/linux-motorola-channel/APKBUILD
@@ -3,8 +3,8 @@
 # Kernel config based on: arch/arm64/configs/channel_defconfig
 
 pkgname=linux-motorola-channel
-pkgver=4.9.203
-pkgrel=3
+pkgver=4.9.206
+pkgrel=0
 pkgdesc="Motorola G7 Play kernel fork"
 arch="aarch64"
 _carch="arm64"
@@ -16,14 +16,14 @@ makedepends="bash bc dtc bison devicepkg-dev flex openssl-dev perl dtbtool xz"
 
 # Source
 _repository="android_kernel_motorola_sdm632"
-_commit="db8fd3bcfeee53f5ad5ae71df30c2b88076ff002"
+_commit="92694d1c83cd63c6628b1ae42b6c5a4c1c95d67b"
 _config="config-$_flavor.$arch"
 source="
 	$pkgname-$_commit.tar.gz::https://github.com/LineageOS/$_repository/archive/$_commit.tar.gz
 	disable_tty_port_set_policy.patch
 	disable_skip_initramfs.patch
 	mdss-panel-to-fb-var.patch
-	linux4.2-gcc10-extern_YYLOC_global_declaration.patch
+	fix_intree_dtc.patch
 	$_config
 "
 builddir="$srcdir/$_repository-$_commit"
@@ -44,9 +44,9 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir"
 }
 
-sha512sums="41bbbe33864866407877c5769882782e099a3f48898eb26ea08f172ff0bcc1239e2fb2d250c491a44c3bc5a3718d373ced4b26682aaa574077d1cb7abbb282c5  linux-motorola-channel-db8fd3bcfeee53f5ad5ae71df30c2b88076ff002.tar.gz
+sha512sums="1453e028fec1f3ce45328b3e4857237f7986bfdf12343a662ccf006b266712fdb2becea2d37978389e7ac3799e0aff6326ffb2fe910d542021bd1051b5599533  linux-motorola-channel-92694d1c83cd63c6628b1ae42b6c5a4c1c95d67b.tar.gz
 0fd5fd59e16c24a85302de83f61468591df472afbddaeab2b3dbf59cf9d48af2ac8ecc1a48a72b7a1db44077fbd4856dc60f2b2885eb1adf1f8e96b3a311eaad  disable_tty_port_set_policy.patch
 65048fb6474fd543b14bc99d9d95cfe5297da239af211d327a8509f7777d489bd01dd911364e0c62ec0e68f4c22ebb3b145eabfe01cad2abf57cf46896a1e58f  disable_skip_initramfs.patch
 d5b868c64b8ebddcf74cb3aa478f30f0897af1e14e4fc42d977921104a6c568cc0bf36fc8a3b0f538cd3ca2ebf59244fdf23186a903259e5acc14d1c4ef4ccc3  mdss-panel-to-fb-var.patch
-eaf2e61fcb508cdd239b8fed209d2a09ecac77287f6b46d003918fdf1c6fa2ee63f7390f3ff7c49029b8ed6cbcdd81c7e9a4b1ece9f5060b6fc84e322bd47f41  linux4.2-gcc10-extern_YYLOC_global_declaration.patch
+c6d7273b247ea58281962bfd8545d8f273d5d6c0dfb1f16ce16e8b14988abdbed249863d3b9998aded5ab445022dc551480d5190b4595d84d028f60dcc03d76d  fix_intree_dtc.patch
 9cfefeefeaddfa7827357a5a2ede3ac6c5bb559d040b7e2dc657b4cb3bd0e84823f35500c569547a7bdf6eb98c4c2f37f3d941fb0b95b835040f83c46bdc896d  config-motorola-channel.aarch64"
diff --git a/device/testing/linux-motorola-channel/fix_intree_dtc.patch b/device/testing/linux-motorola-channel/fix_intree_dtc.patch
new file mode 100644
index 000000000..5a8d7a38c
--- /dev/null
+++ b/device/testing/linux-motorola-channel/fix_intree_dtc.patch
@@ -0,0 +1,11 @@
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -332,7 +332,7 @@
+ 		-d $(depfile).dtc.tmp $(dtc-tmp) ; \
+ 	cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
+ 
+-$(obj)/%.dtb: $(src)/%.dts $(DTC) FORCE
++$(obj)/%.dtb: $(src)/%.dts FORCE
+ 	$(call if_changed_dep,dtc)
+ 
+ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
diff --git a/device/testing/linux-motorola-channel/linux4.2-gcc10-extern_YYLOC_global_declaration.patch b/device/testing/linux-motorola-channel/linux4.2-gcc10-extern_YYLOC_global_declaration.patch
deleted file mode 120000
index 094195829..000000000
--- a/device/testing/linux-motorola-channel/linux4.2-gcc10-extern_YYLOC_global_declaration.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../.shared-patches/linux/linux4.2-gcc10-extern_YYLOC_global_declaration.patch
\ No newline at end of file