Add missing kernel headers

5 files changed, 32 insertions, 3 deletions

diff --git a/Dockerfile b/Dockerfile
index 64c89d1..854c350 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -227,6 +227,7 @@ ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
 ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
 ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
 ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst
+ENV KERNEL_HEADERS_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-headers-5.12.14.arch1-1-x86_64.pkg.tar.zst
 ENV LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst
 
 ARG LINUX=true
@@ -235,6 +236,8 @@ ARG LINUX=true
 RUN if [[ "${LINUX}" == true ]]; then \
         sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm \
         ; sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm \
+        ; sudo pacman -U "${KERNEL_HEADERS_PACKAGE_URL}" --noconfirm \
+        ; sudo pacman -S mkinitcpio --noconfirm \
         ; sudo libguestfs-test-tool \
         ; sudo rm -rf /var/tmp/.guestfs-* \
     ; fi
diff --git a/Dockerfile.auto b/Dockerfile.auto
index 2fce725..f17e3b9 100644
--- a/Dockerfile.auto
+++ b/Dockerfile.auto
@@ -101,6 +101,7 @@ ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
 ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
 ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
 ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst
+ENV KERNEL_HEADERS_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-headers-5.12.14.arch1-1-x86_64.pkg.tar.zst
 ENV LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst
 
 ARG LINUX=true
@@ -109,13 +110,14 @@ ARG LINUX=true
 RUN if [[ "${LINUX}" == true ]]; then \
         sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm \
         ; sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm \
+        ; sudo pacman -U "${KERNEL_HEADERS_PACKAGE_URL}" --noconfirm \
+        ; sudo pacman -S mkinitcpio --noconfirm \
         ; sudo libguestfs-test-tool \
         ; sudo rm -rf /var/tmp/.guestfs-* \
     ; fi
 
 ####
 
-
 WORKDIR /home/arch/OSX-KVM
 
 RUN mkdir -p ~/.ssh \
diff --git a/Dockerfile.monterey b/Dockerfile.monterey
index 726b209..4d6ec62 100644
--- a/Dockerfile.monterey
+++ b/Dockerfile.monterey
@@ -39,13 +39,32 @@ RUN qemu-img create -f qcow2 /home/arch/OSX-KVM/mac_hdd_ng.img "${SIZE}"
 
 WORKDIR /home/arch/OSX-KVM
 
+#### libguestfs versioning
+
+# 5.13+ problem resolved by building the qcow2 against 5.12 using libguestfs-1.44.1-6
+
+ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
+ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
+ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
+ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst
+ENV KERNEL_HEADERS_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-headers-5.12.14.arch1-1-x86_64.pkg.tar.zst
+ENV LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst
+
 ARG LINUX=true
 
 # required to use libguestfs inside a docker container, to create bootdisks for docker-osx on-the-fly
 RUN if [[ "${LINUX}" == true ]]; then \
-        sudo pacman -Syu linux libguestfs --noconfirm \
+        sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm \
+        ; sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm \
+        ; sudo pacman -U "${KERNEL_HEADERS_PACKAGE_URL}" --noconfirm \
+        ; sudo pacman -S mkinitcpio --noconfirm \
+        ; sudo libguestfs-test-tool \
+        ; sudo rm -rf /var/tmp/.guestfs-* \
     ; fi
 
+####
+
+
 # optional --build-arg to change branches for testing
 ARG BRANCH=master
 ARG REPO='https://github.com/sickcodes/Docker-OSX.git'
diff --git a/Dockerfile.naked b/Dockerfile.naked
index 56aa876..c61099e 100644
--- a/Dockerfile.naked
+++ b/Dockerfile.naked
@@ -81,7 +81,6 @@ USER arch
 
 ENV USER arch
 
-
 #### libguestfs versioning
 
 # 5.13+ problem resolved by building the qcow2 against 5.12 using libguestfs-1.44.1-6
@@ -90,6 +89,7 @@ ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
 ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
 ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
 ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst
+ENV KERNEL_HEADERS_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-headers-5.12.14.arch1-1-x86_64.pkg.tar.zst
 ENV LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst
 
 ARG LINUX=true
@@ -98,6 +98,8 @@ ARG LINUX=true
 RUN if [[ "${LINUX}" == true ]]; then \
         sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm \
         ; sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm \
+        ; sudo pacman -U "${KERNEL_HEADERS_PACKAGE_URL}" --noconfirm \
+        ; sudo pacman -S mkinitcpio --noconfirm \
         ; sudo libguestfs-test-tool \
         ; sudo rm -rf /var/tmp/.guestfs-* \
     ; fi
diff --git a/Dockerfile.naked-auto b/Dockerfile.naked-auto
index 5296412..6f0f79f 100644
--- a/Dockerfile.naked-auto
+++ b/Dockerfile.naked-auto
@@ -81,6 +81,7 @@ ENV SUPERMIN_KERNEL=/boot/vmlinuz-linux
 ENV SUPERMIN_MODULES=/lib/modules/5.12.14-arch1-1
 ENV SUPERMIN_KERNEL_VERSION=5.12.14-arch1-1
 ENV KERNEL_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-5.12.14.arch1-1-x86_64.pkg.tar.zst
+ENV KERNEL_HEADERS_PACKAGE_URL=https://archive.archlinux.org/packages/l/linux/linux-headers-5.12.14.arch1-1-x86_64.pkg.tar.zst
 ENV LIBGUESTFS_PACKAGE_URL=https://archive.archlinux.org/packages/l/libguestfs/libguestfs-1.44.1-6-x86_64.pkg.tar.zst
 
 ARG LINUX=true
@@ -89,6 +90,8 @@ ARG LINUX=true
 RUN if [[ "${LINUX}" == true ]]; then \
         sudo pacman -U "${KERNEL_PACKAGE_URL}" --noconfirm \
         ; sudo pacman -U "${LIBGUESTFS_PACKAGE_URL}" --noconfirm \
+        ; sudo pacman -U "${KERNEL_HEADERS_PACKAGE_URL}" --noconfirm \
+        ; sudo pacman -S mkinitcpio --noconfirm \
         ; sudo libguestfs-test-tool \
         ; sudo rm -rf /var/tmp/.guestfs-* \
     ; fi