diff --git a/device/testing/linux-sony-yuga/APKBUILD b/device/testing/linux-sony-yuga/APKBUILD
index fbec7ae3bda068c8c4571046f256fe4be02d0cf7..26facc1de907916215d491f7e4b5ccca2b30b8cf 100644
--- a/device/testing/linux-sony-yuga/APKBUILD
+++ b/device/testing/linux-sony-yuga/APKBUILD
@@ -6,7 +6,7 @@
 
 pkgname=linux-sony-yuga
 pkgver=3.4.0
-pkgrel=12
+pkgrel=13
 pkgdesc="Sony Xperia Z kernel fork"
 arch="armv7"
 _carch="arm"
@@ -14,7 +14,15 @@ _flavor="sony-yuga"
 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="android_kernel_sony_apq8064"
@@ -25,12 +33,15 @@ source="
 	$_config
 	gcc7-give-up-on-ilog2-const-optimizations.patch
 	gcc8-fix-put-user.patch
+	gcc10-extern_YYLOC_global_declaration.patch
+	kernel-use-the-gnu89-standard-explicitly.patch
 	00_fix_return_address.patch
 	psmouse_base.patch
 	kgsl_iommu_sync_lock.patch
 	02_reduce_lzo_compression.patch
 "
 builddir="$srcdir/$_repository-$_commit"
+_outdir="out"
 
 prepare() {
 	default_prepare
@@ -39,19 +50,22 @@ 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="
 a20ab3f27b43999287ebef5ee150b1652ebc4996a2670079ff86a9ca07bd69555dbd1efb564ff767fb2bf22673dd609817aaded4731b09383d74c68887f545f4  linux-sony-yuga-f164c6d1016cb34ac90c053acbebe6e47fdd400f.tar.gz
 ed3ab86ed512cd5f9cbca9281377cab85176bc250f751735a11e55a18eda329ef2c73d18998a9ccb928d125e6b5ca780b7e98b7f43308dfc71feabe2a5c09a64  config-sony-yuga.armv7
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
+2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
+ad0182a483791fc88e058838bc331b2f04a75ba291e763767babdb815efadfc3b4fda97e69e2e3f00a426cabea088e35297a92bd287592597d1e309be68ee92c  kernel-use-the-gnu89-standard-explicitly.patch
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
 f7e31cfe422696922aec52002e56c58103183966edee3bb8e1995d33f8d37b07c32280a8ecc213874e358a6ff367418556a4542fba7e3c17e4b8e82e05c3a543  psmouse_base.patch
 448bad436377a22c93ac401b9aecb504fe8e84b9511a3dd28f3cc125f3725cc1168ef03dee9f8f1085a9fbb7910b9e75cd25a382ccce626b427c8e27f7c17ffc  kgsl_iommu_sync_lock.patch
diff --git a/device/testing/linux-sony-yuga/gcc10-extern_YYLOC_global_declaration.patch b/device/testing/linux-sony-yuga/gcc10-extern_YYLOC_global_declaration.patch
new file mode 120000
index 0000000000000000000000000000000000000000..fe99abf4d251a0c2a5596d67cc09a321bd5763f4
--- /dev/null
+++ b/device/testing/linux-sony-yuga/gcc10-extern_YYLOC_global_declaration.patch
@@ -0,0 +1 @@
+../../.shared-patches/linux/gcc10-extern_YYLOC_global_declaration.patch
\ No newline at end of file
diff --git a/device/testing/linux-sony-yuga/kernel-use-the-gnu89-standard-explicitly.patch b/device/testing/linux-sony-yuga/kernel-use-the-gnu89-standard-explicitly.patch
new file mode 120000
index 0000000000000000000000000000000000000000..a5f4de276037a4f48770b790adbd92649e666cf9
--- /dev/null
+++ b/device/testing/linux-sony-yuga/kernel-use-the-gnu89-standard-explicitly.patch
@@ -0,0 +1 @@
+../../.shared-patches/linux/kernel-use-the-gnu89-standard-explicitly.patch
\ No newline at end of file