From 2d8a656a054cbeba7d8007d74a0bfe6ce57c81ad Mon Sep 17 00:00:00 2001
From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Date: Sun, 24 May 2020 17:41:57 +0200
Subject: libre: linux-libre-64: Fix image format for aarch64

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 libre/linux-libre-64/PKGBUILD | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'libre/linux-libre-64')

diff --git a/libre/linux-libre-64/PKGBUILD b/libre/linux-libre-64/PKGBUILD
index 5669964da..5cf90d955 100644
--- a/libre/linux-libre-64/PKGBUILD
+++ b/libre/linux-libre-64/PKGBUILD
@@ -9,7 +9,7 @@ _replacesoldmodules=() # '%' gets replaced with kernel suffix
 
 pkgbase=linux-libre-64
 pkgver=5.6.12
-pkgrel=1
+pkgrel=2
 pkgdesc='64bit Linux-libre for Parabola $CARCH'
 rcnver=5.6.10
 rcnrel=armv7-x12
@@ -189,7 +189,13 @@ _package() {
   echo "Installing boot image..."
   # systemd expects to find the kernel here to allow hibernation
   # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
-  install -Dm644 "$(make ARCH=$KARCH CROSS_COMPILE=$CROSS_COMPILE -s image_name)" "$modulesdir/vmlinuz"
+  # The default image target is Image.gz on arm64 but some u-boot
+  # configurations and/or versions don't support that, so we use Image instead.
+  if [ "$KARCH" = "arm64" ]; then
+    install -Dm644 arch/$KARCH/boot/Image "$modulesdir/vmlinuz"
+  else
+    install -Dm644 "$(make ARCH=$KARCH CROSS_COMPILE=$CROSS_COMPILE -s image_name)" "$modulesdir/vmlinuz"
+  fi
 
   # Used by mkinitcpio to name the kernel
   echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
-- 
cgit v1.2.3