From: Simon Kuenzer Date: Thu, 21 Nov 2024 10:22:22 +0000 (+0100) Subject: lib/vfscore: Support embedded initrd with custom compiled-in fstabs X-Git-Tag: RELEASE-0.18.0~61 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=db1fd28972435f5358afd62df1cdc62c1a575a33;p=unikraft%2Funikraft.git lib/vfscore: Support embedded initrd with custom compiled-in fstabs This commit enables compiling images with embedded initrds with "custom" compiled-in mount tables (fstabs). As soon as one of the activated compiled-in mount table references to the device `"embedded"`, the configuration requires a path for an initrd for embedding at compile time. Prio this change, an initrd could only be embedded via using pre-configured (and non-"custom") table configuration that depends on an embedded initrd, for example: "Embedded InitRD (CPIO)". Signed-off-by: Simon Kuenzer Approved-by: Razvan Deaconescu Reviewed-by: Razvan Deaconescu GitHub-Closes: #1540 --- diff --git a/lib/vfscore/Config.uk b/lib/vfscore/Config.uk index a206267b2..b721f7e63 100644 --- a/lib/vfscore/Config.uk +++ b/lib/vfscore/Config.uk @@ -776,7 +776,16 @@ default y if LIBVFSCORE_AUTOMOUNT_CI || LIBVFSCORE_AUTOMOUNT_UP config LIBVFSCORE_AUTOMOUNT_EINITRD bool default y if LIBVFSCORE_AUTOMOUNT_CI && LIBVFSCORE_AUTOMOUNT_CI_EINITRD -default y if LIBVFSCORE_AUTOMOUNT_UP && LIBVFSCORE_AUTOMOUNT_FB && (LIBVFSCORE_AUTOMOUNT_FB_EINITRD || LIBVFSCORE_AUTOMOUNT_FB_EINITRD_EXTRACT) +default y if LIBVFSCORE_AUTOMOUNT_CI && LIBVFSCORE_AUTOMOUNT_CI_CUSTOM && LIBVFSCORE_AUTOMOUNT_CI0 && (LIBVFSCORE_AUTOMOUNT_CI0_DEV = "embedded") +default y if LIBVFSCORE_AUTOMOUNT_CI && LIBVFSCORE_AUTOMOUNT_CI_CUSTOM && LIBVFSCORE_AUTOMOUNT_CI1 && (LIBVFSCORE_AUTOMOUNT_CI1_DEV = "embedded") +default y if LIBVFSCORE_AUTOMOUNT_CI && LIBVFSCORE_AUTOMOUNT_CI_CUSTOM && LIBVFSCORE_AUTOMOUNT_CI2 && (LIBVFSCORE_AUTOMOUNT_CI2_DEV = "embedded") +default y if LIBVFSCORE_AUTOMOUNT_CI && LIBVFSCORE_AUTOMOUNT_CI_CUSTOM && LIBVFSCORE_AUTOMOUNT_CI3 && (LIBVFSCORE_AUTOMOUNT_CI3_DEV = "embedded") +default y if LIBVFSCORE_AUTOMOUNT_UP && LIBVFSCORE_AUTOMOUNT_FB && LIBVFSCORE_AUTOMOUNT_FB_EINITRD +default y if LIBVFSCORE_AUTOMOUNT_UP && LIBVFSCORE_AUTOMOUNT_FB && LIBVFSCORE_AUTOMOUNT_FB_EINITRD_EXTRACT +default y if LIBVFSCORE_AUTOMOUNT_UP && LIBVFSCORE_AUTOMOUNT_FB && LIBVFSCORE_AUTOMOUNT_FB_CUSTOM && LIBVFSCORE_AUTOMOUNT_FB0 && (LIBVFSCORE_AUTOMOUNT_FB0_DEV = "embedded") +default y if LIBVFSCORE_AUTOMOUNT_UP && LIBVFSCORE_AUTOMOUNT_FB && LIBVFSCORE_AUTOMOUNT_FB_CUSTOM && LIBVFSCORE_AUTOMOUNT_FB1 && (LIBVFSCORE_AUTOMOUNT_FB1_DEV = "embedded") +default y if LIBVFSCORE_AUTOMOUNT_UP && LIBVFSCORE_AUTOMOUNT_FB && LIBVFSCORE_AUTOMOUNT_FB_CUSTOM && LIBVFSCORE_AUTOMOUNT_FB2 && (LIBVFSCORE_AUTOMOUNT_FB2_DEV = "embedded") +default y if LIBVFSCORE_AUTOMOUNT_UP && LIBVFSCORE_AUTOMOUNT_FB && LIBVFSCORE_AUTOMOUNT_FB_CUSTOM && LIBVFSCORE_AUTOMOUNT_FB3 && (LIBVFSCORE_AUTOMOUNT_FB3_DEV = "embedded") if LIBVFSCORE_AUTOMOUNT_EINITRD config LIBVFSCORE_AUTOMOUNT_EINITRD_PATH