OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Makefile: add missing deps in top-level and hypervisor Makefile 

Add a couple of missing dependencies in the ACRN Makefiles:
1. 'acrn.bin' is required before the hypervisor can be installed
2. The 'acrn_mngr.h' needs to be installed ('tools-install') in
the build folder.

Tracked-On: #6360
Signed-off-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com>
This commit is contained in:
Geoffroy Van Cutsem 2021-08-05 16:23:49 +02:00 committed by wenlingz
parent 2bfaa34cf2
commit 01bf5110c5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -142,7 +142,7 @@ clean:
.PHONY: install life_mngr-install
install: hypervisor-install devicemodel-install tools-install
hypervisor-install:
hypervisor-install: hypervisor
$(MAKE) $(HV_MAKEOPTS) install
hypervisor-install-debug:
@ -172,10 +172,10 @@ apl-up2-hybrid-install-debug:
sbl-hypervisor-install-debug: kbl-nuc-i7-industry-install-debug \
apl-up2-hybrid-install-debug
devicemodel-install:
devicemodel-install: tools-install devicemodel
$(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) install
tools-install:
tools-install: tools
$(MAKE) -C $(T)/misc OUT_DIR=$(TOOLS_OUT) RELEASE=$(RELEASE) install
life_mngr-install:

2
hypervisor/Makefile
View File

@ -387,7 +387,7 @@ PRE_BUILD_DIR := ../misc/hv_prebuild
.PHONY: all
all: pre_build $(HV_OBJDIR)/$(HV_FILE).32.out $(HV_OBJDIR)/$(HV_FILE).bin
install: $(HV_OBJDIR)/$(HV_FILE).32.out
install: $(HV_OBJDIR)/$(HV_FILE).32.out $(HV_OBJDIR)/$(HV_FILE).bin
install -D $(HV_OBJDIR)/$(HV_FILE).32.out $(DESTDIR)$(libdir)/acrn/$(HV_FILE).$(BOARD).$(SCENARIO).32.out
install -D $(HV_OBJDIR)/$(HV_FILE).bin $(DESTDIR)$(libdir)/acrn/$(HV_FILE).$(BOARD).$(SCENARIO).bin
@if [ -e "$(HV_OBJDIR)/acpi" ];then \