From a24c2bd02a10f2ca5bd69953e22210cdd0512a4d Mon Sep 17 00:00:00 2001
From: Justin Wernick <justin@worthe-it.co.za>
Date: Tue, 15 Sep 2020 21:55:15 +0200
Subject: Multilib support

Unfortunately only for my machine. I don't know what's necessary on
other display drivers etc.
---
 alis.conf |  1 +
 alis.sh   | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/alis.conf b/alis.conf
index 2a43dbc..2b6ddfb 100644
--- a/alis.conf
+++ b/alis.conf
@@ -38,6 +38,7 @@ PACMAN_MIRROR="https://mirrors.kernel.org/archlinux/\$repo/os/\$arch"
 KERNELS="!linux-lts !linux-lts-headers !linux-hardened !linux-hardened-headers !linux-zen !linux-zen-headers" # Additional kernels and headers (multiple)
 KERNELS_COMPRESSION="!gzip !bzip2 !lzma !xz !lzop !lz4"
 KERNELS_PARAMETERS="" # eg. iommu=soft
+MULTILIB="false"
 
 # config
 TIMEZONE="/usr/share/zoneinfo/Africa/Johannesburg"
diff --git a/alis.sh b/alis.sh
index f416a22..f2c68dd 100755
--- a/alis.sh
+++ b/alis.sh
@@ -135,6 +135,7 @@ function check_variables() {
     check_variables_list "KERNELS_COMPRESSION" "$KERNELS_COMPRESSION" "gzip bzip2 lzma xz lzop lz4" "false"
     check_variables_value "TIMEZONE" "$TIMEZONE"
     check_variables_boolean "REFLECTOR" "$REFLECTOR"
+    check_variables_boolean "MULTILIB" "$MULTILIB"
     check_variables_value "PACMAN_MIRROR" "$PACMAN_MIRROR"
     check_variables_value "LOCALES" "$LOCALES"
     check_variables_value "LOCALE_CONF" "$LOCALE_CONF"
@@ -549,6 +550,10 @@ function install() {
     sed -i 's/#TotalDownload/TotalDownload/' /etc/pacman.conf
 
     pacstrap /mnt base base-devel linux linux-firmware
+    if [ "$MULTILIB" == "true" ]; then
+        echo "[multilib]" >> /mnt/etc/pacman.conf
+        echo "Include = /etc/pacman.d/mirrorlist" >> /mnt/etc/pacman.conf
+    fi
 
     sed -i 's/#Color/Color/' /mnt/etc/pacman.conf
     sed -i 's/#TotalDownload/TotalDownload/' /mnt/etc/pacman.conf
@@ -1174,7 +1179,9 @@ function desktop_environment() {
     PACKAGES_DRIVER=""
     PACKAGES_DDX=""
     PACKAGES_VULKAN=""
+    PACKAGES_VULKAN_MULTILIB=""
     PACKAGES_HARDWARE_ACCELERATION=""
+    PACKAGES_HARDWARE_ACCELERATION_MULTILIB=""
     case "$DISPLAY_DRIVER" in
         "nvidia" )
             PACKAGES_DRIVER="nvidia"
@@ -1218,6 +1225,7 @@ function desktop_environment() {
                 ;;
             "amdgpu" )
                 PACKAGES_VULKAN="vulkan-icd-loader vulkan-radeon"
+                PACKAGES_VULKAN_MULTILIB="lib32-vulkan-icd-loader lib32-vulkan-radeon"
                 ;;
             "ati" )
                 PACKAGES_VULKAN=""
@@ -1237,6 +1245,7 @@ function desktop_environment() {
                 ;;
             "amdgpu" )
                 PACKAGES_HARDWARE_ACCELERATION="libva-mesa-driver"
+                PACKAGES_HARDWARE_ACCELERATION_MULTILIB="lib32-libva-mesa-driver"
                 ;;
             "ati" )
                 PACKAGES_HARDWARE_ACCELERATION="mesa-vdpau"
@@ -1247,6 +1256,9 @@ function desktop_environment() {
         esac
     fi
     pacman_install "mesa $PACKAGES_DRIVER $PACKAGES_DDX $PACKAGES_VULKAN $PACKAGES_HARDWARE_ACCELERATION"
+    if [ "$MULTILIB" == "true" ]; then
+        pacman_install "lib32-mesa $PACKAGES_VULKAN_MULTILIB $PACKAGES_HARDWARE_ACCELERATION_MULTILIB"
+    fi
 
     case "$DESKTOP_ENVIRONMENT" in
         "gnome" )
-- 
cgit v1.2.3