From c83bba620077d6ddda032baf77afc934976dab32 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 5 Mar 2021 02:58:29 +0000
Subject: Fri Mar  5 02:58:29 UTC 2021

a/kernel-generic-5.10.20-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.10.20-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.10.20-x86_64-1.txz:  Upgraded.
ap/sysstat-12.5.3-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.10.20-x86-1.txz:  Upgraded.
k/kernel-source-5.10.20-noarch-1.txz:  Upgraded.
l/pipewire-0.3.23-x86_64-1.txz:  Upgraded.
n/dovecot-2.3.14-x86_64-1.txz:  Upgraded.
x/OpenCC-1.1.2-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
testing/packages/linux-5.11.x/kernel-generic-5.11.3-x86_64-1.txz:  Upgraded.
testing/packages/linux-5.11.x/kernel-headers-5.11.3-x86-1.txz:  Upgraded.
testing/packages/linux-5.11.x/kernel-huge-5.11.3-x86_64-1.txz:  Upgraded.
testing/packages/linux-5.11.x/kernel-modules-5.11.3-x86_64-1.txz:  Upgraded.
testing/packages/linux-5.11.x/kernel-source-5.11.3-noarch-1.txz:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 source/installer/ChangeLog.txt      |  4 ++++
 source/installer/build_installer.sh | 25 ++++++++++---------------
 2 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'source/installer')

diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index 94a7d7982..d8050c511 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,7 @@
+Thu Mar  4 09:17:54 UTC 2021
+  build_installer.sh:  Updated support for AArch64.
+  MoZes.
++--------------------------+
 Sat Feb 20 20:40:32 UTC 2021
   Updated /sbin/rescan-scsi-bus to fix a misplaced "break". Thanks to andygoth.
 +--------------------------+
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index c2e23ea09..cc3b09a8d 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -3,7 +3,7 @@ set +o posix
 
 # $Id: build_installer.sh,v 1.129 2011/04/13 23:03:07 eha Exp eha $
 #
-# Copyright 2005-2018  Stuart Winter, Surrey, England, UK
+# Copyright 2005-2021  Stuart Winter, Surrey, England, UK
 # Copyright 2008, 2009, 2010, 2011, 2017  Eric Hameleers, Eindhoven, Netherlands
 # Copyright 2011-2020  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
@@ -186,9 +186,9 @@ case $ARCH in
     KEXTRAV[0]="-armv7"
     ;;
   aarch64)
-    KERNELS[0]=aarch64
+    KERNELS[0]=armv8
     # The -extraversion (appended to the $KVER) for the KERNELS[*]:
-    KEXTRAV[0]="-aarch64"
+    KEXTRAV[0]="-armv8"
     ;;
   i?86)
     # What kernel directories are in this installer?
@@ -510,7 +510,7 @@ mkdir -p -m755  etc/rc.d
 mkdir -p -m755  etc/dropbear
 mkdir -p -m755  floppy
 mkdir -p -m755  lib/modules
-[ "$ARCH" = "x86_64" ] && mkdir -p -m755  lib64
+[[ "${ARCH}" =~ (x86_64$|aarch64$) ]] && mkdir -p -m755  lib64
 mkdir -p -m700  lost+found
 mkdir -p -m755  mnt
 mkdir -p -m755  proc
@@ -1836,7 +1836,7 @@ sed -i 's?(version.*)?(version '"$INSTALLERVERSION"')?g' etc/issue
 
 case $ARCH in
 
-  arm*)
+  arm*|aarch64)
   #
   # ARM modifications:
   #
@@ -1911,19 +1911,14 @@ cd $PKG/$ARCH-installer-filesystem/
 echo "--- Creating your new initrd.img ---"
 # Leave a note in the installer image to help us work out which build version
 # it is -- just aids with bug reports for now:
-cat <<"EOF" > .installer-version
-Version details:
-----------------
-Installer............: $Revision: 1.129 $ ($Date: 2011/04/13 23:03:07 $)
-EOF
-cat << EOF >> .installer-version
-For Slackware version: $INSTALLERVERSION
-Build date...........: $( date )
+cat << EOF > .installer-version
+For Slackware version : $INSTALLERVERSION
+Build date............: $( date )
 
 Build details:
 --------------
-Installer arch.......: $ARCH
-Build host...........: $( uname -a )
+Installer arch target : $ARCH
+Build host............: $( uname -a )
 
 EOF
 
-- 
cgit v1.2.3