summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-05-24 17:41:57 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-05-24 18:55:17 +0200
commit2d8a656a054cbeba7d8007d74a0bfe6ce57c81ad (patch)
tree3a1fecbe79932c4b6f3416f7bf4bec19ad17aa6d /libre
parente9d3becf4bc982a613f25e0ede0dc4a4c7864c07 (diff)
downloadabslibre-2d8a656a054cbeba7d8007d74a0bfe6ce57c81ad.tar.gz
abslibre-2d8a656a054cbeba7d8007d74a0bfe6ce57c81ad.tar.bz2
abslibre-2d8a656a054cbeba7d8007d74a0bfe6ce57c81ad.zip
libre: linux-libre-64: Fix image format for aarch64
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Diffstat (limited to 'libre')
-rw-r--r--libre/linux-libre-64/PKGBUILD10
1 files changed, 8 insertions, 2 deletions
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"