device/linux-*: various custom linter fixes (!1007)

2020-02-28 11:17:04 +01:00 · 2020-02-28 11:17:04 +01:00 · ea583fc601
commit ea583fc601
parent fde2a02e8a
31 changed files with 42 additions and 63 deletions
--- 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" \
--- a/device/linux-chuwi-hi10plus/APKBUILD
+++ b/device/linux-chuwi-hi10plus/APKBUILD
@ -48,7 +48,7 @@ package() {
 }

 dev() {
-    cd $builddir
+	cd "$builddir"

 	# https://github.com/torvalds/linux/blob/master/Documentation/kbuild/headers_install.txt
 	make -j1 headers_install \
--- a/device/linux-google-crosshatch-mainline/APKBUILD
+++ b/device/linux-google-crosshatch-mainline/APKBUILD
@ -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
--- 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 \
--- 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
--- 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
--- 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" \
--- 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" \
--- 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" \
--- 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
 }

--- 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:
--- a/device/linux-oppo-find-7a/APKBUILD
+++ b/device/linux-oppo-find-7a/APKBUILD
@ -64,7 +64,6 @@ package() {
 	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,6 +71,7 @@ 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"
--- a/device/linux-samsung-apexq/APKBUILD
+++ b/device/linux-samsung-apexq/APKBUILD
@ -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
--- 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" \
--- 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"
 }

--- 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" \
--- 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"
 }

--- 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
--- 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" \
--- a/device/linux-sony-nicki-mainline/APKBUILD
+++ b/device/linux-sony-nicki-mainline/APKBUILD
@ -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
--- 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
--- 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" \