Update Muen port
- Use latest Muen version - Sync VirtualBox Muen subject state - Rework Muen download so contrib/muen-* remains untouched after port has been prepared
This commit is contained in:
parent
82af06a42a
commit
c14149b4eb
|
@ -1 +1 @@
|
||||||
13c70f0751d96600723acdde3200745e93395717
|
fc3e49f0c47e850625e09a021f31291b845a6728
|
||||||
|
|
|
@ -3,10 +3,16 @@ VERSION := git
|
||||||
DOWNLOADS := muen.git
|
DOWNLOADS := muen.git
|
||||||
|
|
||||||
URL(muen) := https://git.codelabs.ch/git/muen.git
|
URL(muen) := https://git.codelabs.ch/git/muen.git
|
||||||
REV(muen) := 5d3b56c261804f318fb5c91a93799315c740f1a2
|
REV(muen) := 4ffd2c94b1b7de268c0a428855be2e7e8b8f288e
|
||||||
DIR(muen) := src/kernel/muen
|
DIR(muen) := src/kernel/muen
|
||||||
|
|
||||||
$(call check_tool,git)
|
$(call check_tool,git)
|
||||||
$(call check_tool,iasl)
|
$(call check_tool,iasl)
|
||||||
$(call check_tool,tidy)
|
$(call check_tool,tidy)
|
||||||
$(call check_tool,xsltproc)
|
$(call check_tool,xsltproc)
|
||||||
|
|
||||||
|
default : additional_steps
|
||||||
|
additional_steps : $(DOWNLOADS)
|
||||||
|
$(VERBOSE)git -C src/kernel/muen submodule update --init tools/mugenschedcfg > /dev/null
|
||||||
|
$(VERBOSE)git -C src/kernel/muen submodule update --init components/libxhcidbg > /dev/null
|
||||||
|
$(VERBOSE)$(MAKE) -C src/kernel/muen/contrib QUIET=true download
|
||||||
|
|
|
@ -28,16 +28,9 @@ $(TARGET): $(MUEN_DST_DIR)
|
||||||
$(VERBOSE)$(BUILD_ENV) $(MAKE) -C $(MUEN_DST_DIR)/kernel $(BUILD_OPTS) >> $(MUEN_LOG) 2>&1
|
$(VERBOSE)$(BUILD_ENV) $(MAKE) -C $(MUEN_DST_DIR)/kernel $(BUILD_OPTS) >> $(MUEN_LOG) 2>&1
|
||||||
$(VERBOSE)$(BUILD_ENV) $(MAKE) -C $(MUEN_DST_DIR)/components $(BUILD_OPTS) install-tau0 >> $(MUEN_LOG) 2>&1
|
$(VERBOSE)$(BUILD_ENV) $(MAKE) -C $(MUEN_DST_DIR)/components $(BUILD_OPTS) install-tau0 >> $(MUEN_LOG) 2>&1
|
||||||
|
|
||||||
$(MUEN_DST_DIR): download_contrib
|
$(MUEN_DST_DIR): $(MUEN_SRC_DIR)
|
||||||
$(VERBOSE)mkdir -p $(MUEN_DST_DIR)
|
$(VERBOSE)mkdir -p $(MUEN_DST_DIR)
|
||||||
$(VERBOSE)tar c -C $(MUEN_SRC_DIR) . | tar x -C $(MUEN_DST_DIR)
|
$(VERBOSE)tar c -C $(MUEN_SRC_DIR) . | tar x -m -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)cd $(MUEN_SRC_DIR) && git submodule update --init components/libxhcidbg > $(MUEN_LOG) 2>&1
|
|
||||||
$(VERBOSE)$(BUILD_ENV) $(MAKE) -C $(MUEN_SRC_DIR)/contrib \
|
|
||||||
QUIET=true download >> $(MUEN_LOG) 2>&1
|
|
||||||
|
|
||||||
clean cleanall: clean_muen
|
clean cleanall: clean_muen
|
||||||
|
|
||||||
|
|
|
@ -74,6 +74,6 @@ struct Subject_state
|
||||||
Segment ldtr;
|
Segment ldtr;
|
||||||
Segment gdtr;
|
Segment gdtr;
|
||||||
Segment idtr;
|
Segment idtr;
|
||||||
};
|
} __attribute__((packed));
|
||||||
|
|
||||||
#endif /* _VIRTUALBOX__SPEC__MUEN__VCPU_H_ */
|
#endif /* _VIRTUALBOX__SPEC__MUEN__VCPU_H_ */
|
||||||
|
|
Loading…
Reference in New Issue