From 71deaa4f0975b3bc37a5459aa2e46288ccdc4c4b Mon Sep 17 00:00:00 2001
From: David <juan.david.gamboa.18@gmail.com>
Date: Mon, 13 Apr 2026 17:14:11 -0500
Subject: [PATCH] fix(deps): remove bridge-utils and symlink OVMF_CODE.fd

bridge-utils is no longer available in the standard Arch Linux
repositories (replaced by iproute2). Removing it prevents build
failures on current Arch base images.

Add symlink OVMF_CODE.fd -> OVMF_CODE_4M.fd to match the upstream
rename in OSX-KVM, which causes QEMU to fail to find the firmware
file at launch.

The generate-specific-bootdisk.sh steps are skipped during build
as they require KVM access (/dev/kvm) not available in standard
Docker build environments. OpenCore bootdisks are generated at
container startup instead.
---
 Dockerfile | 47 ++++++++++++++++++++++++-----------------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f3c117a..98785cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -154,7 +154,7 @@ RUN touch enable-ssh.sh \
 
 # RUN yes | sudo pacman -Syu qemu libvirt dnsmasq virt-manager bridge-utils edk2-ovmf netctl libvirt-dbus --overwrite --noconfirm
 
-RUN yes | sudo pacman -Syu bc qemu-desktop libvirt dnsmasq virt-manager bridge-utils openresolv jack2 ebtables edk2-ovmf netctl libvirt-dbus wget scrot --overwrite --noconfirm \
+RUN yes | sudo pacman -Syu bc qemu-desktop libvirt dnsmasq virt-manager openresolv jack2 ebtables edk2-ovmf netctl libvirt-dbus wget scrot --overwrite --noconfirm \
     && yes | sudo pacman -Scc
 
 WORKDIR /home/arch/OSX-KVM
@@ -251,32 +251,33 @@ ARG STOCK_MASTER_PLIST_URL_NOPICKER=https://raw.githubusercontent.com/sickcodes/
 ARG STOCK_BOOTDISK=/home/arch/OSX-KVM/OpenCore/OpenCore.qcow2
 ARG STOCK_BOOTDISK_NOPICKER=/home/arch/OSX-KVM/OpenCore/OpenCore-nopicker.qcow2
 
-RUN ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
-    --master-plist-url="${STOCK_MASTER_PLIST_URL}" \
-    --model "${STOCK_DEVICE_MODEL}" \
-    --serial "${STOCK_SERIAL}" \
-    --board-serial "${STOCK_BOARD_SERIAL}" \
-    --uuid "${STOCK_UUID}" \
-    --mac-address "${STOCK_MAC_ADDRESS}" \
-    --width "${STOCK_WIDTH}" \
-    --height "${STOCK_HEIGHT}" \
-    --output-bootdisk "${STOCK_BOOTDISK}" || exit 1 \
-    ; rm -rf /var/tmp/.guestfs-*
+# RUN ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
+#     --master-plist-url="${STOCK_MASTER_PLIST_URL}" \
+#     --model "${STOCK_DEVICE_MODEL}" \
+#     --serial "${STOCK_SERIAL}" \
+#     --board-serial "${STOCK_BOARD_SERIAL}" \
+#     --uuid "${STOCK_UUID}" \
+#     --mac-address "${STOCK_MAC_ADDRESS}" \
+#     --width "${STOCK_WIDTH}" \
+#     --height "${STOCK_HEIGHT}" \
+#     --output-bootdisk "${STOCK_BOOTDISK}" || exit 1 \
+#     ; rm -rf /var/tmp/.guestfs-*
 
-RUN ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
-    --master-plist-url="${STOCK_MASTER_PLIST_URL_NOPICKER}" \
-    --model "${STOCK_DEVICE_MODEL}" \
-    --serial "${STOCK_SERIAL}" \
-    --board-serial "${STOCK_BOARD_SERIAL}" \
-    --uuid "${STOCK_UUID}" \
-    --mac-address "${STOCK_MAC_ADDRESS}" \
-    --width "${STOCK_WIDTH}" \
-    --height "${STOCK_HEIGHT}" \
-    --output-bootdisk "${STOCK_BOOTDISK_NOPICKER}" || exit 1 \
-    ; rm -rf /var/tmp/.guestfs-*
+# RUN ./Docker-OSX/osx-serial-generator/generate-specific-bootdisk.sh \
+#     --master-plist-url="${STOCK_MASTER_PLIST_URL_NOPICKER}" \
+#     --model "${STOCK_DEVICE_MODEL}" \
+#     --serial "${STOCK_SERIAL}" \
+#     --board-serial "${STOCK_BOARD_SERIAL}" \
+#     --uuid "${STOCK_UUID}" \
+#     --mac-address "${STOCK_MAC_ADDRESS}" \
+#     --width "${STOCK_WIDTH}" \
+#     --height "${STOCK_HEIGHT}" \
+#     --output-bootdisk "${STOCK_BOOTDISK_NOPICKER}" || exit 1 \
+#     ; rm -rf /var/tmp/.guestfs-*
 
 ### symlink the old directory as upstream has renamed a directory. Symlinking purely for backwards compatability!
 RUN ln -s /home/arch/OSX-KVM/OpenCore /home/arch/OSX-KVM/OpenCore-Catalina || true
+RUN ln -s /home/arch/OSX-KVM/OVMF_CODE_4M.fd /home/arch/OSX-KVM/OVMF_CODE.fd || true
 ####
 
 #### SPECIAL RUNTIME ARGUMENTS BELOW