Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

Commit 7a6cd2a

Browse files
c3dfidencio
c3d
authored and
fidencio
committed
makefile: Add missing generated vars to USER_VARS
This was discovered while checking a massive change in variables. The root cause for the error is a very long list of manual replacements, that is best replaced with a $(foreach). All individual variables in the output configuration files were checked against the old build using diff. Fixes: #2943 Fixes: #3004 Signed-off-by: Christophe de Dinechin <[email protected]>
1 parent 622c288 commit 7a6cd2a

File tree

1 file changed

+33
-93
lines changed

1 file changed

+33
-93
lines changed

‎Makefile‎

Lines changed: 33 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ DEFAULTSDIR := $(SHAREDIR)/defaults
9494
COLLECT_SCRIPT = data/kata-collect-data.sh
9595
COLLECT_SCRIPT_SRC = $(COLLECT_SCRIPT).in
9696

97+
# @RUNTIME_NAME@ should be replaced with the target in generated files
98+
RUNTIME_NAME = $(TARGET)
99+
97100
GENERATED_FILES += $(COLLECT_SCRIPT)
98101
SCRIPTS += $(COLLECT_SCRIPT)
99102
SCRIPTS_DIR := $(BINDIR)
@@ -394,17 +397,24 @@ SHAREDIR := $(SHAREDIR)
394397
# list of variables the user may wish to override
395398
USER_VARS += ARCH
396399
USER_VARS += BINDIR
400+
USER_VARS += CONFIG_ACRN_IN
401+
USER_VARS += CONFIG_CLH_IN
402+
USER_VARS += CONFIG_FC_IN
397403
USER_VARS += CONFIG_PATH
404+
USER_VARS += CONFIG_QEMU_IN
405+
USER_VARS += CONFIG_QEMU_VIRTIOFS_IN
398406
USER_VARS += DESTDIR
399407
USER_VARS += DEFAULT_HYPERVISOR
408+
USER_VARS += DEFENABLEMSWAP
400409
USER_VARS += ACRNCMD
401410
USER_VARS += ACRNCTLCMD
402411
USER_VARS += ACRNPATH
403-
USER_VARS += ACRNPATHLIST
412+
USER_VARS += ACRNVALIDHYPERVISORPATHS
404413
USER_VARS += ACRNCTLPATH
405414
USER_VARS += ACRNVALIDCTLPATHS
406415
USER_VARS += CLHPATH
407416
USER_VARS += CLHVALIDHYPERVISORPATHS
417+
USER_VARS += FIRMWAREPATH_CLH
408418
USER_VARS += FCCMD
409419
USER_VARS += FCPATH
410420
USER_VARS += FCVALIDHYPERVISORPATHS
@@ -421,6 +431,11 @@ USER_VARS += KERNELTYPE
421431
USER_VARS += KERNELTYPE_FC
422432
USER_VARS += KERNELTYPE_ACRN
423433
USER_VARS += KERNELTYPE_CLH
434+
USER_VARS += KERNELPATH_ACRN
435+
USER_VARS += KERNELPATH
436+
USER_VARS += KERNELPATH_CLH
437+
USER_VARS += KERNELPATH_FC
438+
USER_VARS += KERNELVIRTIOFSPATH
424439
USER_VARS += FIRMWAREPATH
425440
USER_VARS += MACHINEACCELERATORS
426441
USER_VARS += CPUFEATURES
@@ -433,18 +448,23 @@ USER_VARS += PKGLIBDIR
433448
USER_VARS += PKGLIBEXECDIR
434449
USER_VARS += PKGRUNDIR
435450
USER_VARS += PREFIX
451+
USER_VARS += PROJECT_BUG_URL
436452
USER_VARS += PROJECT_NAME
453+
USER_VARS += PROJECT_ORG
437454
USER_VARS += PROJECT_PREFIX
455+
USER_VARS += PROJECT_TAG
438456
USER_VARS += PROJECT_TYPE
457+
USER_VARS += PROJECT_URL
439458
USER_VARS += PROXYPATH
440459
USER_VARS += NETMONPATH
441460
USER_VARS += QEMUBINDIR
442461
USER_VARS += QEMUCMD
443462
USER_VARS += QEMUPATH
444-
USER_VARS += QEMUVALIDPATHS
463+
USER_VARS += QEMUVALIDHYPERVISORPATHS
445464
USER_VARS += QEMUVIRTIOFSCMD
446465
USER_VARS += QEMUVIRTIOFSPATH
447466
USER_VARS += QEMUVALIDVIRTIOFSPATHS
467+
USER_VARS += RUNTIME_NAME
448468
USER_VARS += SHAREDIR
449469
USER_VARS += SHIMPATH
450470
USER_VARS += SYSCONFDIR
@@ -455,6 +475,7 @@ USER_VARS += DEFMEMSZ
455475
USER_VARS += DEFMEMSLOTS
456476
USER_VARS += DEFBRIDGES
457477
USER_VARS += DEFNETWORKMODEL_ACRN
478+
USER_VARS += DEFNETWORKMODEL_CLH
458479
USER_VARS += DEFNETWORKMODEL_FC
459480
USER_VARS += DEFNETWORKMODEL_QEMU
460481
USER_VARS += DEFDISABLEGUESTSECCOMP
@@ -471,6 +492,7 @@ USER_VARS += DEFVALIDVIRTIOFSDAEMONPATHS
471492
USER_VARS += DEFVIRTIOFSCACHESIZE
472493
USER_VARS += DEFVIRTIOFSCACHE
473494
USER_VARS += DEFVIRTIOFSEXTRAARGS
495+
USER_VARS += DEFENABLEANNOTATIONS
474496
USER_VARS += DEFENABLEIOTHREADS
475497
USER_VARS += DEFENABLEMEMPREALLOC
476498
USER_VARS += DEFENABLEHUGEPAGES
@@ -612,101 +634,19 @@ $(TARGET).coverage: $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST)
612634
$(QUIET_TEST)go test -o $@ -covermode count
613635

614636
GENERATED_FILES += $(CONFIGS)
637+
GENERATED_VARS = \
638+
VERSION \
639+
CONFIG_ACRN_IN \
640+
CONFIG_QEMU_IN \
641+
CONFIG_QEMU_VIRTIOFS_IN \
642+
CONFIG_CLH_IN \
643+
CONFIG_FC_IN \
644+
$(USER_VARS)
615645

616646
$(GENERATED_FILES): %: %.in $(MAKEFILE_LIST) VERSION .git-commit
617647
$(QUIET_GENERATE)$(SED) \
618648
-e "s|@COMMIT@|$(shell cat .git-commit)|g" \
619-
-e "s|@VERSION@|$(VERSION)|g" \
620-
-e "s|@CONFIG_ACRN_IN@|$(CONFIG_ACRN_IN)|g" \
621-
-e "s|@CONFIG_QEMU_IN@|$(CONFIG_QEMU_IN)|g" \
622-
-e "s|@CONFIG_QEMU_VIRTIOFS_IN@|$(CONFIG_QEMU_VIRTIOFS_IN)|g" \
623-
-e "s|@CONFIG_CLH_IN@|$(CONFIG_CLH_IN)|g" \
624-
-e "s|@CONFIG_FC_IN@|$(CONFIG_FC_IN)|g" \
625-
-e "s|@CONFIG_PATH@|$(CONFIG_PATH)|g" \
626-
-e "s|@FCPATH@|$(FCPATH)|g" \
627-
-e "s|@FCVALIDHYPERVISORPATHS@|$(FCVALIDHYPERVISORPATHS)|g" \
628-
-e "s|@FCJAILERPATH@|$(FCJAILERPATH)|g" \
629-
-e "s|@FCVALIDJAILERPATHS@|$(FCVALIDJAILERPATHS)|g" \
630-
-e "s|@ACRNPATH@|$(ACRNPATH)|g" \
631-
-e "s|@ACRNVALIDHYPERVISORPATHS@|$(ACRNVALIDHYPERVISORPATHS)|g" \
632-
-e "s|@ACRNCTLPATH@|$(ACRNCTLPATH)|g" \
633-
-e "s|@ACRNVALIDCTLPATHS@|$(ACRNVALIDCTLPATHS)|g" \
634-
-e "s|@CLHPATH@|$(CLHPATH)|g" \
635-
-e "s|@CLHVALIDHYPERVISORPATHS@|$(CLHVALIDHYPERVISORPATHS)|g" \
636-
-e "s|@SYSCONFIG@|$(SYSCONFIG)|g" \
637-
-e "s|@IMAGEPATH@|$(IMAGEPATH)|g" \
638-
-e "s|@KERNELPATH_ACRN@|$(KERNELPATH_ACRN)|g" \
639-
-e "s|@KERNELPATH_FC@|$(KERNELPATH_FC)|g" \
640-
-e "s|@KERNELPATH_CLH@|$(KERNELPATH_CLH)|g" \
641-
-e "s|@KERNELPATH@|$(KERNELPATH)|g" \
642-
-e "s|@KERNELVIRTIOFSPATH@|$(KERNELVIRTIOFSPATH)|g" \
643-
-e "s|@INITRDPATH@|$(INITRDPATH)|g" \
644-
-e "s|@FIRMWAREPATH@|$(FIRMWAREPATH)|g" \
645-
-e "s|@MACHINEACCELERATORS@|$(MACHINEACCELERATORS)|g" \
646-
-e "s|@CPUFEATURES@|$(CPUFEATURES)|g" \
647-
-e "s|@FIRMWAREPATH_CLH@|$(FIRMWAREPATH_CLH)|g" \
648-
-e "s|@DEFMACHINETYPE_CLH@|$(DEFMACHINETYPE_CLH)|g" \
649-
-e "s|@KERNELPARAMS@|$(KERNELPARAMS)|g" \
650-
-e "s|@LOCALSTATEDIR@|$(LOCALSTATEDIR)|g" \
651-
-e "s|@PKGLIBEXECDIR@|$(PKGLIBEXECDIR)|g" \
652-
-e "s|@PKGRUNDIR@|$(PKGRUNDIR)|g" \
653-
-e "s|@PROXYPATH@|$(PROXYPATH)|g" \
654-
-e "s|@NETMONPATH@|$(NETMONPATH)|g" \
655-
-e "s|@PROJECT_BUG_URL@|$(PROJECT_BUG_URL)|g" \
656-
-e "s|@PROJECT_ORG@|$(PROJECT_ORG)|g" \
657-
-e "s|@PROJECT_URL@|$(PROJECT_URL)|g" \
658-
-e "s|@PROJECT_NAME@|$(PROJECT_NAME)|g" \
659-
-e "s|@PROJECT_TAG@|$(PROJECT_TAG)|g" \
660-
-e "s|@PROJECT_TYPE@|$(PROJECT_TYPE)|g" \
661-
-e "s|@QEMUPATH@|$(QEMUPATH)|g" \
662-
-e "s|@QEMUVALIDHYPERVISORPATHS@|$(QEMUVALIDHYPERVISORPATHS)|g" \
663-
-e "s|@QEMUVIRTIOFSPATH@|$(QEMUVIRTIOFSPATH)|g" \
664-
-e "s|@QEMUVALIDVIRTIOFSPATHS@|$(QEMUVALIDVIRTIOFSPATHS)|g" \
665-
-e "s|@RUNTIME_NAME@|$(TARGET)|g" \
666-
-e "s|@MACHINETYPE@|$(MACHINETYPE)|g" \
667-
-e "s|@SHIMPATH@|$(SHIMPATH)|g" \
668-
-e "s|@DEFVCPUS@|$(DEFVCPUS)|g" \
669-
-e "s|@DEFMAXVCPUS@|$(DEFMAXVCPUS)|g" \
670-
-e "s|@DEFMAXVCPUS_ACRN@|$(DEFMAXVCPUS_ACRN)|g" \
671-
-e "s|@DEFMEMSZ@|$(DEFMEMSZ)|g" \
672-
-e "s|@DEFMEMSLOTS@|$(DEFMEMSLOTS)|g" \
673-
-e "s|@DEFBRIDGES@|$(DEFBRIDGES)|g" \
674-
-e "s|@DEFNETWORKMODEL_ACRN@|$(DEFNETWORKMODEL_ACRN)|g" \
675-
-e "s|@DEFNETWORKMODEL_CLH@|$(DEFNETWORKMODEL_CLH)|g" \
676-
-e "s|@DEFNETWORKMODEL_FC@|$(DEFNETWORKMODEL_FC)|g" \
677-
-e "s|@DEFNETWORKMODEL_QEMU@|$(DEFNETWORKMODEL_QEMU)|g" \
678-
-e "s|@DEFENABLEANNOTATIONS@|$(DEFENABLEANNOTATIONS)|g" \
679-
-e "s|@DEFDISABLEGUESTSECCOMP@|$(DEFDISABLEGUESTSECCOMP)|g" \
680-
-e "s|@DEFAULTEXPFEATURES@|$(DEFAULTEXPFEATURES)|g" \
681-
-e "s|@DEFDISABLEBLOCK@|$(DEFDISABLEBLOCK)|g" \
682-
-e "s|@DEFBLOCKSTORAGEDRIVER_ACRN@|$(DEFBLOCKSTORAGEDRIVER_ACRN)|g" \
683-
-e "s|@DEFBLOCKSTORAGEDRIVER_FC@|$(DEFBLOCKSTORAGEDRIVER_FC)|g" \
684-
-e "s|@DEFBLOCKSTORAGEDRIVER_QEMU@|$(DEFBLOCKSTORAGEDRIVER_QEMU)|g" \
685-
-e "s|@DEFBLOCKSTORAGEDRIVER_QEMU_VIRTIOFS@|$(DEFBLOCKSTORAGEDRIVER_QEMU_VIRTIOFS)|g" \
686-
-e "s|@DEFSHAREDFS@|$(DEFSHAREDFS)|g" \
687-
-e "s|@DEFSHAREDFS_QEMU_VIRTIOFS@|$(DEFSHAREDFS_QEMU_VIRTIOFS)|g" \
688-
-e "s|@DEFVIRTIOFSDAEMON@|$(DEFVIRTIOFSDAEMON)|g" \
689-
-e "s|@DEFVALIDVIRTIOFSDAEMONPATHS@|$(DEFVALIDVIRTIOFSDAEMONPATHS)|g" \
690-
-e "s|@DEFVIRTIOFSCACHESIZE@|$(DEFVIRTIOFSCACHESIZE)|g" \
691-
-e "s|@DEFVIRTIOFSCACHE@|$(DEFVIRTIOFSCACHE)|g" \
692-
-e "s|@DEFVIRTIOFSEXTRAARGS@|$(DEFVIRTIOFSEXTRAARGS)|g" \
693-
-e "s|@DEFENABLEIOTHREADS@|$(DEFENABLEIOTHREADS)|g" \
694-
-e "s|@DEFENABLEMEMPREALLOC@|$(DEFENABLEMEMPREALLOC)|g" \
695-
-e "s|@DEFENABLEHUGEPAGES@|$(DEFENABLEHUGEPAGES)|g" \
696-
-e "s|@DEFENABLEVHOSTUSERSTORE@|$(DEFENABLEVHOSTUSERSTORE)|g" \
697-
-e "s|@DEFVHOSTUSERSTOREPATH@|$(DEFVHOSTUSERSTOREPATH)|g" \
698-
-e "s|@DEFVALIDVHOSTUSERSTOREPATHS@|$(DEFVALIDVHOSTUSERSTOREPATHS)|g" \
699-
-e "s|@DEFFILEMEMBACKEND@|$(DEFFILEMEMBACKEND)|g" \
700-
-e "s|@DEFVALIDFILEMEMBACKENDS@|$(DEFVALIDFILEMEMBACKENDS)|g" \
701-
-e "s|@DEFENABLEMSWAP@|$(DEFENABLESWAP)|g" \
702-
-e "s|@DEFENABLEDEBUG@|$(DEFENABLEDEBUG)|g" \
703-
-e "s|@DEFDISABLENESTINGCHECKS@|$(DEFDISABLENESTINGCHECKS)|g" \
704-
-e "s|@DEFMSIZE9P@|$(DEFMSIZE9P)|g" \
705-
-e "s|@DEFHOTPLUGVFIOONROOTBUS@|$(DEFHOTPLUGVFIOONROOTBUS)|g" \
706-
-e "s|@DEFPCIEROOTPORT@|$(DEFPCIEROOTPORT)|g" \
707-
-e "s|@DEFENTROPYSOURCE@|$(DEFENTROPYSOURCE)|g" \
708-
-e "s|@DEFSANDBOXCGROUPONLY@|$(DEFSANDBOXCGROUPONLY)|g" \
709-
-e "s|@FEATURE_SELINUX@|$(FEATURE_SELINUX)|g" \
649+
$(foreach v,$(GENERATED_VARS),-e "s|@$v@|$($v)|g") \
710650
$< > $@
711651

712652
generate-config: $(CONFIGS)

0 commit comments

Comments
 (0)