diff --git a/device/testing/linux-alcatel-pop7lte/APKBUILD b/device/testing/linux-alcatel-pop7lte/APKBUILD
index 2dc0f007f..1b62f236d 100644
--- a/device/testing/linux-alcatel-pop7lte/APKBUILD
+++ b/device/testing/linux-alcatel-pop7lte/APKBUILD
@@ -40,7 +40,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-amazon-tank/APKBUILD b/device/testing/linux-amazon-tank/APKBUILD
index 59024acfe..dd739bf61 100644
--- a/device/testing/linux-amazon-tank/APKBUILD
+++ b/device/testing/linux-amazon-tank/APKBUILD
@@ -35,7 +35,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-amazon-thor/APKBUILD b/device/testing/linux-amazon-thor/APKBUILD
index 9e06f495d..fddc4686b 100755
--- a/device/testing/linux-amazon-thor/APKBUILD
+++ b/device/testing/linux-amazon-thor/APKBUILD
@@ -42,7 +42,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-asus-duma/APKBUILD b/device/testing/linux-asus-duma/APKBUILD
index 259d5fcbf..c0cab2e1a 100644
--- a/device/testing/linux-asus-duma/APKBUILD
+++ b/device/testing/linux-asus-duma/APKBUILD
@@ -36,7 +36,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-asus-t00f/APKBUILD b/device/testing/linux-asus-t00f/APKBUILD
index 32f419599..46f1f9016 100644
--- a/device/testing/linux-asus-t00f/APKBUILD
+++ b/device/testing/linux-asus-t00f/APKBUILD
@@ -37,7 +37,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-asus-tf101/APKBUILD b/device/testing/linux-asus-tf101/APKBUILD
index 35f58c584..fe2a5d1eb 100644
--- a/device/testing/linux-asus-tf101/APKBUILD
+++ b/device/testing/linux-asus-tf101/APKBUILD
@@ -41,7 +41,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-asus-z00t/APKBUILD b/device/testing/linux-asus-z00t/APKBUILD
index fadd8c5ae..0c9a3e5d5 100644
--- a/device/testing/linux-asus-z00t/APKBUILD
+++ b/device/testing/linux-asus-z00t/APKBUILD
@@ -37,7 +37,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-bq-chaozu/APKBUILD b/device/testing/linux-bq-chaozu/APKBUILD
index d50b82f9c..1075dff1f 100644
--- a/device/testing/linux-bq-chaozu/APKBUILD
+++ b/device/testing/linux-bq-chaozu/APKBUILD
@@ -37,7 +37,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-chuwi-hi10plus/APKBUILD b/device/testing/linux-chuwi-hi10plus/APKBUILD
index eb1c2127d..129207889 100644
--- a/device/testing/linux-chuwi-hi10plus/APKBUILD
+++ b/device/testing/linux-chuwi-hi10plus/APKBUILD
@@ -28,7 +28,7 @@ builddir="$srcdir/linux-$pkgver"
 prepare() {
 	default_prepare
 	REPLACE_GCCH=0 \
-		downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+		. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-fairphone-fp1/APKBUILD b/device/testing/linux-fairphone-fp1/APKBUILD
index 0558d7c51..333005ab9 100644
--- a/device/testing/linux-fairphone-fp1/APKBUILD
+++ b/device/testing/linux-fairphone-fp1/APKBUILD
@@ -32,7 +32,11 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir"/kernel "$_config" "$_carch" "$HOSTCC"
+	_builddir="$builddir"
+	builddir="$builddir"/kernel
+	. downstreamkernel_prepare
+	builddir="$_builddir"
+	unset _builddir
 }
 
 build() {
diff --git a/device/testing/linux-fairphone-fp2/APKBUILD b/device/testing/linux-fairphone-fp2/APKBUILD
index ce40aa257..04c76617e 100644
--- a/device/testing/linux-fairphone-fp2/APKBUILD
+++ b/device/testing/linux-fairphone-fp2/APKBUILD
@@ -38,7 +38,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-finepower-f1/APKBUILD b/device/testing/linux-finepower-f1/APKBUILD
index 6ddff665a..f7f31c58c 100644
--- a/device/testing/linux-finepower-f1/APKBUILD
+++ b/device/testing/linux-finepower-f1/APKBUILD
@@ -32,7 +32,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-fujitsu-m532/APKBUILD b/device/testing/linux-fujitsu-m532/APKBUILD
index 550fabd30..d883a3a80 100644
--- a/device/testing/linux-fujitsu-m532/APKBUILD
+++ b/device/testing/linux-fujitsu-m532/APKBUILD
@@ -35,7 +35,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-google-crosshatch/APKBUILD b/device/testing/linux-google-crosshatch/APKBUILD
index 3c23280ef..61fbaec83 100644
--- a/device/testing/linux-google-crosshatch/APKBUILD
+++ b/device/testing/linux-google-crosshatch/APKBUILD
@@ -31,7 +31,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-google-glass/APKBUILD b/device/testing/linux-google-glass/APKBUILD
index 62d9b933f..6039fb885 100644
--- a/device/testing/linux-google-glass/APKBUILD
+++ b/device/testing/linux-google-glass/APKBUILD
@@ -34,7 +34,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-gp-peak/APKBUILD b/device/testing/linux-gp-peak/APKBUILD
index 9cc145c22..8ab053f7c 100644
--- a/device/testing/linux-gp-peak/APKBUILD
+++ b/device/testing/linux-gp-peak/APKBUILD
@@ -36,7 +36,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-hisense-m470bsa/APKBUILD b/device/testing/linux-hisense-m470bsa/APKBUILD
index 159b16f48..4f07f9e31 100644
--- a/device/testing/linux-hisense-m470bsa/APKBUILD
+++ b/device/testing/linux-hisense-m470bsa/APKBUILD
@@ -32,7 +32,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-htc-a5ul/APKBUILD b/device/testing/linux-htc-a5ul/APKBUILD
index cb5e1df71..16ea541e4 100644
--- a/device/testing/linux-htc-a5ul/APKBUILD
+++ b/device/testing/linux-htc-a5ul/APKBUILD
@@ -35,7 +35,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-htc-bravo/APKBUILD b/device/testing/linux-htc-bravo/APKBUILD
index c2801c9a0..d0f88dd46 100644
--- a/device/testing/linux-htc-bravo/APKBUILD
+++ b/device/testing/linux-htc-bravo/APKBUILD
@@ -35,7 +35,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-htc-evita/APKBUILD b/device/testing/linux-htc-evita/APKBUILD
index dd1431bc6..83ac1b0db 100644
--- a/device/testing/linux-htc-evita/APKBUILD
+++ b/device/testing/linux-htc-evita/APKBUILD
@@ -29,7 +29,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-htc-flounder/APKBUILD b/device/testing/linux-htc-flounder/APKBUILD
index 74651a59a..6abd2a130 100644
--- a/device/testing/linux-htc-flounder/APKBUILD
+++ b/device/testing/linux-htc-flounder/APKBUILD
@@ -34,7 +34,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-htc-k2ul/APKBUILD b/device/testing/linux-htc-k2ul/APKBUILD
index 72675a49f..98d66a507 100644
--- a/device/testing/linux-htc-k2ul/APKBUILD
+++ b/device/testing/linux-htc-k2ul/APKBUILD
@@ -42,7 +42,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-htc-m7/APKBUILD b/device/testing/linux-htc-m7/APKBUILD
index 3359f183e..a4c01d9fe 100644
--- a/device/testing/linux-htc-m7/APKBUILD
+++ b/device/testing/linux-htc-m7/APKBUILD
@@ -29,7 +29,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-htc-m8/APKBUILD b/device/testing/linux-htc-m8/APKBUILD
index 4e1f25834..2c7b2cd75 100644
--- a/device/testing/linux-htc-m8/APKBUILD
+++ b/device/testing/linux-htc-m8/APKBUILD
@@ -36,7 +36,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-htc-memul/APKBUILD b/device/testing/linux-htc-memul/APKBUILD
index c0f275fca..c2ecf1247 100644
--- a/device/testing/linux-htc-memul/APKBUILD
+++ b/device/testing/linux-htc-memul/APKBUILD
@@ -30,7 +30,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-htc-primou/APKBUILD b/device/testing/linux-htc-primou/APKBUILD
index 79260f693..706ecd467 100644
--- a/device/testing/linux-htc-primou/APKBUILD
+++ b/device/testing/linux-htc-primou/APKBUILD
@@ -29,7 +29,7 @@ builddir="$srcdir/$_repository-$_commit"
 prepare() {
 	default_prepare
 
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-htc-protou/APKBUILD b/device/testing/linux-htc-protou/APKBUILD
index 4f97685ac..a4c4f19c7 100644
--- a/device/testing/linux-htc-protou/APKBUILD
+++ b/device/testing/linux-htc-protou/APKBUILD
@@ -39,7 +39,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-htc-ville/APKBUILD b/device/testing/linux-htc-ville/APKBUILD
index b75031f25..e6e388bff 100644
--- a/device/testing/linux-htc-ville/APKBUILD
+++ b/device/testing/linux-htc-ville/APKBUILD
@@ -30,7 +30,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-htc-vision/APKBUILD b/device/testing/linux-htc-vision/APKBUILD
index 3012fcc2e..0bba02406 100644
--- a/device/testing/linux-htc-vision/APKBUILD
+++ b/device/testing/linux-htc-vision/APKBUILD
@@ -30,7 +30,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-htc-vivo/APKBUILD b/device/testing/linux-htc-vivo/APKBUILD
index 512e98106..0845b1992 100644
--- a/device/testing/linux-htc-vivo/APKBUILD
+++ b/device/testing/linux-htc-vivo/APKBUILD
@@ -37,7 +37,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-huawei-cameron/APKBUILD b/device/testing/linux-huawei-cameron/APKBUILD
index e31e3573b..37f1920f1 100644
--- a/device/testing/linux-huawei-cameron/APKBUILD
+++ b/device/testing/linux-huawei-cameron/APKBUILD
@@ -29,7 +29,7 @@ outdir="$srcdir/../out"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-huawei-lua-u22/APKBUILD b/device/testing/linux-huawei-lua-u22/APKBUILD
index 3a2da623f..4f8074626 100644
--- a/device/testing/linux-huawei-lua-u22/APKBUILD
+++ b/device/testing/linux-huawei-lua-u22/APKBUILD
@@ -29,7 +29,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-huawei-y530/APKBUILD b/device/testing/linux-huawei-y530/APKBUILD
index b79beb3ad..98c386a8b 100644
--- a/device/testing/linux-huawei-y530/APKBUILD
+++ b/device/testing/linux-huawei-y530/APKBUILD
@@ -45,7 +45,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-infocus-flatfish/APKBUILD b/device/testing/linux-infocus-flatfish/APKBUILD
index aaafa66b8..6e0bbad6e 100644
--- a/device/testing/linux-infocus-flatfish/APKBUILD
+++ b/device/testing/linux-infocus-flatfish/APKBUILD
@@ -37,7 +37,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-jolla-sbj/APKBUILD b/device/testing/linux-jolla-sbj/APKBUILD
index d4a5e57a1..f2229e797 100644
--- a/device/testing/linux-jolla-sbj/APKBUILD
+++ b/device/testing/linux-jolla-sbj/APKBUILD
@@ -41,7 +41,7 @@ prepare() {
 	cd "$ksrcdir"
 
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-leeco-s2/APKBUILD b/device/testing/linux-leeco-s2/APKBUILD
index d945263b5..9a0b515d9 100644
--- a/device/testing/linux-leeco-s2/APKBUILD
+++ b/device/testing/linux-leeco-s2/APKBUILD
@@ -37,7 +37,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-lenovo-karate/APKBUILD b/device/testing/linux-lenovo-karate/APKBUILD
index 88d52e790..8b7f43c57 100644
--- a/device/testing/linux-lenovo-karate/APKBUILD
+++ b/device/testing/linux-lenovo-karate/APKBUILD
@@ -35,7 +35,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-lg-bullhead/APKBUILD b/device/testing/linux-lg-bullhead/APKBUILD
index 92ceb3839..3ae11417f 100644
--- a/device/testing/linux-lg-bullhead/APKBUILD
+++ b/device/testing/linux-lg-bullhead/APKBUILD
@@ -37,7 +37,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-lg-d722/APKBUILD b/device/testing/linux-lg-d722/APKBUILD
index f1b50c8cd..00e516af7 100644
--- a/device/testing/linux-lg-d722/APKBUILD
+++ b/device/testing/linux-lg-d722/APKBUILD
@@ -28,7 +28,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-lg-dory/APKBUILD b/device/testing/linux-lg-dory/APKBUILD
index e5f91af34..c483db901 100644
--- a/device/testing/linux-lg-dory/APKBUILD
+++ b/device/testing/linux-lg-dory/APKBUILD
@@ -53,7 +53,7 @@ builddir="$srcdir/kernel_msm-$_hash"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-lg-e610/APKBUILD b/device/testing/linux-lg-e610/APKBUILD
index 183f9f2e4..ff8fbf79f 100644
--- a/device/testing/linux-lg-e610/APKBUILD
+++ b/device/testing/linux-lg-e610/APKBUILD
@@ -36,7 +36,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-lg-h815/APKBUILD b/device/testing/linux-lg-h815/APKBUILD
index 9c93ad6f9..64941b78a 100644
--- a/device/testing/linux-lg-h815/APKBUILD
+++ b/device/testing/linux-lg-h815/APKBUILD
@@ -35,7 +35,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-lg-mako/APKBUILD b/device/testing/linux-lg-mako/APKBUILD
index 82170fe72..866c3d2c6 100644
--- a/device/testing/linux-lg-mako/APKBUILD
+++ b/device/testing/linux-lg-mako/APKBUILD
@@ -29,7 +29,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-lg-p700/APKBUILD b/device/testing/linux-lg-p700/APKBUILD
index 459c134a9..7e2d558a3 100644
--- a/device/testing/linux-lg-p700/APKBUILD
+++ b/device/testing/linux-lg-p700/APKBUILD
@@ -36,7 +36,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-lg-vee7e/APKBUILD b/device/testing/linux-lg-vee7e/APKBUILD
index b4cb747ae..2c8251423 100644
--- a/device/testing/linux-lg-vee7e/APKBUILD
+++ b/device/testing/linux-lg-vee7e/APKBUILD
@@ -31,7 +31,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-lg-w5/APKBUILD b/device/testing/linux-lg-w5/APKBUILD
index fe1874b2a..1a9feb352 100644
--- a/device/testing/linux-lg-w5/APKBUILD
+++ b/device/testing/linux-lg-w5/APKBUILD
@@ -37,7 +37,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-medion-kai/APKBUILD b/device/testing/linux-medion-kai/APKBUILD
index 35db05947..72a3ac94e 100644
--- a/device/testing/linux-medion-kai/APKBUILD
+++ b/device/testing/linux-medion-kai/APKBUILD
@@ -37,7 +37,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-meizu-turbo/APKBUILD b/device/testing/linux-meizu-turbo/APKBUILD
index 6445c03ec..9c53b3a86 100644
--- a/device/testing/linux-meizu-turbo/APKBUILD
+++ b/device/testing/linux-meizu-turbo/APKBUILD
@@ -31,7 +31,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-motorola-athene/APKBUILD b/device/testing/linux-motorola-athene/APKBUILD
index 26e43c4a6..392b28c71 100644
--- a/device/testing/linux-motorola-athene/APKBUILD
+++ b/device/testing/linux-motorola-athene/APKBUILD
@@ -35,7 +35,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-motorola-cedric/APKBUILD b/device/testing/linux-motorola-cedric/APKBUILD
index 6f8947256..5fcab3b67 100644
--- a/device/testing/linux-motorola-cedric/APKBUILD
+++ b/device/testing/linux-motorola-cedric/APKBUILD
@@ -30,7 +30,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-motorola-def/APKBUILD b/device/testing/linux-motorola-def/APKBUILD
index fbcd51fd6..cacbf2f62 100644
--- a/device/testing/linux-motorola-def/APKBUILD
+++ b/device/testing/linux-motorola-def/APKBUILD
@@ -36,7 +36,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	REPLACE_GCCH=0 downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	REPLACE_GCCH=0 . downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-motorola-falcon/APKBUILD b/device/testing/linux-motorola-falcon/APKBUILD
index 5a3a2b01a..8e92c0f26 100644
--- a/device/testing/linux-motorola-falcon/APKBUILD
+++ b/device/testing/linux-motorola-falcon/APKBUILD
@@ -37,7 +37,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-motorola-ghost/APKBUILD b/device/testing/linux-motorola-ghost/APKBUILD
index dc34dc317..939be2ec6 100644
--- a/device/testing/linux-motorola-ghost/APKBUILD
+++ b/device/testing/linux-motorola-ghost/APKBUILD
@@ -39,7 +39,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-motorola-lux/APKBUILD b/device/testing/linux-motorola-lux/APKBUILD
index 0d84d19be..79aed1dcb 100644
--- a/device/testing/linux-motorola-lux/APKBUILD
+++ b/device/testing/linux-motorola-lux/APKBUILD
@@ -28,7 +28,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-motorola-maserati/APKBUILD b/device/testing/linux-motorola-maserati/APKBUILD
index 70eb7f908..c3bb7383c 100644
--- a/device/testing/linux-motorola-maserati/APKBUILD
+++ b/device/testing/linux-motorola-maserati/APKBUILD
@@ -46,7 +46,7 @@ _pvr_builddir="$srcdir/$_hardware_repository-$_hardware_commit/pvr-source/eurasi
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 
 	# Workaround to get the Makefile working outside of a git repository
 	cd "$_wlan_builddir"
diff --git a/device/testing/linux-motorola-montana/APKBUILD b/device/testing/linux-motorola-montana/APKBUILD
index add0846bb..27809c32d 100644
--- a/device/testing/linux-motorola-montana/APKBUILD
+++ b/device/testing/linux-motorola-montana/APKBUILD
@@ -25,7 +25,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-motorola-peregrine/APKBUILD b/device/testing/linux-motorola-peregrine/APKBUILD
index cb39edac0..e4517b716 100644
--- a/device/testing/linux-motorola-peregrine/APKBUILD
+++ b/device/testing/linux-motorola-peregrine/APKBUILD
@@ -38,7 +38,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-motorola-potter/APKBUILD b/device/testing/linux-motorola-potter/APKBUILD
index 2ede39732..26108ff21 100644
--- a/device/testing/linux-motorola-potter/APKBUILD
+++ b/device/testing/linux-motorola-potter/APKBUILD
@@ -40,7 +40,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-motorola-shamu/APKBUILD b/device/testing/linux-motorola-shamu/APKBUILD
index e9a819a16..a8f090058 100644
--- a/device/testing/linux-motorola-shamu/APKBUILD
+++ b/device/testing/linux-motorola-shamu/APKBUILD
@@ -35,7 +35,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-motorola-surnia/APKBUILD b/device/testing/linux-motorola-surnia/APKBUILD
index 0546132bb..686784131 100644
--- a/device/testing/linux-motorola-surnia/APKBUILD
+++ b/device/testing/linux-motorola-surnia/APKBUILD
@@ -33,7 +33,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-nextbit-robin/APKBUILD b/device/testing/linux-nextbit-robin/APKBUILD
index 58c4be176..83b27ae04 100644
--- a/device/testing/linux-nextbit-robin/APKBUILD
+++ b/device/testing/linux-nextbit-robin/APKBUILD
@@ -35,7 +35,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-nobby-230/APKBUILD b/device/testing/linux-nobby-230/APKBUILD
index 6cd6bf674..45a9d2d14 100644
--- a/device/testing/linux-nobby-230/APKBUILD
+++ b/device/testing/linux-nobby-230/APKBUILD
@@ -41,7 +41,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-nokia-beatles/APKBUILD b/device/testing/linux-nokia-beatles/APKBUILD
index af9225c73..dcf88ddaf 100644
--- a/device/testing/linux-nokia-beatles/APKBUILD
+++ b/device/testing/linux-nokia-beatles/APKBUILD
@@ -40,7 +40,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-nokia-frt/APKBUILD b/device/testing/linux-nokia-frt/APKBUILD
index 8733336dc..1fcdae991 100644
--- a/device/testing/linux-nokia-frt/APKBUILD
+++ b/device/testing/linux-nokia-frt/APKBUILD
@@ -31,7 +31,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-nokia-rm846/APKBUILD b/device/testing/linux-nokia-rm846/APKBUILD
index 54b8f60cb..c9fce2c2e 100644
--- a/device/testing/linux-nokia-rm846/APKBUILD
+++ b/device/testing/linux-nokia-rm846/APKBUILD
@@ -35,7 +35,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-nokia-rm885/APKBUILD b/device/testing/linux-nokia-rm885/APKBUILD
index 3ed07a843..4d9bab901 100644
--- a/device/testing/linux-nokia-rm885/APKBUILD
+++ b/device/testing/linux-nokia-rm885/APKBUILD
@@ -37,7 +37,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-oneplus-msm8998/APKBUILD b/device/testing/linux-oneplus-msm8998/APKBUILD
index d694081b7..78efa3804 100644
--- a/device/testing/linux-oneplus-msm8998/APKBUILD
+++ b/device/testing/linux-oneplus-msm8998/APKBUILD
@@ -39,7 +39,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-oneplus-oneplus2/APKBUILD b/device/testing/linux-oneplus-oneplus2/APKBUILD
index 22450ab3f..985a0cf69 100644
--- a/device/testing/linux-oneplus-oneplus2/APKBUILD
+++ b/device/testing/linux-oneplus-oneplus2/APKBUILD
@@ -35,7 +35,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-oppo-find-7a/APKBUILD b/device/testing/linux-oppo-find-7a/APKBUILD
index 76c13064d..61340b3e6 100644
--- a/device/testing/linux-oppo-find-7a/APKBUILD
+++ b/device/testing/linux-oppo-find-7a/APKBUILD
@@ -45,7 +45,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-ouya-ouya/APKBUILD b/device/testing/linux-ouya-ouya/APKBUILD
index 6ca7148ba..8b2b6660b 100644
--- a/device/testing/linux-ouya-ouya/APKBUILD
+++ b/device/testing/linux-ouya-ouya/APKBUILD
@@ -32,7 +32,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-purism-librem5/APKBUILD b/device/testing/linux-purism-librem5/APKBUILD
index 550887c44..a159d3f39 100644
--- a/device/testing/linux-purism-librem5/APKBUILD
+++ b/device/testing/linux-purism-librem5/APKBUILD
@@ -31,7 +31,7 @@ builddir="$srcdir/$_repository-pureos-$_purismver"
 prepare() {
 	default_prepare
 	REPLACE_GCCH=0 \
-		downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+		. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-a5y17lte/APKBUILD b/device/testing/linux-samsung-a5y17lte/APKBUILD
index 0d331b39b..46c89b002 100644
--- a/device/testing/linux-samsung-a5y17lte/APKBUILD
+++ b/device/testing/linux-samsung-a5y17lte/APKBUILD
@@ -37,7 +37,7 @@ qcaclddir="$srcdir/quic-la-platform-vendor-qcom-opensource-wlan-qcacld-2.0-$_qca
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 	prepare_modules
 }
 
diff --git a/device/testing/linux-samsung-apexq/APKBUILD b/device/testing/linux-samsung-apexq/APKBUILD
index 961de3ce6..aafd27046 100644
--- a/device/testing/linux-samsung-apexq/APKBUILD
+++ b/device/testing/linux-samsung-apexq/APKBUILD
@@ -29,7 +29,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-ariesve/APKBUILD b/device/testing/linux-samsung-ariesve/APKBUILD
index 4d8c8e3c3..c5c8c9e28 100644
--- a/device/testing/linux-samsung-ariesve/APKBUILD
+++ b/device/testing/linux-samsung-ariesve/APKBUILD
@@ -28,7 +28,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-baffinlite/APKBUILD b/device/testing/linux-samsung-baffinlite/APKBUILD
index 57db8c7db..425d8d934 100644
--- a/device/testing/linux-samsung-baffinlite/APKBUILD
+++ b/device/testing/linux-samsung-baffinlite/APKBUILD
@@ -30,7 +30,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-espresso10/APKBUILD b/device/testing/linux-samsung-espresso10/APKBUILD
index b24b94f7e..e94adbf59 100644
--- a/device/testing/linux-samsung-espresso10/APKBUILD
+++ b/device/testing/linux-samsung-espresso10/APKBUILD
@@ -35,7 +35,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-expressatt/APKBUILD b/device/testing/linux-samsung-expressatt/APKBUILD
index 970352c90..62de5259b 100644
--- a/device/testing/linux-samsung-expressatt/APKBUILD
+++ b/device/testing/linux-samsung-expressatt/APKBUILD
@@ -33,7 +33,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-golden/APKBUILD b/device/testing/linux-samsung-golden/APKBUILD
index 94a6af648..f31055420 100644
--- a/device/testing/linux-samsung-golden/APKBUILD
+++ b/device/testing/linux-samsung-golden/APKBUILD
@@ -40,7 +40,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-gts210velte/APKBUILD b/device/testing/linux-samsung-gts210velte/APKBUILD
index 23dae7f03..eb2dfa544 100644
--- a/device/testing/linux-samsung-gts210velte/APKBUILD
+++ b/device/testing/linux-samsung-gts210velte/APKBUILD
@@ -37,7 +37,7 @@ builddir="$srcdir/$_repository-$_commit"
 prepare() {
 	default_prepare
 
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-gts210vewifi/APKBUILD b/device/testing/linux-samsung-gts210vewifi/APKBUILD
index f213d5083..e0865c8f0 100644
--- a/device/testing/linux-samsung-gts210vewifi/APKBUILD
+++ b/device/testing/linux-samsung-gts210vewifi/APKBUILD
@@ -37,7 +37,7 @@ builddir="$srcdir/$_repository-$_commit"
 prepare() {
 	default_prepare
 
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-hero2lte/APKBUILD b/device/testing/linux-samsung-hero2lte/APKBUILD
index e0d98bacd..310d5f077 100644
--- a/device/testing/linux-samsung-hero2lte/APKBUILD
+++ b/device/testing/linux-samsung-hero2lte/APKBUILD
@@ -27,7 +27,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-herolte/APKBUILD b/device/testing/linux-samsung-herolte/APKBUILD
index 1162aaa9b..51ce3cfa1 100644
--- a/device/testing/linux-samsung-herolte/APKBUILD
+++ b/device/testing/linux-samsung-herolte/APKBUILD
@@ -27,7 +27,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-i747m/APKBUILD b/device/testing/linux-samsung-i747m/APKBUILD
index 5b5067e92..641da4f42 100644
--- a/device/testing/linux-samsung-i747m/APKBUILD
+++ b/device/testing/linux-samsung-i747m/APKBUILD
@@ -44,7 +44,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-i8200/APKBUILD b/device/testing/linux-samsung-i8200/APKBUILD
index ba4f098de..f8963909a 100644
--- a/device/testing/linux-samsung-i8200/APKBUILD
+++ b/device/testing/linux-samsung-i8200/APKBUILD
@@ -35,7 +35,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-i9003/APKBUILD b/device/testing/linux-samsung-i9003/APKBUILD
index 2d69a3526..b85c05fd7 100644
--- a/device/testing/linux-samsung-i9003/APKBUILD
+++ b/device/testing/linux-samsung-i9003/APKBUILD
@@ -56,7 +56,7 @@ prepare_isorec() {
 prepare() {
 	default_prepare
 	prepare_isorec
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-i9070/APKBUILD b/device/testing/linux-samsung-i9070/APKBUILD
index aaae53fe1..f1a35d8d5 100644
--- a/device/testing/linux-samsung-i9070/APKBUILD
+++ b/device/testing/linux-samsung-i9070/APKBUILD
@@ -41,7 +41,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 
 	# Use Alpine's busybox.static instead of the pre-compiled busybox shipped
 	# with the source
diff --git a/device/testing/linux-samsung-i9100/APKBUILD b/device/testing/linux-samsung-i9100/APKBUILD
index 99a87843c..f0d1aa472 100644
--- a/device/testing/linux-samsung-i9100/APKBUILD
+++ b/device/testing/linux-samsung-i9100/APKBUILD
@@ -53,7 +53,7 @@ prepare() {
 	default_prepare
 	prepare_isorec
 
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-i9195/APKBUILD b/device/testing/linux-samsung-i9195/APKBUILD
index e27885d69..bfe703c7e 100644
--- a/device/testing/linux-samsung-i9195/APKBUILD
+++ b/device/testing/linux-samsung-i9195/APKBUILD
@@ -37,7 +37,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-j1mini3g/APKBUILD b/device/testing/linux-samsung-j1mini3g/APKBUILD
index d71ba52bd..86b82efa1 100644
--- a/device/testing/linux-samsung-j1mini3g/APKBUILD
+++ b/device/testing/linux-samsung-j1mini3g/APKBUILD
@@ -29,7 +29,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-j3nxlte/APKBUILD b/device/testing/linux-samsung-j3nxlte/APKBUILD
index 65e62a396..acc833b01 100644
--- a/device/testing/linux-samsung-j3nxlte/APKBUILD
+++ b/device/testing/linux-samsung-j3nxlte/APKBUILD
@@ -30,7 +30,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-jflte/APKBUILD b/device/testing/linux-samsung-jflte/APKBUILD
index 2dea667dd..daa378a3a 100644
--- a/device/testing/linux-samsung-jflte/APKBUILD
+++ b/device/testing/linux-samsung-jflte/APKBUILD
@@ -29,7 +29,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-klte/APKBUILD b/device/testing/linux-samsung-klte/APKBUILD
index b3ef3384c..3b559b023 100644
--- a/device/testing/linux-samsung-klte/APKBUILD
+++ b/device/testing/linux-samsung-klte/APKBUILD
@@ -48,7 +48,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-kminilte/APKBUILD b/device/testing/linux-samsung-kminilte/APKBUILD
index d7ad295e9..70a0c38ec 100644
--- a/device/testing/linux-samsung-kminilte/APKBUILD
+++ b/device/testing/linux-samsung-kminilte/APKBUILD
@@ -34,7 +34,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-kylepro/APKBUILD b/device/testing/linux-samsung-kylepro/APKBUILD
index 83da0f017..3cdee269c 100644
--- a/device/testing/linux-samsung-kylepro/APKBUILD
+++ b/device/testing/linux-samsung-kylepro/APKBUILD
@@ -29,7 +29,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-kylessopen/APKBUILD b/device/testing/linux-samsung-kylessopen/APKBUILD
index 027684257..70c48fca4 100644
--- a/device/testing/linux-samsung-kylessopen/APKBUILD
+++ b/device/testing/linux-samsung-kylessopen/APKBUILD
@@ -29,7 +29,7 @@ builddir="$srcdir/$_kernel-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-kylevess/APKBUILD b/device/testing/linux-samsung-kylevess/APKBUILD
index 6a74e67ad..e02e81117 100644
--- a/device/testing/linux-samsung-kylevess/APKBUILD
+++ b/device/testing/linux-samsung-kylevess/APKBUILD
@@ -37,7 +37,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-lt01wifi/APKBUILD b/device/testing/linux-samsung-lt01wifi/APKBUILD
index 072102659..1934bcc4f 100644
--- a/device/testing/linux-samsung-lt01wifi/APKBUILD
+++ b/device/testing/linux-samsung-lt01wifi/APKBUILD
@@ -28,7 +28,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-lt023g/APKBUILD b/device/testing/linux-samsung-lt023g/APKBUILD
index 9b5e79c2c..7706d1769 100644
--- a/device/testing/linux-samsung-lt023g/APKBUILD
+++ b/device/testing/linux-samsung-lt023g/APKBUILD
@@ -37,7 +37,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-maguro/APKBUILD b/device/testing/linux-samsung-maguro/APKBUILD
index ac1f3b6fd..6cc97550f 100644
--- a/device/testing/linux-samsung-maguro/APKBUILD
+++ b/device/testing/linux-samsung-maguro/APKBUILD
@@ -36,7 +36,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-manta/APKBUILD b/device/testing/linux-samsung-manta/APKBUILD
index 009639c1a..9fad0006f 100644
--- a/device/testing/linux-samsung-manta/APKBUILD
+++ b/device/testing/linux-samsung-manta/APKBUILD
@@ -34,7 +34,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-matissewifi/APKBUILD b/device/testing/linux-samsung-matissewifi/APKBUILD
index 746ba2497..b5409293e 100644
--- a/device/testing/linux-samsung-matissewifi/APKBUILD
+++ b/device/testing/linux-samsung-matissewifi/APKBUILD
@@ -34,7 +34,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-n5110/APKBUILD b/device/testing/linux-samsung-n5110/APKBUILD
index df687004c..2d863fe32 100644
--- a/device/testing/linux-samsung-n5110/APKBUILD
+++ b/device/testing/linux-samsung-n5110/APKBUILD
@@ -37,7 +37,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-nevisp/APKBUILD b/device/testing/linux-samsung-nevisp/APKBUILD
index c11e9fb29..69d60b044 100644
--- a/device/testing/linux-samsung-nevisp/APKBUILD
+++ b/device/testing/linux-samsung-nevisp/APKBUILD
@@ -38,7 +38,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-royss/APKBUILD b/device/testing/linux-samsung-royss/APKBUILD
index 678cd9685..e58500660 100644
--- a/device/testing/linux-samsung-royss/APKBUILD
+++ b/device/testing/linux-samsung-royss/APKBUILD
@@ -30,7 +30,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-s6500d/APKBUILD b/device/testing/linux-samsung-s6500d/APKBUILD
index cac103f2e..6ea0b246c 100644
--- a/device/testing/linux-samsung-s6500d/APKBUILD
+++ b/device/testing/linux-samsung-s6500d/APKBUILD
@@ -29,7 +29,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-serranodsdd/APKBUILD b/device/testing/linux-samsung-serranodsdd/APKBUILD
index 96d124568..4356560cc 100644
--- a/device/testing/linux-samsung-serranodsdd/APKBUILD
+++ b/device/testing/linux-samsung-serranodsdd/APKBUILD
@@ -35,7 +35,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-samsung-zanin/APKBUILD b/device/testing/linux-samsung-zanin/APKBUILD
index a52440447..ef642ccc4 100644
--- a/device/testing/linux-samsung-zanin/APKBUILD
+++ b/device/testing/linux-samsung-zanin/APKBUILD
@@ -32,7 +32,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-semc-anzu/APKBUILD b/device/testing/linux-semc-anzu/APKBUILD
index e18999327..a2077173c 100644
--- a/device/testing/linux-semc-anzu/APKBUILD
+++ b/device/testing/linux-semc-anzu/APKBUILD
@@ -42,7 +42,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-semc-smultron/APKBUILD b/device/testing/linux-semc-smultron/APKBUILD
index 830417bce..2ccfd1382 100644
--- a/device/testing/linux-semc-smultron/APKBUILD
+++ b/device/testing/linux-semc-smultron/APKBUILD
@@ -36,7 +36,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-sharp-shl22/APKBUILD b/device/testing/linux-sharp-shl22/APKBUILD
index 6001546f3..327237bda 100644
--- a/device/testing/linux-sharp-shl22/APKBUILD
+++ b/device/testing/linux-sharp-shl22/APKBUILD
@@ -34,7 +34,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-sony-amami/APKBUILD b/device/testing/linux-sony-amami/APKBUILD
index cc5b8b6ec..9087a137e 100644
--- a/device/testing/linux-sony-amami/APKBUILD
+++ b/device/testing/linux-sony-amami/APKBUILD
@@ -29,7 +29,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-sony-aries/APKBUILD b/device/testing/linux-sony-aries/APKBUILD
index aa17b8efe..414f321f1 100644
--- a/device/testing/linux-sony-aries/APKBUILD
+++ b/device/testing/linux-sony-aries/APKBUILD
@@ -28,7 +28,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-sony-coconut/APKBUILD b/device/testing/linux-sony-coconut/APKBUILD
index 382ee064b..14f5f74b6 100644
--- a/device/testing/linux-sony-coconut/APKBUILD
+++ b/device/testing/linux-sony-coconut/APKBUILD
@@ -36,7 +36,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-sony-honami/APKBUILD b/device/testing/linux-sony-honami/APKBUILD
index e93543bdc..47762d18a 100644
--- a/device/testing/linux-sony-honami/APKBUILD
+++ b/device/testing/linux-sony-honami/APKBUILD
@@ -27,7 +27,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-sony-nicki/APKBUILD b/device/testing/linux-sony-nicki/APKBUILD
index 7633a2fe5..06924899b 100644
--- a/device/testing/linux-sony-nicki/APKBUILD
+++ b/device/testing/linux-sony-nicki/APKBUILD
@@ -35,7 +35,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-sony-scorpion/APKBUILD b/device/testing/linux-sony-scorpion/APKBUILD
index 36b6f955f..695b3338c 100644
--- a/device/testing/linux-sony-scorpion/APKBUILD
+++ b/device/testing/linux-sony-scorpion/APKBUILD
@@ -37,7 +37,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-sony-seagull/APKBUILD b/device/testing/linux-sony-seagull/APKBUILD
index d2c7459c8..1afb44b46 100644
--- a/device/testing/linux-sony-seagull/APKBUILD
+++ b/device/testing/linux-sony-seagull/APKBUILD
@@ -42,7 +42,7 @@ builddir="$srcdir/$_repository-$_commit/"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-sony-suzu/APKBUILD b/device/testing/linux-sony-suzu/APKBUILD
index 8bdb1dcb8..83a7605af 100644
--- a/device/testing/linux-sony-suzu/APKBUILD
+++ b/device/testing/linux-sony-suzu/APKBUILD
@@ -32,7 +32,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-sony-taoshan/APKBUILD b/device/testing/linux-sony-taoshan/APKBUILD
index 101d74f7f..a7f1a7a81 100644
--- a/device/testing/linux-sony-taoshan/APKBUILD
+++ b/device/testing/linux-sony-taoshan/APKBUILD
@@ -29,7 +29,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-sony-tulip/APKBUILD b/device/testing/linux-sony-tulip/APKBUILD
index e5ef6ce6c..623ec10e5 100644
--- a/device/testing/linux-sony-tulip/APKBUILD
+++ b/device/testing/linux-sony-tulip/APKBUILD
@@ -33,7 +33,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-sony-yuga/APKBUILD b/device/testing/linux-sony-yuga/APKBUILD
index 00aeb8265..51153fb5d 100644
--- a/device/testing/linux-sony-yuga/APKBUILD
+++ b/device/testing/linux-sony-yuga/APKBUILD
@@ -34,7 +34,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-tokio-techbook/APKBUILD b/device/testing/linux-tokio-techbook/APKBUILD
index 069279ed3..90f6f57ff 100644
--- a/device/testing/linux-tokio-techbook/APKBUILD
+++ b/device/testing/linux-tokio-techbook/APKBUILD
@@ -30,7 +30,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-wiko-lenny3/APKBUILD b/device/testing/linux-wiko-lenny3/APKBUILD
index c8f184010..26b145936 100644
--- a/device/testing/linux-wiko-lenny3/APKBUILD
+++ b/device/testing/linux-wiko-lenny3/APKBUILD
@@ -37,7 +37,7 @@ builddir="$srcdir/LENNY3_OpenSource/kernel-3.18"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-wiko-ufeel/APKBUILD b/device/testing/linux-wiko-ufeel/APKBUILD
index 1b5adda2f..0d34deef5 100644
--- a/device/testing/linux-wiko-ufeel/APKBUILD
+++ b/device/testing/linux-wiko-ufeel/APKBUILD
@@ -36,7 +36,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-wileyfox-crackling/APKBUILD b/device/testing/linux-wileyfox-crackling/APKBUILD
index 1cead0302..fed7baa71 100644
--- a/device/testing/linux-wileyfox-crackling/APKBUILD
+++ b/device/testing/linux-wileyfox-crackling/APKBUILD
@@ -36,7 +36,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-wingtech-wt88047/APKBUILD b/device/testing/linux-wingtech-wt88047/APKBUILD
index 69a9e62fa..b72da9fb7 100644
--- a/device/testing/linux-wingtech-wt88047/APKBUILD
+++ b/device/testing/linux-wingtech-wt88047/APKBUILD
@@ -34,7 +34,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-xiaomi-aries/APKBUILD b/device/testing/linux-xiaomi-aries/APKBUILD
index 1b0e0b399..eaca0f2a5 100644
--- a/device/testing/linux-xiaomi-aries/APKBUILD
+++ b/device/testing/linux-xiaomi-aries/APKBUILD
@@ -35,7 +35,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-xiaomi-armani/APKBUILD b/device/testing/linux-xiaomi-armani/APKBUILD
index d279368ec..35b0bdf90 100644
--- a/device/testing/linux-xiaomi-armani/APKBUILD
+++ b/device/testing/linux-xiaomi-armani/APKBUILD
@@ -40,7 +40,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-xiaomi-cancro/APKBUILD b/device/testing/linux-xiaomi-cancro/APKBUILD
index 37fa36bc4..c45afa1d3 100644
--- a/device/testing/linux-xiaomi-cancro/APKBUILD
+++ b/device/testing/linux-xiaomi-cancro/APKBUILD
@@ -42,7 +42,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-xiaomi-ido/APKBUILD b/device/testing/linux-xiaomi-ido/APKBUILD
index 011426ddc..0420e02f7 100644
--- a/device/testing/linux-xiaomi-ido/APKBUILD
+++ b/device/testing/linux-xiaomi-ido/APKBUILD
@@ -35,7 +35,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-xiaomi-kenzo/APKBUILD b/device/testing/linux-xiaomi-kenzo/APKBUILD
index e22f91a73..86e0c390c 100644
--- a/device/testing/linux-xiaomi-kenzo/APKBUILD
+++ b/device/testing/linux-xiaomi-kenzo/APKBUILD
@@ -34,7 +34,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-xiaomi-mido/APKBUILD b/device/testing/linux-xiaomi-mido/APKBUILD
index ba6188bef..70a8a1080 100644
--- a/device/testing/linux-xiaomi-mido/APKBUILD
+++ b/device/testing/linux-xiaomi-mido/APKBUILD
@@ -41,7 +41,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-xiaomi-santoni/APKBUILD b/device/testing/linux-xiaomi-santoni/APKBUILD
index 2e6c1509e..508b3e0be 100644
--- a/device/testing/linux-xiaomi-santoni/APKBUILD
+++ b/device/testing/linux-xiaomi-santoni/APKBUILD
@@ -27,7 +27,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-xiaomi-tissot/APKBUILD b/device/testing/linux-xiaomi-tissot/APKBUILD
index 25ca8183c..218c6f4e3 100644
--- a/device/testing/linux-xiaomi-tissot/APKBUILD
+++ b/device/testing/linux-xiaomi-tissot/APKBUILD
@@ -45,7 +45,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-xiaomi-whyred/APKBUILD b/device/testing/linux-xiaomi-whyred/APKBUILD
index 085a07168..04cccd4b3 100644
--- a/device/testing/linux-xiaomi-whyred/APKBUILD
+++ b/device/testing/linux-xiaomi-whyred/APKBUILD
@@ -47,7 +47,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-yu-tomato/APKBUILD b/device/testing/linux-yu-tomato/APKBUILD
index cfa0461fb..4905b7f19 100644
--- a/device/testing/linux-yu-tomato/APKBUILD
+++ b/device/testing/linux-yu-tomato/APKBUILD
@@ -39,7 +39,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-zte-kis3/APKBUILD b/device/testing/linux-zte-kis3/APKBUILD
index 38d73833e..d0562df59 100644
--- a/device/testing/linux-zte-kis3/APKBUILD
+++ b/device/testing/linux-zte-kis3/APKBUILD
@@ -30,7 +30,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-zte-p731a20/APKBUILD b/device/testing/linux-zte-p731a20/APKBUILD
index 19e27bfeb..59e4c92ad 100644
--- a/device/testing/linux-zte-p731a20/APKBUILD
+++ b/device/testing/linux-zte-p731a20/APKBUILD
@@ -31,7 +31,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/device/testing/linux-zuk-z2-row/APKBUILD b/device/testing/linux-zuk-z2-row/APKBUILD
index 82cfbd79d..20fe9075f 100644
--- a/device/testing/linux-zuk-z2-row/APKBUILD
+++ b/device/testing/linux-zuk-z2-row/APKBUILD
@@ -36,7 +36,7 @@ builddir="$srcdir/$_repository-$_commit"
 
 prepare() {
 	default_prepare
-	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	. downstreamkernel_prepare
 }
 
 build() {
diff --git a/main/linux-postmarketos-allwinner/APKBUILD b/main/linux-postmarketos-allwinner/APKBUILD
index 5cb727ff3..a48916315 100644
--- a/main/linux-postmarketos-allwinner/APKBUILD
+++ b/main/linux-postmarketos-allwinner/APKBUILD
@@ -38,7 +38,7 @@ prepare() {
 	cp -rv "$srcdir"/rtl8723cs-${_commit_rtl8723cs} "$builddir"/drivers/staging/rtl8723cs
 
 	REPLACE_GCCH=0 \
-		downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+		. downstreamkernel_prepare
 }
 
 build() {
diff --git a/pmaports.cfg b/pmaports.cfg
index d5bc025ca..04ad0f6dc 100644
--- a/pmaports.cfg
+++ b/pmaports.cfg
@@ -2,7 +2,7 @@
 # Version numbers (for sanity checks in pmbootstrap)
 # - "version" gets compared with "pmb.config.pmaports_min_version"
 # - "pmbootstrap_min_version" gets compared with "pmb.config.version"
-version=5
+version=6
 pmbootstrap_min_version=1.17.0
 branch_pmos=master
 # Compatible branch from Alpine's aports repository