From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B323E366 for ; Fri, 8 Mar 2024 00:04:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709856243; cv=none; b=XtQ4S+KmaWQO7IvyGLe1bq/rk6JtOrRcA2EOebJjnJnUQpGiNoU0xxPNAMuWhc1xCzVLK+KeWs/xBCZtWAch152fU050uSy7vM4gBgMuJ6AolmjS6CPtljw2WVaiONt40BarXIGeNRYBtdn3sSg3+BetSYJ5hOjeCzOHphDYbUM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709856243; c=relaxed/simple; bh=1YitX/da77+lTmzt2Ru734GhboXJ/o/B8jspCCaf0+Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gAVhMTMf6WJiMjtsGXenjWy/Bh3QvmAHZnCHjbthqiNRzRdor4OmCViPOo6Lp8vrFb1TTPp6e8+I8TXwkRNIbU59rDTPGSOl60A1iBokmKHU9+XGIIDiC+sECgxeqNMn/1CJPXCMBi1IF8r751vbfT+ai2SKe83TBFYljyzRDTc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=vJXQxGP7; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="vJXQxGP7" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=v+yZdxInivmZzyKVg0afmNuQV2hASoVSvcpddN1r9dg=; b=vJXQxGP7+X0GEdhRPKiZXyJ51t /464kyZ5U/brfogqKCBq1lRPYyuPEs4oGMdcOb6+BkIjOk+0RuEc62MingeRhaVtHpH+4C6+5oA6I v4H6lz3CcPoUEf43TObTIxiuhUWVOF9nBvb1o178SQgng9+XZ/JA+E6ih3D7KbdlLaE6M9rSRdXrr HJwdREppL16AESXsWRjgq7tHMK7hnRsw4IH8l+E76TYnrJQsK2yA+gei2tgoa5Ih0UHgHedh/no9T tmP/5pB3iMOKZaoll4C1E+Onku0vuEVK88w8uWb9uGQ+bONw/ImJQXXBUmj7IRqq3jP1FnnSRPxfl cSws/sJQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1riNiT-00000006uQT-0rlc; Fri, 08 Mar 2024 00:04:01 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev Cc: Luis Chamberlain Subject: [PATCH 4/8] guestfs: move options to its own file Date: Thu, 7 Mar 2024 16:03:55 -0800 Message-ID: <20240308000400.1646823-5-mcgrof@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240308000400.1646823-1-mcgrof@kernel.org> References: <20240308000400.1646823-1-mcgrof@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Luis Chamberlain Move guestfs config options to its own file. This makes it easier to find guestfs options. Signed-off-by: Luis Chamberlain --- kconfigs/Kconfig.bringup | 52 +--------------------------------------- kconfigs/Kconfig.guestfs | 50 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 51 deletions(-) create mode 100644 kconfigs/Kconfig.guestfs diff --git a/kconfigs/Kconfig.bringup b/kconfigs/Kconfig.bringup index de4128ae..2d913ea6 100644 --- a/kconfigs/Kconfig.bringup +++ b/kconfigs/Kconfig.bringup @@ -64,62 +64,12 @@ config SKIP_BRINGUP endchoice -if GUESTFS - -choice - prompt "Guestfs Linux distribution to use" - default GUESTFS_FEDORA - -config GUESTFS_FEDORA - bool "Fedora (or derived distro)" - select HAVE_DISTRO_XFS_PREFERS_MANUAL if FSTESTS_XFS - select HAVE_DISTRO_BTRFS_PREFERS_MANUAL if FSTESTS_BTRFS - select HAVE_DISTRO_EXT4_PREFERS_MANUAL if FSTESTS_EXT4 - select HAVE_DISTRO_PREFERS_FSTESTS_WATCHDOG if KDEVOPS_WORKFLOW_ENABLE_FSTESTS - select HAVE_DISTRO_PREFERS_FSTESTS_WATCHDOG_KILL if KDEVOPS_WORKFLOW_ENABLE_FSTESTS - help - This option will set the target guest to be a distro in the Fedora family. - For example, Fedora, RHEL, etc. - -config GUESTFS_DEBIAN - bool "Debian" - select HAVE_CUSTOM_DISTRO_HOST_PREFIX - select HAVE_DISTRO_XFS_PREFERS_MANUAL if FSTESTS_XFS - select HAVE_DISTRO_BTRFS_PREFERS_MANUAL if FSTESTS_BTRFS - select HAVE_DISTRO_EXT4_PREFERS_MANUAL if FSTESTS_EXT4 - select HAVE_DISTRO_PREFERS_CUSTOM_HOST_PREFIX - select HAVE_DISTRO_PREFERS_FSTESTS_WATCHDOG if KDEVOPS_WORKFLOW_ENABLE_FSTESTS - select HAVE_DISTRO_PREFERS_FSTESTS_WATCHDOG_KILL if KDEVOPS_WORKFLOW_ENABLE_FSTESTS - help - This option will set the target guest to Debian. - -endchoice - -config VIRT_BUILDER_OS_VERSION - string "virt-builder os-version" - default "fedora-39" if GUESTFS_FEDORA - default "debian-12" if GUESTFS_DEBIAN - help - Have virt-builder use this os-version string to - build a root image for the guest. Run "virt-builder -l" - to get a list of operating systems and versions supported - by guestfs. - -if GUESTFS_DEBIAN - -config GUESTFS_DEBIAN_BOX_SHORT - string - default "debian12" if GUESTFS_DEBIAN - -endif - -endif # GUESTFS - config LIBVIRT bool depends on VAGRANT_LIBVIRT_SELECT || GUESTFS default y +source "kconfigs/Kconfig.guestfs" source "vagrant/Kconfig" source "terraform/Kconfig" if LIBVIRT diff --git a/kconfigs/Kconfig.guestfs b/kconfigs/Kconfig.guestfs new file mode 100644 index 00000000..58c0c69a --- /dev/null +++ b/kconfigs/Kconfig.guestfs @@ -0,0 +1,50 @@ +if GUESTFS + +choice + prompt "Guestfs Linux distribution to use" + default GUESTFS_FEDORA + +config GUESTFS_FEDORA + bool "Fedora (or derived distro)" + select HAVE_DISTRO_XFS_PREFERS_MANUAL if FSTESTS_XFS + select HAVE_DISTRO_BTRFS_PREFERS_MANUAL if FSTESTS_BTRFS + select HAVE_DISTRO_EXT4_PREFERS_MANUAL if FSTESTS_EXT4 + select HAVE_DISTRO_PREFERS_FSTESTS_WATCHDOG if KDEVOPS_WORKFLOW_ENABLE_FSTESTS + select HAVE_DISTRO_PREFERS_FSTESTS_WATCHDOG_KILL if KDEVOPS_WORKFLOW_ENABLE_FSTESTS + help + This option will set the target guest to be a distro in the Fedora family. + For example, Fedora, RHEL, etc. + +config GUESTFS_DEBIAN + bool "Debian" + select HAVE_CUSTOM_DISTRO_HOST_PREFIX + select HAVE_DISTRO_XFS_PREFERS_MANUAL if FSTESTS_XFS + select HAVE_DISTRO_BTRFS_PREFERS_MANUAL if FSTESTS_BTRFS + select HAVE_DISTRO_EXT4_PREFERS_MANUAL if FSTESTS_EXT4 + select HAVE_DISTRO_PREFERS_CUSTOM_HOST_PREFIX + select HAVE_DISTRO_PREFERS_FSTESTS_WATCHDOG if KDEVOPS_WORKFLOW_ENABLE_FSTESTS + select HAVE_DISTRO_PREFERS_FSTESTS_WATCHDOG_KILL if KDEVOPS_WORKFLOW_ENABLE_FSTESTS + help + This option will set the target guest to Debian. + +endchoice + +config VIRT_BUILDER_OS_VERSION + string "virt-builder os-version" + default "fedora-39" if GUESTFS_FEDORA + default "debian-12" if GUESTFS_DEBIAN + help + Have virt-builder use this os-version string to + build a root image for the guest. Run "virt-builder -l" + to get a list of operating systems and versions supported + by guestfs. + +if GUESTFS_DEBIAN + +config GUESTFS_DEBIAN_BOX_SHORT + string + default "debian12" if GUESTFS_DEBIAN + +endif + +endif # GUESTFS -- 2.43.0