Skip to content

Commit

Permalink
Docker: add qemu and qemu-system-x86 packages
Browse files Browse the repository at this point in the history
Fix Makefile boot target typo.

Signed-off-by: Pawel Wieczorkiewicz <[email protected]>
  • Loading branch information
wipawel committed Feb 8, 2021
1 parent 97cc2b0 commit 0f83215
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ endif
.PHONY: boot
boot: $(ISO_FILE)
@echo "QEMU START"
$(VERBOSE)$(QEMU_BIN) -cdrom $(ISO_FILE) $(QEMU_PARAMS)
$(VERBOSE) $(QEMU_BIN) -cdrom $(ISO_FILE) $(QEMU_PARAMS)

.PHONY: boot_debug
boot_debug: $(ISO_FILE)
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ubuntu:20.04

# build dependencies
RUN apt-get update -y
RUN apt-get install -y gcc make xorriso qemu-utils patch
RUN apt-get install -y gcc make xorriso qemu-utils qemu qemu-system-x86 patch
# grub is a bit special in containers
RUN DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install grub2 kmod python

Expand Down

0 comments on commit 0f83215

Please sign in to comment.