From ea583fc601d0a7396a013fcf701e2d3a3da1d194 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 28 Feb 2020 11:17:04 +0100
Subject: [PATCH] device/linux-*: various custom linter fixes (!1007)

---
 device/linux-amazon-thor/APKBUILD                |  2 +-
 device/linux-asus-tf101/APKBUILD                 |  1 -
 device/linux-chuwi-hi10plus/APKBUILD             | 10 +++++-----
 device/linux-google-crosshatch-mainline/APKBUILD |  3 +--
 device/linux-hisense-m470bsa/APKBUILD            |  2 +-
 device/linux-huawei-y530/APKBUILD                |  1 -
 device/linux-infocus-flatfish/APKBUILD           |  2 --
 device/linux-lg-d285/APKBUILD                    | 10 ++++------
 device/linux-medion-kai/APKBUILD                 |  1 -
 device/linux-motorola-maserati/APKBUILD          |  2 --
 device/linux-motorola-montana/APKBUILD           |  2 +-
 device/linux-motorola-osprey/APKBUILD            |  8 ++++----
 device/linux-motorola-surnia/APKBUILD            |  6 +++---
 device/linux-nokia-frt/APKBUILD                  |  4 +---
 device/linux-nokia-n9/APKBUILD                   |  5 ++---
 device/linux-oneplus-bacon/APKBUILD              |  2 +-
 device/linux-oppo-find-7a/APKBUILD               |  8 ++++----
 device/linux-purism-librem5/APKBUILD             |  2 +-
 device/linux-samsung-apexq/APKBUILD              |  3 +--
 device/linux-samsung-golden/APKBUILD             |  1 -
 device/linux-samsung-i9003/APKBUILD              |  3 ++-
 device/linux-samsung-i9070/APKBUILD              |  1 -
 device/linux-samsung-i9100/APKBUILD              |  3 ++-
 device/linux-samsung-klte/APKBUILD               |  1 -
 device/linux-samsung-nevisp/APKBUILD             |  1 -
 device/linux-sony-nicki-mainline/APKBUILD        |  3 +--
 device/linux-sony-seagull/APKBUILD               |  2 +-
 device/linux-xiaomi-armani/APKBUILD              |  5 +----
 device/linux-xiaomi-kenzo/APKBUILD               |  8 ++++----
 device/linux-yu-tomato/APKBUILD                  |  2 +-
 device/linux-zuk-z2-row/APKBUILD                 |  1 -
 31 files changed, 42 insertions(+), 63 deletions(-)

diff --git a/device/linux-amazon-thor/APKBUILD b/device/linux-amazon-thor/APKBUILD
index 90a786a6d..9e06f495d 100755
--- a/device/linux-amazon-thor/APKBUILD
+++ b/device/linux-amazon-thor/APKBUILD
@@ -49,7 +49,7 @@ build() {
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
-	
+
 	dtbTool -s 2048 -p "scripts/dtc/" -o "arch/arm/boot/dt.img" "arch/arm/boot/" --version=1
 }
 
diff --git a/device/linux-asus-tf101/APKBUILD b/device/linux-asus-tf101/APKBUILD
index 92927339d..35f58c584 100644
--- a/device/linux-asus-tf101/APKBUILD
+++ b/device/linux-asus-tf101/APKBUILD
@@ -56,7 +56,6 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 
 	# Modules
-	cd "$builddir"
 	unset LDFLAGS
 	make modules_install \
 		ARCH="$_carch" \
diff --git a/device/linux-chuwi-hi10plus/APKBUILD b/device/linux-chuwi-hi10plus/APKBUILD
index 1b8d36f35..eb1c2127d 100644
--- a/device/linux-chuwi-hi10plus/APKBUILD
+++ b/device/linux-chuwi-hi10plus/APKBUILD
@@ -48,12 +48,12 @@ package() {
 }
 
 dev() {
-    cd $builddir
+	cd "$builddir"
 
-    # https://github.com/torvalds/linux/blob/master/Documentation/kbuild/headers_install.txt
-    make -j1 headers_install \
-        ARCH="$_carch" \
-        INSTALL_HDR_PATH="$subpkgdir"/usr
+	# https://github.com/torvalds/linux/blob/master/Documentation/kbuild/headers_install.txt
+	make -j1 headers_install \
+		ARCH="$_carch" \
+		INSTALL_HDR_PATH="$subpkgdir"/usr
 }
 
 sha512sums="8d84560e22a6473653efa1dc229c8f8c4f95da8c2f61050583bb1285efa774c958fb13da1cf83a4f9c2cd2e73f2075569da346fa64399ccd058e793754da066a  linux-chuwi-hi10plus-5.1.7.tar.gz
diff --git a/device/linux-google-crosshatch-mainline/APKBUILD b/device/linux-google-crosshatch-mainline/APKBUILD
index 5997c2c33..8672677b3 100644
--- a/device/linux-google-crosshatch-mainline/APKBUILD
+++ b/device/linux-google-crosshatch-mainline/APKBUILD
@@ -27,7 +27,7 @@ _repository="linux"
 _commit="9c9b87cec239101274451cc9c086da60108f9fda"
 
 source="
-        $pkgname-$_commit.tar.gz::https://github.com/Pixel3Dev/$_repository/archive/$_commit.tar.gz
+	$pkgname-$_commit.tar.gz::https://github.com/Pixel3Dev/$_repository/archive/$_commit.tar.gz
 	config-$_flavor.aarch64
 "
 
@@ -47,7 +47,6 @@ builddir="$srcdir/linux-$_commit"
 
 prepare() {
 	local _patch_failed=
-	cd "$builddir"
 	# first apply patches in specified order
 	for i in $source; do
 		case $i in
diff --git a/device/linux-hisense-m470bsa/APKBUILD b/device/linux-hisense-m470bsa/APKBUILD
index 24f68ab7d..159b16f48 100644
--- a/device/linux-hisense-m470bsa/APKBUILD
+++ b/device/linux-hisense-m470bsa/APKBUILD
@@ -41,7 +41,7 @@ build() {
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \
-    		CFLAGS_MODULE=-fno-pic modules
+		CFLAGS_MODULE=-fno-pic modules
 }
 
 package() {
diff --git a/device/linux-huawei-y530/APKBUILD b/device/linux-huawei-y530/APKBUILD
index c52c16aa3..b79beb3ad 100644
--- a/device/linux-huawei-y530/APKBUILD
+++ b/device/linux-huawei-y530/APKBUILD
@@ -73,7 +73,6 @@ package() {
 		"$pkgdir/boot/dt.img"
 
 	# Modules
-	cd "$builddir"
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		CONFIG_NO_ERROR_ON_MISMATCH=y \
diff --git a/device/linux-infocus-flatfish/APKBUILD b/device/linux-infocus-flatfish/APKBUILD
index d318397e1..aaafa66b8 100644
--- a/device/linux-infocus-flatfish/APKBUILD
+++ b/device/linux-infocus-flatfish/APKBUILD
@@ -50,7 +50,6 @@ build() {
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \
 		-C $builddir/arch/arm/mach-sun6i/pm/standby
 
-	cd $builddir
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
 }
@@ -59,7 +58,6 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 
 	# External modules install
-	cd "$builddir"
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \
 		INSTALL_MOD_PATH="$pkgdir" modules_install
diff --git a/device/linux-lg-d285/APKBUILD b/device/linux-lg-d285/APKBUILD
index d58ac2986..ac82a3198 100644
--- a/device/linux-lg-d285/APKBUILD
+++ b/device/linux-lg-d285/APKBUILD
@@ -74,7 +74,7 @@ prepare() {
 	cp -v "$srcdir/compiler-gcc6.h" "$ksrcdir/include/linux/"
 
 	mkdir -p "$srcdir"/build
-	cp "$srcdir"/$_config "$srcdir"/build/.config || return 1
+	cp "$srcdir"/$_config "$srcdir"/build/.config
 	echo "--[ silentoldconfig ]--"
 	yes "" | make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" HOSTCC="$HOSTCC" \
 		oldconfig
@@ -84,12 +84,11 @@ build() {
 	cd "$srcdir"/build
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \
-		|| return 1
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y
 	echo "--[ Build modules ]--"
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \
-		modules || return 1
+		modules
 }
 
 package() {
@@ -104,8 +103,7 @@ package() {
 	echo "--[ Installing modules ]--"
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" CONFIG_NO_ERROR_ON_MISMATCH=y \
-		INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1 modules_install \
-		|| return 1
+		INSTALL_MOD_PATH="$pkgdir" INSTALL_MOD_STRIP=1 modules_install
 }
 
 sha512sums="d201e20557edea08947f10be1465560d292522f07099e2f8927164766da57e4f8a2c3fcd3e3ed427e856a86afe4fb3a4233753e19d4b7cb96b8258c6355be9f0  linux-lg-d285-75a583b12772acf3a6e7422cf781ddd7a9e9a5c5.tar.gz
diff --git a/device/linux-medion-kai/APKBUILD b/device/linux-medion-kai/APKBUILD
index b5a5388e5..35db05947 100644
--- a/device/linux-medion-kai/APKBUILD
+++ b/device/linux-medion-kai/APKBUILD
@@ -54,7 +54,6 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 
 	# Modules
-	cd "$builddir"
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" \
diff --git a/device/linux-motorola-maserati/APKBUILD b/device/linux-motorola-maserati/APKBUILD
index 426e91c8b..70eb7f908 100644
--- a/device/linux-motorola-maserati/APKBUILD
+++ b/device/linux-motorola-maserati/APKBUILD
@@ -56,7 +56,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
@@ -77,7 +76,6 @@ build() {
 package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 
-	cd "$builddir"
 	make modules_install \
 		ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \
diff --git a/device/linux-motorola-montana/APKBUILD b/device/linux-motorola-montana/APKBUILD
index a081b7b24..2825e9b73 100644
--- a/device/linux-motorola-montana/APKBUILD
+++ b/device/linux-motorola-montana/APKBUILD
@@ -18,7 +18,7 @@ _repository="android_kernel_motorola_msm8937"
 _commit="1e8993177823e4ddf3b5d91da6335d75ad513dec"
 _config="config-$_flavor.$arch"
 source="
-	$pkgname-$_commit.tar.gz::https://github.com/MontanaDevelopment/$_repository/archive/$_commit.tar.gz 
+	$pkgname-$_commit.tar.gz::https://github.com/MontanaDevelopment/$_repository/archive/$_commit.tar.gz
 	$_config
 "
 builddir="$srcdir/$_repository-$_commit"
diff --git a/device/linux-motorola-osprey/APKBUILD b/device/linux-motorola-osprey/APKBUILD
index 3e79e95d3..093153099 100644
--- a/device/linux-motorola-osprey/APKBUILD
+++ b/device/linux-motorola-osprey/APKBUILD
@@ -105,11 +105,11 @@ package() {
 	install -Dm644 "$builddir/arch/arm/boot/dt.img" \
 		"$pkgdir/boot/dt.img"
 
-        cd "$srcdir"/build
+	cd "$srcdir"/build
 
-        make -j1 modules_install \
-                ARCH="$_carch" \
-                INSTALL_MOD_PATH="$pkgdir"
+	make -j1 modules_install \
+		ARCH="$_carch" \
+		INSTALL_MOD_PATH="$pkgdir"
 }
 
 sha512sums="fbc2e1fa6ff33dd4c20bb063c655fe85ee20c194a9c19a5fadd3434b8ade4b95377848349ce9266d74ca34882446e1e257c0e1a3e35bd23ff05813918dc74750  linux-motorola-osprey-ac87541051278c7ea7f494c0b689d08e4a5cdd4f.tar.gz
diff --git a/device/linux-motorola-surnia/APKBUILD b/device/linux-motorola-surnia/APKBUILD
index 9b62905ba..0546132bb 100644
--- a/device/linux-motorola-surnia/APKBUILD
+++ b/device/linux-motorola-surnia/APKBUILD
@@ -15,9 +15,9 @@ makedepends="perl sed installkernel bash gmp-dev bc linux-headers elfutils-dev d
 
 # Compiler: GCC 6 (doesn't compile with newer versions)
 if [ "${CC:0:5}" != "gcc6-" ]; then
-    CC="gcc6-$CC"
-    HOSTCC="gcc6-gcc"
-    CROSS_COMPILE="gcc6-$CROSS_COMPILE"
+	CC="gcc6-$CC"
+	HOSTCC="gcc6-gcc"
+	CROSS_COMPILE="gcc6-$CROSS_COMPILE"
 fi
 
 # Source
diff --git a/device/linux-nokia-frt/APKBUILD b/device/linux-nokia-frt/APKBUILD
index 8d99f34a1..8733336dc 100644
--- a/device/linux-nokia-frt/APKBUILD
+++ b/device/linux-nokia-frt/APKBUILD
@@ -1,7 +1,6 @@
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm/configs/FRT_defconfig
-
-maintainer="Piotr Halama <skrzynka@halamix2.pl>"
+# Maintainer: Piotr Halama <skrzynka@halamix2.pl>
 pkgname="linux-nokia-frt"
 pkgver=3.18.79
 pkgrel=1
@@ -45,7 +44,6 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 
 	# Modules
-	cd "$builddir"
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" \
diff --git a/device/linux-nokia-n9/APKBUILD b/device/linux-nokia-n9/APKBUILD
index c39ad0747..681d3c1de 100644
--- a/device/linux-nokia-n9/APKBUILD
+++ b/device/linux-nokia-n9/APKBUILD
@@ -73,7 +73,7 @@ prepare() {
 	cp "$srcdir/RM-696_Pyrenees_SMD_V1_6.raw" "$ksrcdir/firmware/maxtouch.cfg"
 
 	mkdir -p "$srcdir"/build
-	cp "$srcdir"/$_config "$srcdir"/build/.config || return 1
+	cp "$srcdir"/$_config "$srcdir"/build/.config
 	make -C "$ksrcdir" O="$srcdir"/build ARCH="$_carch" \
 		olddefconfig
 }
@@ -82,8 +82,7 @@ build() {
 	cd "$srcdir"/build
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
-		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine" \
-		|| return 1
+		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine"
 	cd $ksrcdir
 }
 
diff --git a/device/linux-oneplus-bacon/APKBUILD b/device/linux-oneplus-bacon/APKBUILD
index 7464e360f..61e570666 100644
--- a/device/linux-oneplus-bacon/APKBUILD
+++ b/device/linux-oneplus-bacon/APKBUILD
@@ -2,7 +2,7 @@
 # - add !check !tracedeps
 # - do not create -dev subpackage
 # - add 'xz' and 'dtbtool' as build dependencies
-# - add `dtbTool` build hook to generate separate 'dt.img'
+# - add 'dtbTool' build hook to generate separate 'dt.img'
 #
 # Kernel config based on: arch/arm/configs/lineageos_bacon_defconfig
 # Changes:
diff --git a/device/linux-oppo-find-7a/APKBUILD b/device/linux-oppo-find-7a/APKBUILD
index c0b40be9b..76c13064d 100644
--- a/device/linux-oppo-find-7a/APKBUILD
+++ b/device/linux-oppo-find-7a/APKBUILD
@@ -63,8 +63,7 @@ package() {
 	# Master DTB (deviceinfo_bootimg_qcdt)
 	install -Dm644 "$builddir/arch/arm/boot/dt.img" \
 		"$pkgdir/boot/dt.img"
-	
-	cd "$builddir"
+
 	make -j1 modules_install ARCH="$_carch" INSTALL_MOD_PATH="$pkgdir"
 }
 
@@ -72,15 +71,16 @@ dev() {
 	pkgdesc="Headers and script for third party modules for $pkgname kernel"
 	depends="gmp-dev bash perl"
 	cd "$builddir"
+
 	local dir="$subpkgdir"/usr/src/linux-headers-$_abi_release
 	mkdir -p "$dir"
 	make -j1 headers_install ARCH="$_carch" INSTALL_HDR_PATH="$dir"
-	
+
 	mkdir -p "$subpkgdir"/lib/modules/$_abi_release
 
 	install -Dm644 "$builddir"/Module.symvers \
 		"$subpkgdir"/lib/modules/$_abi_release/Module.symvers
-		
+
 	ln -sf /usr/src/linux-headers-$_abi_release \
 		"$subpkgdir"/lib/modules/$_abi_release/build
 }
diff --git a/device/linux-purism-librem5/APKBUILD b/device/linux-purism-librem5/APKBUILD
index 69cf7b9fb..1f9a6a707 100644
--- a/device/linux-purism-librem5/APKBUILD
+++ b/device/linux-purism-librem5/APKBUILD
@@ -21,7 +21,7 @@ _commit="1309cc0a813e70af9b3d8c29d513e78715475de5"
 _config="config-$_flavor.$arch"
 source="
 	$pkgname-$_commit.tar.gz::https://source.puri.sm/Librem5/$_repository/-/archive/$_commit.tar.gz
-        0001-force-host-mode-for-usb.patch
+	0001-force-host-mode-for-usb.patch
 	$_config
 "
 builddir="$srcdir/$_repository-$_commit"
diff --git a/device/linux-samsung-apexq/APKBUILD b/device/linux-samsung-apexq/APKBUILD
index 5a9ebd937..961de3ce6 100644
--- a/device/linux-samsung-apexq/APKBUILD
+++ b/device/linux-samsung-apexq/APKBUILD
@@ -36,7 +36,7 @@ build() {
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
-	
+
 	make ARCH="$_carch" CC="${CC:-gcc}" CFLAGS_MODULE="-fno-pic" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" modules
 }
@@ -44,7 +44,6 @@ build() {
 package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 
-	cd "$builddir"
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" INSTALL_MOD_PATH="$pkgdir" \
 		modules_install
diff --git a/device/linux-samsung-golden/APKBUILD b/device/linux-samsung-golden/APKBUILD
index d1e696a27..94a6af648 100644
--- a/device/linux-samsung-golden/APKBUILD
+++ b/device/linux-samsung-golden/APKBUILD
@@ -53,7 +53,6 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 
 	# Modules
-	cd "$builddir"
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" \
diff --git a/device/linux-samsung-i9003/APKBUILD b/device/linux-samsung-i9003/APKBUILD
index ad90237e1..2d69a3526 100644
--- a/device/linux-samsung-i9003/APKBUILD
+++ b/device/linux-samsung-i9003/APKBUILD
@@ -49,12 +49,13 @@ prepare_isorec() {
 
 	# Paths supplied to gen_initramfs_list.sh are prefixed with "source/".
 	ln -s "$builddir" ln -s "$builddir"/source
+
+	cd "$builddir"
 }
 
 prepare() {
 	default_prepare
 	prepare_isorec
-	cd "$builddir"
 	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
 }
 
diff --git a/device/linux-samsung-i9070/APKBUILD b/device/linux-samsung-i9070/APKBUILD
index 2b6bef12c..aaae53fe1 100644
--- a/device/linux-samsung-i9070/APKBUILD
+++ b/device/linux-samsung-i9070/APKBUILD
@@ -67,7 +67,6 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 
 	# Modules
-	cd "$builddir"
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" \
diff --git a/device/linux-samsung-i9100/APKBUILD b/device/linux-samsung-i9100/APKBUILD
index 430bab19a..9960249bc 100644
--- a/device/linux-samsung-i9100/APKBUILD
+++ b/device/linux-samsung-i9100/APKBUILD
@@ -45,13 +45,14 @@ prepare_isorec() {
 
 	# Paths supplied to gen_initramfs_list.sh are prefixed with "source/".
 	ln -s "$builddir" ln -s "$builddir"/source
+
+	cd "$builddir"
 }
 
 prepare() {
 	default_prepare
 	prepare_isorec
 
-	cd "$builddir"
 	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
 }
 
diff --git a/device/linux-samsung-klte/APKBUILD b/device/linux-samsung-klte/APKBUILD
index 1617c6579..b3ef3384c 100644
--- a/device/linux-samsung-klte/APKBUILD
+++ b/device/linux-samsung-klte/APKBUILD
@@ -68,7 +68,6 @@ package() {
 		"$pkgdir/boot/dt.img"
 
 	# External modules install
-	cd "$builddir"
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \
 		INSTALL_MOD_PATH="$pkgdir" modules_install
diff --git a/device/linux-samsung-nevisp/APKBUILD b/device/linux-samsung-nevisp/APKBUILD
index 205cffbbe..c11e9fb29 100644
--- a/device/linux-samsung-nevisp/APKBUILD
+++ b/device/linux-samsung-nevisp/APKBUILD
@@ -57,7 +57,6 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 
 	# Modules
-	cd "$builddir"
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" \
diff --git a/device/linux-sony-nicki-mainline/APKBUILD b/device/linux-sony-nicki-mainline/APKBUILD
index 87e50b9dc..92c21c09b 100644
--- a/device/linux-sony-nicki-mainline/APKBUILD
+++ b/device/linux-sony-nicki-mainline/APKBUILD
@@ -27,7 +27,7 @@ _repository="linux"
 _commit="ad6ab7f8c57896cb3829e6a80408e0912d6096c2"
 
 source="
-        $pkgname-$_commit.tar.gz::https://github.com/konradybcio/$_repository/archive/$_commit.tar.gz
+	$pkgname-$_commit.tar.gz::https://github.com/konradybcio/$_repository/archive/$_commit.tar.gz
 	config-$_flavor.armv7
 "
 
@@ -45,7 +45,6 @@ builddir="$srcdir/linux-$_commit"
 
 prepare() {
 	local _patch_failed=
-	cd "$builddir"
 	# first apply patches in specified order
 	for i in $source; do
 		case $i in
diff --git a/device/linux-sony-seagull/APKBUILD b/device/linux-sony-seagull/APKBUILD
index 398c0f103..d2c7459c8 100644
--- a/device/linux-sony-seagull/APKBUILD
+++ b/device/linux-sony-seagull/APKBUILD
@@ -49,7 +49,7 @@ build() {
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \
-        CONFIG_NO_ERROR_ON_MISMATCH=y
+		CONFIG_NO_ERROR_ON_MISMATCH=y
 
 	# Generate master DTB (deviceinfo_bootimg_qcdt)
 	dtbTool -s 2048 -p "scripts/dtc/" -o "arch/arm/boot/dt.img" "arch/arm/boot/"
diff --git a/device/linux-xiaomi-armani/APKBUILD b/device/linux-xiaomi-armani/APKBUILD
index b9a40f2ba..d279368ec 100644
--- a/device/linux-xiaomi-armani/APKBUILD
+++ b/device/linux-xiaomi-armani/APKBUILD
@@ -60,12 +60,9 @@ package() {
 		"$pkgdir/boot/dt.img"
 
 	# External modules install
-	cd "$builddir"
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS" \
-		INSTALL_MOD_PATH="$pkgdir" modules_install \
-		|| return 1
-	
+		INSTALL_MOD_PATH="$pkgdir" modules_install
 }
 
 sha512sums="360bf588a670cb7cd67b431c0f7cddb622d0364b3c5a0f0b9b6dd63d8b5dd7d365d6e075a1ce0652d13ce6a9d26cfb85d7b68eeb506d8e8e22aa667f57cdf0b2  linux-xiaomi-armani-0d17d5761449b14f31d00044e95753f3a6ad23b2.tar.gz
diff --git a/device/linux-xiaomi-kenzo/APKBUILD b/device/linux-xiaomi-kenzo/APKBUILD
index 5dc15fd22..e22f91a73 100644
--- a/device/linux-xiaomi-kenzo/APKBUILD
+++ b/device/linux-xiaomi-kenzo/APKBUILD
@@ -42,10 +42,10 @@ build() {
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS"
 	msg "Combine DTB and Image.gz"
-        msg "(Because QCOM's custom Makefile builds into the wrong direcotry)"
-        cat "$builddir/arch/$_carch/boot/Image.gz" \
-                "$builddir/arch/arm/boot/dts/kenzo-msm8956-mtp.dtb" \
-                > "$builddir/arch/$_carch/boot/Image.gz-dtb"
+	msg "(Because QCOM's custom Makefile builds into the wrong direcotry)"
+	cat "$builddir/arch/$_carch/boot/Image.gz" \
+		"$builddir/arch/arm/boot/dts/kenzo-msm8956-mtp.dtb" \
+		> "$builddir/arch/$_carch/boot/Image.gz-dtb"
 }
 
 package() {
diff --git a/device/linux-yu-tomato/APKBUILD b/device/linux-yu-tomato/APKBUILD
index 5be6757b4..cfa0461fb 100644
--- a/device/linux-yu-tomato/APKBUILD
+++ b/device/linux-yu-tomato/APKBUILD
@@ -1,6 +1,6 @@
 # Reference: <https://postmarketos.org/vendorkernel>
 # Kernel config based on: arch/arm64/configs/lineageos_tomato_defconfig
-# Maintainer: xeon zolt <xeon.harsh@gmail.com> 
+# Maintainer: xeon zolt <xeon.harsh@gmail.com>
 
 pkgname="linux-yu-tomato"
 pkgver=3.10.108
diff --git a/device/linux-zuk-z2-row/APKBUILD b/device/linux-zuk-z2-row/APKBUILD
index cb161c1e3..82cfbd79d 100644
--- a/device/linux-zuk-z2-row/APKBUILD
+++ b/device/linux-zuk-z2-row/APKBUILD
@@ -53,7 +53,6 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 
 	# Modules
-	cd "$builddir"
 	unset LDFLAGS
 	make ARCH="$_carch" CC="${CC:-gcc}" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1))-postmarketOS" \