From e5d4259ab47d99ee4738dd30f6f06f5945fac198 Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Tue, 20 Oct 2020 09:14:09 +0100 Subject: [PATCH 1/2] runtime: Simplify make variables for clh Simplify definition of the `CLHVALIDHYPERVISORPATHS` build variable to use the already defined `CLHPATH`. Signed-off-by: James O. D. Hunt --- src/runtime/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/runtime/Makefile b/src/runtime/Makefile index 690755f2ae..168efdc718 100644 --- a/src/runtime/Makefile +++ b/src/runtime/Makefile @@ -139,7 +139,7 @@ QEMUVALIDHYPERVISORPATHS := [\"$(QEMUPATH)\"] QEMUVALIDVIRTIOFSPATHS := $(QEMUBINDIR)/$(QEMUVIRTIOFSCMD) CLHPATH := $(CLHBINDIR)/$(CLHCMD) -CLHVALIDHYPERVISORPATHS := [\"$(CLHBINDIR)/$(CLHCMD)\"] +CLHVALIDHYPERVISORPATHS := [\"$(CLHPATH)\"] FCPATH = $(FCBINDIR)/$(FCCMD) FCVALIDPATHS = [\"$(FCPATH)\"] From 2738b18b3840709c14cf4d821480e102a11c6f4e Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Tue, 20 Oct 2020 09:25:31 +0100 Subject: [PATCH 2/2] runtime: Fix firecracker config The build was setting a `FCVALIDPATHS` variable for firecracker, but that was never being used. Conversely, the firecracker configuration template was expecting a `FCVALIDHYPERVISORPATHS`, but that variable was never being set. Resolve by only setting the `FCVALIDHYPERVISORPATHS` variable to ensure the generated firecracker config is valid once again. Fixes: #1001. Signed-off-by: James O. D. Hunt --- src/runtime/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/runtime/Makefile b/src/runtime/Makefile index 168efdc718..b96c126fb3 100644 --- a/src/runtime/Makefile +++ b/src/runtime/Makefile @@ -142,7 +142,7 @@ CLHPATH := $(CLHBINDIR)/$(CLHCMD) CLHVALIDHYPERVISORPATHS := [\"$(CLHPATH)\"] FCPATH = $(FCBINDIR)/$(FCCMD) -FCVALIDPATHS = [\"$(FCPATH)\"] +FCVALIDHYPERVISORPATHS := [\"$(FCPATH)\"] FCJAILERPATH = $(FCBINDIR)/$(FCJAILERCMD) FCVALIDJAILERPATHS = [\"$(FCJAILERPATH)\"]