diff --git a/repos/base-hw/doc/x86_64_muen.txt b/repos/base-hw/doc/x86_64_muen.txt index 917d9a646..050d6a2a9 100644 --- a/repos/base-hw/doc/x86_64_muen.txt +++ b/repos/base-hw/doc/x86_64_muen.txt @@ -147,7 +147,7 @@ within your build Genode directory like so: After this change you can build the Genode 'base-hw' image and export it to the Muen working directory using the following command: -! objcopy -O binary var/run/log/image.elf /policy/obj/base_hw +! objcopy -O binary var/run/log/boot/image.elf /policy/obj/base_hw Change back to the Muen working directory to package the system image and restart emulation: diff --git a/repos/base-hw/ports/muen.hash b/repos/base-hw/ports/muen.hash index 39590c03a..01db2d396 100644 --- a/repos/base-hw/ports/muen.hash +++ b/repos/base-hw/ports/muen.hash @@ -1 +1 @@ -e51f0c9bfe99c284b3cf3bcf5fb81f7e9052f8a6 +6ee7754cd5edecc78df38a1d42dc2855ea3fcc0f diff --git a/repos/base-hw/ports/muen.patch b/repos/base-hw/ports/muen.patch deleted file mode 100644 index 519f6f3e6..000000000 --- a/repos/base-hw/ports/muen.patch +++ /dev/null @@ -1,10 +0,0 @@ -+++ src/kernel/muen/policy/xml/vcpu_subject_base_hw.xml -@@ -9,7 +9,7 @@ - - - -- 16#0020_0028# -+ 16#0020_0078# - 16#0000# - - diff --git a/repos/base-hw/ports/muen.port b/repos/base-hw/ports/muen.port index f75d8b251..dc6ebe3cb 100644 --- a/repos/base-hw/ports/muen.port +++ b/repos/base-hw/ports/muen.port @@ -3,11 +3,9 @@ VERSION := git DOWNLOADS := muen.git URL(muen) := https://git.codelabs.ch/git/muen.git -REV(muen) := 807cb0381e12329d84cb7e6b2f778b1e1559a2e8 +REV(muen) := 76b75b5f859f14397d146c16e5411142a6af11d0 DIR(muen) := src/kernel/muen -PATCHES := ports/muen.patch - $(call check_tool,git) $(call check_tool,iasl) $(call check_tool,tidy) diff --git a/repos/base-hw/src/kernel/spec/muen/target.mk b/repos/base-hw/src/kernel/spec/muen/target.mk index d9177ad28..ac61770b0 100644 --- a/repos/base-hw/src/kernel/spec/muen/target.mk +++ b/repos/base-hw/src/kernel/spec/muen/target.mk @@ -16,6 +16,13 @@ SPARK_PATH = $(shell sed -n "/^SPARK_PATH/s/^.*=\\s*//p" ${MUEN_CONF_FILE}) BUILD_ENV = PATH=$(GNAT_PATH)/bin:$(SPARK_PATH)/bin:$$PATH BUILD_OPTS = SYSTEM=$(MUEN_SYSTEM) HARDWARE=$(MUEN_HARDWARE) PLATFORM=$(MUEN_PLATFORM) NO_PROOF=true +ifeq ($(VERBOSE),) +BUILD_OPTS += BUILD_OUTPUT_VERBOSE=true +else +BUILD_OPTS += BUILD_OUTPUT_NOCOLOR=true +endif + + ifneq ($(filter muen, $(SPECS)),) $(TARGET): $(MUEN_DST_DIR) $(MSG_BUILD)Muen policy