From b7c740b29eff2b0521078941908a01f11d8cc519 Mon Sep 17 00:00:00 2001 From: Yury Popov Date: Sat, 5 Aug 2017 06:16:15 +0300 Subject: [PATCH] Update OVMF to 20161202 --- makefiles/deps.mk | 6 +++--- makefiles/utils.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/makefiles/deps.mk b/makefiles/deps.mk index 52f14ca..55a8e98 100644 --- a/makefiles/deps.mk +++ b/makefiles/deps.mk @@ -12,8 +12,8 @@ DEP_SYSLINUX_VER = 6.03 DEP_SYSLINUX_URL = https://www.kernel.org/pub/linux/utils/boot/syslinux/6.xx/syslinux-6.03.zip DEP_SYSLINUX_FILE = syslinux-$(DEP_SYSLINUX_VER).zip -DEP_OVMF_VER = r15214 -DEP_OVMF_URL = http://netcologne.dl.sourceforge.net/project/edk2/OVMF/OVMF-X64-r15214.zip -DEP_OVMF_FILE = ovmf-$(DEP_OVMF_VER).zip +DEP_OVMF_VER = 20161202 +DEP_OVMF_URL = http://mirrors.kernel.org/ubuntu/pool/universe/e/edk2/ovmf_0~20161202.7bbe0b3e-1_all.deb +DEP_OVMF_FILE = ovmf-$(DEP_OVMF_VER).deb $(foreach d,$(DEP_LIST),$(eval $(call DOWN_RULE,$(d)))) diff --git a/makefiles/utils.mk b/makefiles/utils.mk index 8a2d389..77a70ae 100644 --- a/makefiles/utils.mk +++ b/makefiles/utils.mk @@ -21,7 +21,7 @@ all: check $(EFIBIOS): deps/$(DEP_OVMF_FILE) @ mkdir -p $(dir $@) - $(Q) unzip -p deps/$(DEP_OVMF_FILE) OVMF.fd > $@ + $(Q) tar xOf deps/$(DEP_OVMF_FILE) data.tar.xz | tar xO './usr/share/ovmf/OVMF.fd' > $@ $(EFIKERN): $(BIN) @ mkdir -p $(dir $@) @@ -31,4 +31,4 @@ launch: $(BIN) $(QEMU) -kernel $< -smp cores=2,threads=2 -cpu Broadwell -serial stdio launch-efi: $(EFIKERN) $(EFIBIOS) - $(QEMU) -drive file=fat:$(EFIROOT) -smp cores=2,threads=2 -cpu Broadwell -bios $(EFIBIOS) -serial stdio + $(QEMU) -drive file=fat:rw:$(EFIROOT),format=raw,media=disk -smp cores=2,threads=2 -cpu Broadwell -bios $(EFIBIOS) -serial stdio