From 0f83215cd098d2062d700d8f7f2615644632afb8 Mon Sep 17 00:00:00 2001 From: Pawel Wieczorkiewicz Date: Mon, 8 Feb 2021 14:56:48 +0100 Subject: [PATCH] Docker: add qemu and qemu-system-x86 packages Fix Makefile boot target typo. Signed-off-by: Pawel Wieczorkiewicz --- Makefile | 2 +- tools/docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a2cb9352..fabbb719 100644 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 9efb6304..7144f346 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -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