From 94e9d78e5f191821d027d927909910a6407b5102 Mon Sep 17 00:00:00 2001
From: killajoe <archlinux@kamprad.net>
Date: Tue, 19 Sep 2023 13:13:42 +0200
Subject: [PATCH] [archiso] some changes merged from upstream

---
 airootfs/etc/environment | 1 -
 packages.x86_64          | 1 +
 profiledef.sh            | 5 +++--
 run_before_squashfs.sh   | 8 ++++----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/airootfs/etc/environment b/airootfs/etc/environment
index 1060e5cf..32019d0f 100755
--- a/airootfs/etc/environment
+++ b/airootfs/etc/environment
@@ -3,6 +3,5 @@
 #
 # Syntax: simple "KEY=VAL" pairs on separate lines
 #
-QT_QPA_PLATFORMTHEME=qt5ct
 BROWSER=firefox
 EDITOR=nano
diff --git a/packages.x86_64 b/packages.x86_64
index 5d83312d..4c9bdbf0 100644
--- a/packages.x86_64
+++ b/packages.x86_64
@@ -290,6 +290,7 @@ virtualbox-guest-utils
 open-vm-tools
 xf86-input-vmmouse
 xf86-video-vmware
+xf86-video-qxl
 
 # eos-arm needed packages for chroot into arm device
 qemu-arm-aarch64-static-bin
diff --git a/profiledef.sh b/profiledef.sh
index 01b7d6f1..c60f41e2 100644
--- a/profiledef.sh
+++ b/profiledef.sh
@@ -5,13 +5,14 @@ iso_name="EndeavourOS-kde-unstable"
 iso_label="EOS_$(date +%Y%m)"
 iso_publisher="EndeavourOS <https://endeavouros.com>"
 iso_application="EndeavourOS Live/Rescue CD"
-iso_version="$(date +%Y.%m.%d)"
+iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)"
 install_dir="arch"
 buildmodes=('iso')
 quiet="n"
 work_dir="work"
 out_dir="out"
-bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
+bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito'
+           'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
 arch="x86_64"
 pacman_conf="airootfs/etc/pacman.conf"
 airootfs_image_type="squashfs"
diff --git a/run_before_squashfs.sh b/run_before_squashfs.sh
index 12c0730a..0769cf76 100755
--- a/run_before_squashfs.sh
+++ b/run_before_squashfs.sh
@@ -58,6 +58,10 @@ rm -R "/root/root-theme"
 cat "/usr/lib/endeavouros-release" >> "/etc/motd"
 echo "------------------" >> "/etc/motd"
 
+# Install locally builded packages on ISO (place packages under airootfs/root/packages)
+pacman -U --noconfirm -- "/root/packages/"*".pkg.tar.zst"
+rm -rf "/root/packages/"
+
 # Enable systemd services
 # --> now in airootfs/etc/systemd/system/multi-user.target.wants
 #systemctl enable NetworkManager.service systemd-timesyncd.service bluetooth.service firewalld.service
@@ -65,10 +69,6 @@ echo "------------------" >> "/etc/motd"
 #systemctl enable intel.service
 systemctl set-default multi-user.target
 
-# Install locally builded packages on ISO (place packages under airootfs/root/packages)
-pacman -U --noconfirm -- "/root/packages/"*".pkg.tar.zst"
-rm -rf "/root/packages/"
-
 # Set wallpaper for live-session and original for installed system
 mv "endeavouros-wallpaper.png" "/etc/calamares/files/endeavouros-wallpaper.png"
 mv "/root/livewall.png" "/usr/share/endeavouros/backgrounds/endeavouros-wallpaper.png"