From 80cbccf4bd8287d4144c5bd0243ee6825d02e94d Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Thu, 14 Dec 2023 21:50:33 +0200 Subject: [PATCH] feat(library): Update base configuration Update `Kraftfile` configuration for `base` to use `staging` branches for all repositories (`unikraft`, `app-elfloader`, `lwip`, `libelf`). Signed-off-by: Razvan Deaconescu --- library/base/Kraftfile | 60 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 11 deletions(-) diff --git a/library/base/Kraftfile b/library/base/Kraftfile index 045494c5..d52e1028 100644 --- a/library/base/Kraftfile +++ b/library/base/Kraftfile @@ -2,26 +2,34 @@ spec: v0.6 template: source: https://github.com/unikraft/app-elfloader.git - version: stable + version: staging unikraft: source: https://github.com/unikraft/unikraft.git version: staging kconfig: + # Configurations options for app-elfloader + # (they can't be part of the template atm) CONFIG_APPELFLOADER_ARCH_PRCTL: 'y' CONFIG_APPELFLOADER_BRK: 'y' CONFIG_APPELFLOADER_CUSTOMAPPNAME: 'y' CONFIG_APPELFLOADER_STACK_NBPAGES: 128 CONFIG_APPELFLOADER_VFSEXEC_EXECBIT: 'n' CONFIG_APPELFLOADER_VFSEXEC: 'y' + CONFIG_APPELFLOADER_HFS: 'y' + CONFIG_APPELFLOADER_HFS_ETCRESOLVCONF: 'y' + CONFIG_APPELFLOADER_HFS_ETCHOSTS: 'y' + CONFIG_APPELFLOADER_HFS_ETCHOSTNAME: 'y' + CONFIG_APPELFLOADER_HFS_REPLACEEXIST: 'y' + # Unikraft options CONFIG_HAVE_PAGING_DIRECTMAP: 'y' CONFIG_HAVE_PAGING: 'y' + CONFIG_I8042: 'y' CONFIG_LIBDEVFS_AUTOMOUNT: 'y' CONFIG_LIBDEVFS_DEV_NULL: 'y' CONFIG_LIBDEVFS_DEV_STDOUT: 'y' CONFIG_LIBDEVFS_DEV_ZERO: 'y' CONFIG_LIBDEVFS: 'y' - CONFIG_LIBISRLIB: 'y' CONFIG_LIBPOSIX_ENVIRON_ENVP0: "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" CONFIG_LIBPOSIX_ENVIRON_ENVP1: "LD_LIBRARY_PATH=/usr/local/lib:/usr/lib:/lib" CONFIG_LIBPOSIX_ENVIRON_ENVP2: "HOME=/" @@ -55,10 +63,21 @@ unikraft: CONFIG_LIBUKBLKDEV: 'y' CONFIG_LIBUKBOOT_BANNER_MINIMAL: 'y' CONFIG_LIBUKBOOT_HEAP_BASE: '0x400000000' + CONFIG_LIBUKBOOT_MAINTHREAD: 'y' + CONFIG_LIBUKBOOT_SHUTDOWNREQ_HANDLER: 'y' CONFIG_LIBUKCPIO: 'y' + CONFIG_LIBUKDEBUG_CRASH_SCREEN: 'y' + CONFIG_LIBUKDEBUG_ENABLE_ASSERT: 'y' + CONFIG_LIBUKDEBUG_PRINT_SRCNAME: 'n' + CONFIG_LIBUKDEBUG_PRINT_TIME: 'y' + CONFIG_LIBUKDEBUG_PRINTK_ERR: 'y' + CONFIG_LIBUKDEBUG_PRINTK: 'y' + CONFIG_LIBUKDEBUG: 'y' CONFIG_LIBUKFALLOC: 'y' CONFIG_LIBUKMPI: 'n' CONFIG_LIBUKSIGNAL: 'y' + CONFIG_LIBUKSWRAND_DEVFS: 'y' + CONFIG_LIBUKSWRAND: 'y' CONFIG_LIBUKVMEM_DEFAULT_BASE: '0x0000001000000000' CONFIG_LIBUKVMEM_DEMAND_PAGE_IN_SIZE: 12 CONFIG_LIBUKVMEM_PAGEFAULT_HANDLER_PRIO: 4 @@ -66,6 +85,7 @@ unikraft: CONFIG_LIBVFSCORE_AUTOMOUNT_ROOTFS: 'n' CONFIG_LIBVFSCORE_FSTAB: 'y' CONFIG_LIBVFSCORE_NONLARGEFILE: 'y' + CONFIG_LIBVFSCORE: 'y' CONFIG_OPTIMIZE_DEADELIM: 'y' CONFIG_OPTIMIZE_LTO: 'y' CONFIG_PAGING: 'y' @@ -74,19 +94,37 @@ unikraft: CONFIG_UKPLAT_MEMREGION_MAX_COUNT: 64 # Debug options - CONFIG_KVM_DEBUG_VGA_CONSOLE: 'n' - CONFIG_KVM_KERNEL_VGA_CONSOLE: 'n' - CONFIG_LIBUKDEBUG_CRASH_SCREEN: 'n' - CONFIG_LIBUKDEBUG_ENABLE_ASSERT: 'n' - CONFIG_LIBUKDEBUG_PRINT_TIME: 'n' - - # CONFIG_LIBSYSCALL_SHIM_STRACE: 'y' # CONFIG_LIBUKDEBUG_PRINTD: 'y' # CONFIG_LIBUKDEBUG_PRINTK_INFO: 'y' + # CONFIG_LIBSYSCALL_SHIM_STRACE: 'y' + # CONFIG_LIBSYSCALL_SHIM_DEBUG: 'y' libraries: - lwip: staging - libelf: stable + lwip: + source: https://github.com/unikraft/lib-lwip.git + version: staging + kconfig: + CONFIG_LWIP_LOOPIF: 'y' + CONFIG_LWIP_UKNETDEV: 'y' + CONFIG_LWIP_LOOPBACK: 'y' + CONFIG_LWIP_TCP: 'y' + CONFIG_LWIP_UDP: 'y' + CONFIG_LWIP_RAW: 'y' + CONFIG_LWIP_WND_SCALE: 'y' + CONFIG_LWIP_TCP_KEEPALIVE: 'y' + CONFIG_LWIP_THREADS: 'y' + CONFIG_LWIP_HEAP: 'y' + CONFIG_LWIP_SOCKET: 'y' + CONFIG_LWIP_AUTOIFACE: 'y' + CONFIG_LWIP_IPV4: 'y' + CONFIG_LWIP_DHCP: 'n' + CONFIG_LWIP_DNS: 'n' + CONFIG_LWIP_NUM_TCPCON: 64 + CONFIG_LWIP_NUM_TCPLISTENERS: 64 + CONFIG_LWIP_ICMP: 'y' + libelf: + source: https://github.com/unikraft/lib-libelf.git + version: staging targets: - fc/x86_64