From bdfe3e1a8ca48d4d26432b3dc06eceedac505b13 Mon Sep 17 00:00:00 2001
From: Adrian-Ken Rueegsegger <ken@codelabs.ch>
Date: Mon, 26 Sep 2016 18:20:16 +0200
Subject: [PATCH] Update Muen port

- Upgrade to Muen v0.8+
- Switch to https
- Download contrib when building kernel
- Append Muen compilation output to build log
- Explicitly init required submodule
---
 repos/base-hw/ports/muen.hash                |  2 +-
 repos/base-hw/ports/muen.port                |  9 ++-------
 repos/base-hw/src/kernel/spec/muen/target.mk | 12 +++++++++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/repos/base-hw/ports/muen.hash b/repos/base-hw/ports/muen.hash
index e047087b6..0d9076b29 100644
--- a/repos/base-hw/ports/muen.hash
+++ b/repos/base-hw/ports/muen.hash
@@ -1 +1 @@
-563f198fa5265f2f081f9fb599e22ac95949b88a
+dfe7f3cdee51af75e791b8852641deaec00dccc2
diff --git a/repos/base-hw/ports/muen.port b/repos/base-hw/ports/muen.port
index 8d7e63628..be841c2a4 100644
--- a/repos/base-hw/ports/muen.port
+++ b/repos/base-hw/ports/muen.port
@@ -2,16 +2,11 @@ LICENSE   := GPLv3
 VERSION   := git
 DOWNLOADS := muen.git
 
-URL(muen) := http://git.codelabs.ch/git/muen.git
-REV(muen) := a724693a9e4d64cfc6bd5fe992f569d793d7165f
+URL(muen) := https://git.codelabs.ch/git/muen.git
+REV(muen) := b3a80069da73b05e0feb0db9d69460601e19d5f7
 DIR(muen) := src/kernel/muen
 
 $(call check_tool,git)
 $(call check_tool,iasl)
 $(call check_tool,tidy)
 $(call check_tool,xsltproc)
-
-default: contrib_download
-contrib_download: _dirs
-	@$(MSG_PREFIX)download contrib
-	$(VERBOSE)$(MAKE) -C src/kernel/muen/contrib download QUIET=true
diff --git a/repos/base-hw/src/kernel/spec/muen/target.mk b/repos/base-hw/src/kernel/spec/muen/target.mk
index d37f12954..db6453310 100644
--- a/repos/base-hw/src/kernel/spec/muen/target.mk
+++ b/repos/base-hw/src/kernel/spec/muen/target.mk
@@ -18,15 +18,21 @@ BUILD_OPTS      = SYSTEM=$(MUEN_SYSTEM) HARDWARE=$(MUEN_HARDWARE) NO_PROOF=true
 ifneq ($(filter muen, $(SPECS)),)
 $(TARGET): $(MUEN_DST_DIR)
 	$(MSG_BUILD)Muen kernel
-	$(VERBOSE)$(BUILD_ENV) $(MAKE) -C $(MUEN_DST_DIR) $(BUILD_OPTS) kernel > $(MUEN_LOG) 2>&1
+	$(VERBOSE)$(BUILD_ENV) $(MAKE) -C $(MUEN_DST_DIR) $(BUILD_OPTS) kernel >> $(MUEN_LOG) 2>&1
 	$(MSG_BUILD)Muen components
 	$(VERBOSE)$(BUILD_ENV) $(MAKE) -C $(MUEN_DST_DIR)/components \
-		COMPONENTS=$(MUEN_COMPONENTS) $(BUILD_OPTS) > $(MUEN_LOG) 2>&1
+		COMPONENTS=$(MUEN_COMPONENTS) $(BUILD_OPTS) >> $(MUEN_LOG) 2>&1
 
-$(MUEN_DST_DIR): $(MUEN_SRC_DIR)
+$(MUEN_DST_DIR): download_contrib
 	$(VERBOSE)mkdir -p $(MUEN_DST_DIR)
 	$(VERBOSE)tar c -C $(MUEN_SRC_DIR) . | tar x -C $(MUEN_DST_DIR)
 
+download_contrib: $(MUEN_SRC_DIR)
+	$(MSG_BUILD)Muen contrib
+	$(VERBOSE)cd $(MUEN_SRC_DIR) && git submodule update --init tools/mugenschedcfg > $(MUEN_LOG) 2>&1
+	$(VERBOSE)$(BUILD_ENV) $(MAKE) -C $(MUEN_SRC_DIR)/contrib \
+		QUIET=true download >> $(MUEN_LOG) 2>&1
+
 clean cleanall: clean_muen
 
 #