[PATCH 4/8] guestfs: move options to its own file

public inbox for kdevops@lists.linux.dev
 help / color / mirror / Atom feed

From: Luis Chamberlain <mcgrof@kernel.org>
To: kdevops@lists.linux.dev
Cc: Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH 4/8] guestfs: move options to its own file
Date: Thu,  7 Mar 2024 16:03:55 -0800	[thread overview]
Message-ID: <20240308000400.1646823-5-mcgrof@kernel.org> (raw)
In-Reply-To: <20240308000400.1646823-1-mcgrof@kernel.org>

Move guestfs config options to its own file. This makes it
easier to find guestfs options.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
 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

next prev parent reply	other threads:[~2024-03-08  0:04 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-08  0:03 [PATCH 0/8] guestfs: fixes and enhancements Luis Chamberlain
2024-03-08  0:03 ` [PATCH 1/8] guestfs: use macros for drives for aarch64 Luis Chamberlain
2024-03-08  0:03 ` [PATCH 2/8] bringup: disable ZNS and CXL for guestfs Luis Chamberlain
2024-03-08  0:03 ` [PATCH 3/8] libvirt: move zns, largio and cxl to its own files Luis Chamberlain
2024-03-08  0:03 ` Luis Chamberlain [this message]
2024-03-08  0:03 ` [PATCH 5/8] bringup: match default distro to user's distro Luis Chamberlain
2024-03-08  0:03 ` [PATCH 6/8] guestfs: remove explicit tap0 device name Luis Chamberlain
2024-03-08  0:03 ` [PATCH 7/8] destroy_guestfs.sh: remove known ssh key Luis Chamberlain
2024-03-08  0:03 ` [PATCH 8/8] guestfs: verify new line on ssh include directive Luis Chamberlain
2024-03-08  9:55 ` [PATCH 0/8] guestfs: fixes and enhancements Luis Chamberlain
2024-03-08 14:14   ` Chuck Lever III
2024-03-08 14:26     ` Chuck Lever III
2024-03-08 15:44       ` Luis Chamberlain
2024-03-08 15:46         ` Chuck Lever III
2024-03-08 15:56           ` Luis Chamberlain

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:de4128a dfblob:2d913ea dfblob:58c0c69 )
 OR (
bs:"[PATCH 4/8] guestfs: move options to its own file" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240308000400.1646823-5-mcgrof@kernel.org \
    --to=mcgrof@kernel.org \
    --cc=kdevops@lists.linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox