From 55eccbbd6b76514ce0187581fa25d492f866f74e Mon Sep 17 00:00:00 2001 From: Hu Fenglin Date: Tue, 30 Nov 2021 10:22:49 +0800 Subject: [PATCH] deb-pkg: Support specifying board.xml and scenario.xml Currently, if board.xml and scenario.xml are specified, the variable $(BOARD) and $(SCENARIO) are path, but the parameters passed in to generate debian package should be board and scenario name. So add a conversion function to ensure that the function passed to the generated debian package is board and scenario name. Tracked-On: #6688 Signed-off-by: Hu Fenglin --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 271ceb930..1e09956d4 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,9 @@ ASL_COMPILER ?= $(shell which iasl) .PHONY: all hypervisor devicemodel tools life_mngr doc all: hypervisor devicemodel tools @cat $(HV_CFG_LOG) - @python3 misc/packaging/gen_acrn_deb.py acrn_all $(ROOT_OUT) --version=$(FULL_VERSION) --board_name=$(BOARD) --scenario=$(SCENARIO) + @DEB_BOARD=$$(grep "BOARD" $(HV_CFG_LOG) | awk -F '= ' '{print $$2 }'); \ + DEB_SCENARIO=$$(grep "SCENARIO" $(HV_CFG_LOG) | awk -F '= ' '{print $$2 }'); \ + python3 misc/packaging/gen_acrn_deb.py acrn_all $(ROOT_OUT) --version=$(FULL_VERSION) --board_name="$$DEB_BOARD" --scenario="$$DEB_SCENARIO" #help functions to build acrn and install acrn/acrn symbols define build_acrn