From: Luis Chamberlain <mcgrof@kernel.org>
To: Chuck Lever <cel@kernel.org>, Daniel Gomez <da.gomez@kruces.com>,
kdevops@lists.linux.dev
Cc: Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH v2 02/33] kconfigs: fix Kconfig references after vagrant removal
Date: Sun, 27 Jul 2025 18:14:02 -0700 [thread overview]
Message-ID: <20250728011434.3197091-3-mcgrof@kernel.org> (raw)
In-Reply-To: <20250728011434.3197091-1-mcgrof@kernel.org>
Remove Vagrant references from Kconfig files that were causing build
failures after the vagrant directory was removed:
- Remove vagrant/Kconfig source line from Kconfig.bringup
- Remove VAGRANT_LIBVIRT_SELECT dependency from LIBVIRT config
- Remove PCIe passthrough Vagrant references from Kconfig.libvirt
- Remove VAGRANT-dependent machine type options
- Update help text to remove Vagrant mentions
Generated-by: Claude AI
Suggested-by: Chuck Lever <cel@kernel.org>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
kconfigs/Kconfig.bringup | 11 +++++------
kconfigs/Kconfig.libvirt | 20 --------------------
2 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/kconfigs/Kconfig.bringup b/kconfigs/Kconfig.bringup
index a9aefc56..887d3851 100644
--- a/kconfigs/Kconfig.bringup
+++ b/kconfigs/Kconfig.bringup
@@ -14,8 +14,8 @@ config GUESTFS
select KDEVOPS_ENABLE_GUESTFS
select EXTRA_STORAGE_SUPPORTS_LARGEIO
help
- This option will use libguestfs utilities instead of Vagrant to build
- guest images and spin them up using libvirt with KVM.
+ This option will use libguestfs utilities to build guest images and
+ spin them up using libvirt with KVM.
config TERRAFORM
bool "Terraform for cloud environments"
@@ -24,8 +24,8 @@ config TERRAFORM
select EXTRA_STORAGE_SUPPORTS_2K
select EXTRA_STORAGE_SUPPORTS_4K
help
- This option will enable use of Vagrant. Enable this if you want to
- use terraform to create nodes on a cloud environment such as:
+ Enable this if you want to use terraform to create nodes on a cloud
+ environment such as:
* Azure
* AWS
@@ -55,11 +55,10 @@ endchoice
config LIBVIRT
bool
- depends on VAGRANT_LIBVIRT_SELECT || GUESTFS
+ depends on GUESTFS
default y
source "kconfigs/Kconfig.guestfs"
-source "vagrant/Kconfig"
source "terraform/Kconfig"
if LIBVIRT
source "kconfigs/Kconfig.libvirt"
diff --git a/kconfigs/Kconfig.libvirt b/kconfigs/Kconfig.libvirt
index 1b8f4b95..743a76c6 100644
--- a/kconfigs/Kconfig.libvirt
+++ b/kconfigs/Kconfig.libvirt
@@ -463,32 +463,12 @@ config HAVE_LIBVIRT_PCIE_PASSTHROUGH
bool
default $(shell, scripts/check_pciepassthrough_kconfig.sh passthrough_libvirt.generated)
-if HAVE_LIBVIRT_PCIE_PASSTHROUGH
-source "vagrant/Kconfig.pcie_passthrough_libvirt"
-endif # HAVE_LIBVIRT_PCIE_PASSTHROUGH
choice
prompt "Machine type to use"
default LIBVIRT_MACHINE_TYPE_Q35 if TARGET_ARCH_X86_64
default LIBVIRT_MACHINE_TYPE_VIRT if TARGET_ARCH_ARM64
-config LIBVIRT_MACHINE_TYPE_DEFAULT
- bool "Use the default machine type"
- depends on VAGRANT
- help
- Use whatever default the guest was intended to use. This will either
- be the machine type used at virt-install time or some other default
- by QEMU / libvirt. This is important for backward compatibility with
- older kernels. For example if you enable q35 on an old kernel the old
- kernel may not boot. For details refer to kdevops commit 83952e2e532e
- ("vagrant/kdevops_nodes.yaml.in: remove machine_type)".
-
- It would seem today's default for libvirt is to still use "pc" which
- is the old i440x, so you will not get PCIe support.
-
- We only want to support PCI-E capable guests with libguest so the
- default is not allowed on libguest.
-
config LIBVIRT_MACHINE_TYPE_Q35
bool "q35"
depends on TARGET_ARCH_X86_64
--
2.47.2
next prev parent reply other threads:[~2025-07-28 1:14 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-28 1:14 [PATCH v2 00/33] remove vagrant and bootlinux shape up Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 01/33] vagrant: remove entire vagrant configuration directory Luis Chamberlain
2025-07-28 1:14 ` Luis Chamberlain [this message]
2025-07-28 1:14 ` [PATCH v2 03/33] scripts: remove Vagrant-specific scripts and Makefiles Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 04/33] playbooks: remove Vagrant-specific playbooks and roles Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 05/33] gitignore: remove Vagrant-specific ignore patterns Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 06/33] docs: remove Vagrant-specific documentation files Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 07/33] Remove all remaining Vagrant references from codebase Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 08/33] terraform: Clean up the destroy tasks Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 09/33] Switch to the cloud.terraform.terraform module Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 10/33] terraform: Make use of the new "terraform_output" module Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 11/33] terraform: Move "wait_for_connection" out of the terraform playbook Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 12/33] terraform: Remove "delegate_to: localhost" Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 13/33] terraform: Replace scripts/status_terraform.sh Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 14/33] Kconfig: Convert the 9p option to a choice menu Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 15/33] bootlinux: fix making 9p default if using libvirt Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 16/33] bootlinux: Relocate tasks that select a kernel .config Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 17/33] bootlinux: Simplify tasks that select the kernel .config to build Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 18/33] bootlinux: Select the kernel .config earlier Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 19/33] bootlinux: Move 9p build tasks to a subrole Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 20/33] bootlinux: Move tasks for building on target nodes " Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 21/33] bootlinux: Clean up a grub set-up task Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 22/33] bootlinux: Harden update-grub/install.yml Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 23/33] Add a guest/instance for building the test kernel Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 24/33] bootlinux: Add a new builder choice Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 25/33] workflows: Add a kconfig setting for installing kernels via package Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 26/33] bootlinux: Enclose tasks to find kernel release name in a block: Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 27/33] bootlinux: Pick up kernel release info for pre-built packages Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 28/33] bootlinux: Install pre-built kernels from packages Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 29/33] bootlinux: Add an option to build with clang instead of gcc Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 30/33] Makefile: add make style for style checking Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 31/33] CLAUDE.md: new workflow guide for hosts and nodes Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 32/33] CLAUDE.md: add don't BS rules Luis Chamberlain
2025-07-28 1:14 ` [PATCH v2 33/33] gen_nodes/gen_hosts: avoid usage of fs_config_path on task names Luis Chamberlain
2025-07-29 20:07 ` [PATCH v2 00/33] remove vagrant and bootlinux shape up Luis Chamberlain
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=20250728011434.3197091-3-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=cel@kernel.org \
--cc=da.gomez@kruces.com \
--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