main/linux-rpi: move dtb on aarch64

1 files changed, 6 insertions, 2 deletions

diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD
index 72c1ffac50..cd51dd2f42 100644
--- a/main/linux-rpi/APKBUILD
+++ b/main/linux-rpi/APKBUILD
@@ -6,7 +6,7 @@ case $pkgver in
 *.*.*)  _kernver=${pkgver%.*};;
 *.*)    _kernver=${pkgver};;
 esac
-pkgrel=0
+pkgrel=1
 pkgdesc="Linux kernel with Raspberry Pi patches"
 url=https://github.com/raspberrypi/linux
 depends="mkinitfs"
@@ -179,11 +179,12 @@ _package() {
         esac
 
         cd "$srcdir"/build-$_buildflavor
+        local INSTALL_DTBS_PATH="$_outdir"/usr/lib/linux-${_abi_release}
         make -j1 modules_install $_install \
                 ARCH="$_carch" \
                 INSTALL_MOD_PATH="$_outdir" \
                 INSTALL_PATH="$_outdir"/boot \
-                INSTALL_DTBS_PATH="$_outdir"/usr/lib/linux-${_abi_release}
+                INSTALL_DTBS_PATH="$INSTALL_DTBS_PATH"
 
         rm -f "$_outdir"/lib/modules/${_abi_release}/build \
                 "$_outdir"/lib/modules/${_abi_release}/source
@@ -191,6 +192,9 @@ _package() {
 
         install -D include/config/kernel.release \
                 "$_outdir"/usr/share/kernel/$_buildflavor/kernel.release
+
+        [ "$CARCH" = "aarch64" ] && mv "$INSTALL_DTBS_PATH"/broadcom/*.dtb \
+                "$INSTALL_DTBS_PATH" && rmdir "$INSTALL_DTBS_PATH"/broadcom
 }
 
 # main flavor installs in $pkgdir