From 018e28cc66e048c8bb828155dd27a6a2ddcfeaf4 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Wed, 9 Jan 2019 22:24:51 -0800
Subject: [PATCH] main/postmarketos-mkinitfs: aarch64 uboot initrd (!141)

Support generating the aarch64 legacy uboot initrd files, not only the
armhf version. Use deviceinfo_arch to choose the right arch.
---
 main/postmarketos-mkinitfs/APKBUILD    | 6 +++---
 main/postmarketos-mkinitfs/mkinitfs.sh | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/main/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD
index f4f68bf85..b897044f8 100644
--- a/main/postmarketos-mkinitfs/APKBUILD
+++ b/main/postmarketos-mkinitfs/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=postmarketos-mkinitfs
-pkgver=0.7.3
-pkgrel=2
+pkgver=0.7.4
+pkgrel=0
 pkgdesc="Tool to generate initramfs images for postmarketOS"
 url="https://postmarketos.org"
 # multipath-tools: kpartx
@@ -26,4 +26,4 @@ package() {
 
 sha512sums="c8ed2697ba0368b907eaefe7544bff8539adc7e8247af6bd425c722e3cedeb34e303f6bd9e00f283921352bc43dff3db83f3b3c1f427ef597ac15323f1e9c3eb  init.sh.in
 3c72a9a5cfef0591dd27c88a76df4db0f50b98f002672c061e77bdb2e6f4ac48d10b5cd85563a89d778a013da6d5a508e5ea70f131971d61545ba18e7094ab8b  init_functions.sh
-4c8a999009bc7e909bc1848c8c2421cb5f79f2603ee210b8f8c145f47c31a9e56e1861cffe742fcfd3c7bbb315e37dbe347bb5ac602f45eeccc0e40516889618  mkinitfs.sh"
+5ad842720e7f322bab43aa585103f5bd7e4b11e2e8cce553d406123e4379c160a1b8d7ed1b6aae75b040b2df309c105c412826a8467d552576d6d9ac1f6792ab  mkinitfs.sh"
diff --git a/main/postmarketos-mkinitfs/mkinitfs.sh b/main/postmarketos-mkinitfs/mkinitfs.sh
index 86857452e..d106e8b84 100644
--- a/main/postmarketos-mkinitfs/mkinitfs.sh
+++ b/main/postmarketos-mkinitfs/mkinitfs.sh
@@ -213,11 +213,16 @@ require_package()
 # Legacy u-boot images
 create_uboot_files()
 {
+        arch="arm"
+        if [ "${deviceinfo_arch}" == "aarch64" ]; then
+                arch="arm64"
+        fi
+
 	[ "${deviceinfo_generate_legacy_uboot_initfs}" == "true" ] || return
 	require_package "mkimage" "uboot-tools" "generate_legacy_uboot_initfs"
 
 	echo "==> initramfs: creating uInitrd"
-	mkimage -A arm -T ramdisk -C none -n uInitrd -d "$outfile" \
+	mkimage -A $arch -T ramdisk -C none -n uInitrd -d "$outfile" \
 		"${outfile/initramfs-/uInitrd-}" || exit 1
 
 	echo "==> kernel: creating uImage"
@@ -225,7 +230,7 @@ create_uboot_files()
 	if [ -n "${deviceinfo_dtb}" ]; then
 		kernelfile="${kernelfile}-dtb"
 	fi
-	mkimage -A arm -O linux -T kernel -C none -a 80008000 -e 80008000 \
+	mkimage -A $arch -O linux -T kernel -C none -a 80008000 -e 80008000 \
 		-n postmarketos -d $kernelfile "${outfile/initramfs-/uImage-}" || exit 1
 }