From 364fb333f69b94d146232c86e45deab026a17db1 Mon Sep 17 00:00:00 2001
From: Dolphin von Chips <DoIphinChips@protonmail.com>
Date: Wed, 25 Mar 2020 17:24:25 +0500
Subject: [PATCH] pmb.aportgen.linux: use _outdir for supporting out-of-tree
 kernel builds (!1893)

Require new pmaports version, which has the related devicepkg-dev
changes.
---
 pmb/aportgen/linux.py  | 7 ++++---
 pmb/config/__init__.py | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pmb/aportgen/linux.py b/pmb/aportgen/linux.py
index ec98e01d..245dde37 100644
--- a/pmb/aportgen/linux.py
+++ b/pmb/aportgen/linux.py
@@ -13,14 +13,14 @@ def generate_apkbuild(args, pkgname, deviceinfo, patches):
     makedepends = "bash bc bison devicepkg-dev flex openssl-dev perl"
 
     package = """
-            downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor\""""
+            downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir\""""
 
     if deviceinfo["bootimg_qcdt"] == "true":
         makedepends += " dtbtool"
 
         package += """\n
             # Master DTB (deviceinfo_bootimg_qcdt)
-            dtbTool -p scripts/dtc/ -o "arch/$_carch/boot"/dt.img "arch/$_carch/boot/"
+            dtbTool -p scripts/dtc/ -o "$_outdir/arch/$_carch/boot"/dt.img "$_outdir/arch/$_carch/boot/"
             install -Dm644 "arch/$_carch/boot"/dt.img "$pkgdir"/boot/dt.img"""
 
     content = """\
@@ -50,10 +50,11 @@ def generate_apkbuild(args, pkgname, deviceinfo, patches):
             $_config""" + ("\n" + " " * 12).join([""] + patches) + """
         "
         builddir="$srcdir/$_repository-$_commit"
+        _outdir="out"
 
         prepare() {
             default_prepare
-            downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+            . downstreamkernel_prepare
         }
 
         build() {
diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py
index affa6bb4..f6e14966 100644
--- a/pmb/config/__init__.py
+++ b/pmb/config/__init__.py
@@ -24,7 +24,7 @@ apk_keys_path = pmb_src + "/pmb/data/keys"
 apk_tools_static_min_version = "2.10.5-r0"
 
 # postmarketOS aports compatibility (checked against "version" in pmaports.cfg)
-pmaports_min_version = "5"
+pmaports_min_version = "6"
 
 # Version of the work folder (as asked during 'pmbootstrap init'). Increase
 # this number, whenever migration is required and provide the migration code,