From 9a8239f8ecac3c0c891f9c12a52da16dfb63e979 Mon Sep 17 00:00:00 2001
From: sickcodes <info@sick.codes>
Date: Wed, 28 Jul 2021 18:06:03 +0000
Subject: Remove glibc patches, introduce libguestfs test

---
 Dockerfile.naked | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

(limited to 'Dockerfile.naked')

diff --git a/Dockerfile.naked b/Dockerfile.naked
index 39373ce..8f91a4f 100644
--- a/Dockerfile.naked
+++ b/Dockerfile.naked
@@ -56,12 +56,6 @@ RUN if [[ "${RANKMIRRORS}" ]]; then { pacman -Sy wget --noconfirm || pacman -Syu
     && tee -a /etc/pacman.d/mirrorlist <<< 'Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch' \
     && cat /etc/pacman.d/mirrorlist ; fi
 
-# TEMP-FIX for pacman issue
-RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
-    && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
-    && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
-# TEMP-FIX for pacman issue
-
 # For taking screenshots of the Xfvb screen, useful during development.
 ARG SCROT
 
@@ -82,19 +76,19 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
     ; fi \
     ; yes | pacman -Scc
 
-# TEMP-FIX for pacman issue
-RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
-    && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
-    && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
-# TEMP-FIX for pacman issue
+# 5.13 problem
+ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
+
+ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
 
-# TEMP-FIX for file 5.40 libguestfs issue
-RUN yes | sudo pacman -U https://archive.archlinux.org/packages/f/file/file-5.39-1-x86_64.pkg.tar.zst \
-    && patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \
-    && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \
-    && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine."
-# TEMP-FIX for file 5.40 libguestfs issue
+ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
 
+RUN sudo pacman -Rns linux --noconfirm \
+    ; sudo pacman -Syy \
+    ; sudo pacman -S mkinitcpio --noconfirm \
+    ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
+    ; rm -rf /var/tmp/.guestfs-* \
+    ; libguestfs-test-tool
 
 USER arch
 
-- 
cgit v1.2.3


From b96bac8cd27be8d85ecec0a53707cefb080b1538 Mon Sep 17 00:00:00 2001
From: sickcodes <info@sick.codes>
Date: Wed, 28 Jul 2021 18:34:48 +0000
Subject: Shift supermin environment variables earlier all images

---
 Dockerfile.naked | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'Dockerfile.naked')

diff --git a/Dockerfile.naked b/Dockerfile.naked
index 8f91a4f..481bc43 100644
--- a/Dockerfile.naked
+++ b/Dockerfile.naked
@@ -76,6 +76,10 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
     ; fi \
     ; yes | pacman -Scc
 
+USER arch
+
+ENV USER arch
+
 # 5.13 problem
 ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
 
@@ -87,11 +91,9 @@ RUN sudo pacman -Rns linux --noconfirm \
     ; sudo pacman -Syy \
     ; sudo pacman -S mkinitcpio --noconfirm \
     ; sudo pacman -U https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst --noconfirm \
-    ; rm -rf /var/tmp/.guestfs-* \
+    ; sudo rm -rf /var/tmp/.guestfs-* \
     ; libguestfs-test-tool
 
-USER arch
-
 WORKDIR /home/arch/OSX-KVM
 
 RUN mkdir -p ~/.ssh \
-- 
cgit v1.2.3