ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Adrian-Ken Rueegsegger 2016-09-26 18:20:16 +02:00 committed by Christian Helmuth
parent 6b66c819ef
commit bdfe3e1a8c
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/base-hw/ports/muen.hash
View File

@ -1 +1 @@
563f198fa5265f2f081f9fb599e22ac95949b88a
dfe7f3cdee51af75e791b8852641deaec00dccc2

9
repos/base-hw/ports/muen.port
View File

@ -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

12
repos/base-hw/src/kernel/spec/muen/target.mk
View File

@ -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
#