Skip to content

fix(deps): remove bridge-utils and symlink OVMF_CODE.fd #921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xdvi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(deps): remove bridge-utils and symlink OVMF_CODE.fd #921

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 25 additions & 24 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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_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}" \
# --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-*

### 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
Expand Down