From 48dec6e7445aab30a88606458d616db17a06002a Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 5 Dec 2022 12:13:27 +0100
Subject: [PATCH] install vim instead of vi by default, only install
 intel-ucode on x86_64, amd-ucode on x86_64 and aarch64

---
 usr/lib/archboot/installer/common.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/usr/lib/archboot/installer/common.sh b/usr/lib/archboot/installer/common.sh
index 49b98b699..09433b694 100644
--- a/usr/lib/archboot/installer/common.sh
+++ b/usr/lib/archboot/installer/common.sh
@@ -118,14 +118,16 @@ auto_packages() {
     linux_firmware
     marvell_firmware
     ### HACK:
-    # always add intel-ucode
+    # always add intel-ucode on x86_64
     if [[ "${RUNNING_ARCH}" == "x86_64" ]]; then
         PACKAGES="${PACKAGES//\ intel-ucode\ / }"
         PACKAGES="${PACKAGES} intel-ucode"
     fi
     # always add amd-ucode
-    PACKAGES="${PACKAGES//\ amd-ucode\ / }"
-    PACKAGES="${PACKAGES} amd-ucode"
+    if [[ "${RUNNING_ARCH}" == "x86_64" ||  "${RUNNING_ARCH}" == "aarch64"  ]]; then
+        PACKAGES="${PACKAGES//\ amd-ucode\ / }"
+        PACKAGES="${PACKAGES} amd-ucode"
+    fi
     ### HACK:
     # always add netctl with optdepends
     PACKAGES="${PACKAGES//\ netctl\ / }"
@@ -146,8 +148,8 @@ auto_packages() {
     # always add nano and vi
     PACKAGES="${PACKAGES//\ nano\ / }"
     PACKAGES="${PACKAGES} nano"
-    PACKAGES="${PACKAGES//\ vi\ / }"
-    PACKAGES="${PACKAGES} vi"
+    PACKAGES="${PACKAGES//\ vim\ / }"
+    PACKAGES="${PACKAGES} vim"
 }
 
 # /etc/locale.gen