Use defconfig when building for unikernel

Replace error-prone copying of configuration file with the use of a defconfig file. Add `defconfigs/qemu-x86_64` and use `make defconfig` option in `Makefile.unikernel`. Signed-off-by: Razvan Deaconescu <razvand@unikraft.io>
trholding · Sep 27, 2023 · 92f7631 · 92f7631
1 parent 733a625
commit 92f7631
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 343 deletions.
diff --git a/L2E_amd64_qemu.config b/L2E_amd64_qemu.config
diff --git a/Makefile.unikernel b/Makefile.unikernel
@@ -6,7 +6,7 @@ MOD_PATH    = out/model.bin
 TOK_PATH    = tokenizer.bin
 
 all:
-	cp L2E_amd64_qemu.config .config
+	UK_DEFCONFIG=$(shell pwd)/defconfigs/qemu-x86_64 make -f Makefile.unikernel defconfig
 	gcc -Ofast strliteral.c -o strlit
 	./strlit -i emb_Model_data $(MOD_PATH) model.h
 	./strlit -i emb_Tokenizer_data $(TOK_PATH) tokenizer.h

diff --git a/defconfigs/qemu-x86_64 b/defconfigs/qemu-x86_64
@@ -0,0 +1,8 @@
+CONFIG_UK_DEFNAME="L2E"
+CONFIG_PLAT_KVM=y
+CONFIG_LIBUKBOOT_BANNER_NONE=y
+CONFIG_LIBUKBUS=y
+# CONFIG_LIBUKDEBUG_ENABLE_ASSERT is not set
+CONFIG_LIBUKSGLIST=y
+CONFIG_OPTIMIZE_DEADELIM=y
+CONFIG_OPTIMIZE_LTO=y