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 AF01B14D2A7 for ; Wed, 4 Sep 2024 23:30:41 +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=1725492643; cv=none; b=JxyOPccJaTOhHVWrSIeKuoIUDbtRw7kIKNriKr0Ny1o3GMnD8J9EGev12e3Lob1IIO4lp60em0VDH3HG6mCeFyk5SreZ6oaaPbmOPOgKNPSH/GwOy0KSYL0/hEROeInZSGNrIbts36Z7XB3v6h3xHZlNviXzfsPdxWLfaHBF7Yk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725492643; c=relaxed/simple; bh=1m6yYJOGXv40U7w8bptt/1CJQnoS+d5rtaOg3pj0lrw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hHzjWt1Uc7la7htqKB5+6OB00/6iuFoiWrr3TCKjflXl0S+kdif0Phq02vyOyzt6iMGlZrPY+GGW24NR+x6VInE5X/H46MJgLSAAAkxFKrz8x2pW48KVLHEnkD/wQCYpjI7lOxswrfvT5k2xfuip7kDdG4+dLErYfJC/g1XxF7w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine 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=V+yKq5YV; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine 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="V+yKq5YV" 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=7wbQff+M5fqmcJ5Wx494+VzFFKbj/O/GbhBv2Lt7QZI=; b=V+yKq5YVDMuQ8DEGihrUPQMVTh JvF8U8A5t8TIMrkoNuEDVRW5wsC6HpI5dCuzHxrNCgtwA1eceS+M+M32yVQWJlqBXvw5CDxzQNZlc 3+VnU40v+RCjWlPGtcHsBtm4C5c2c3rJy0mgfvNyNLSgwU/AAugdqiW3qLYIhc6G/RS4F9Wr3ExMC hKEr7xXHnR5W+n55afxiflfYwtSFipzaZ/kw2kprAMhu+Ja6i/J5KmkFnCjlhVLD9odfzeci7Jz6T nc5xLE7CI+DwJaddtchoNMiYRBwGy7K1gJ2lBmDCudRpekx5z3tTJe5inFeHB4r8kM3KXVSV3zve0 MsAH5Q4A==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1slzSQ-00000006MRT-2QYL; Wed, 04 Sep 2024 23:30:38 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev, chuck.lever@oracle.com, da.gomez@samsung.com, jlayton@kernel.org Cc: mcgrof@kernel.org Subject: [PATCH 2/3] kdevops: remove duplicate symbols and use scripts/append-makefile-vars.sh Date: Wed, 4 Sep 2024 16:30:36 -0700 Message-ID: <20240904233037.1516218-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240904233037.1516218-1-mcgrof@kernel.org> References: <20240904233037.1516218-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 A few kdevops kconfig duplicate symbols exist, remove them so to ensure we can work with the latest linux-next version of kconfig. Additionally we need to ensure to use scripts/append-makefile-vars.sh for when we want to work with Makefile inherited variables. The KDEVOPS_PLAYBOOK_DIR can also just be simplified, while we do provide for variability in practice we never use this so just this a silent default for now. Without this we end up in a hung state if we run 'make menuconfig' with the latest kconfig. Fix this. Signed-off-by: Luis Chamberlain --- kconfigs/Kconfig.ansible_provisioning | 24 ++++++------------------ terraform/aws/Kconfig | 14 -------------- vagrant/Kconfig | 3 ++- vagrant/Kconfig.opensuse | 22 ---------------------- 4 files changed, 8 insertions(+), 55 deletions(-) diff --git a/kconfigs/Kconfig.ansible_provisioning b/kconfigs/Kconfig.ansible_provisioning index 82a6f822c3f5..63f04306e7b2 100644 --- a/kconfigs/Kconfig.ansible_provisioning +++ b/kconfigs/Kconfig.ansible_provisioning @@ -1,12 +1,6 @@ -if !KDEVOPS_ANSIBLE_PROVISION_ENABLE - config KDEVOPS_PLAYBOOK_DIR string - default $(shell, echo $KDEVOPS_PLAYBOOKS_DIR) - help - The directory where ansible playbooks are found. - -endif # KDEVOPS_ANSIBLE_PROVISION_ENABLE + default $(shell, scripts/append-makefile-vars.sh $(KDEVOPS_PLAYBOOKS_DIR)) config HAVE_DISTRO_PREFERS_DISABLE_ANSIBLE bool @@ -41,7 +35,7 @@ config KDEVOPS_DEVCONFIG_ENABLE_CONSOLE bool "Enable console setup" default y depends on KDEVOPS_DEVCONFIG_ENABLE - help + help Enable this so that we configure and enable console serial settings for you on /etc/default/grub. @@ -50,7 +44,7 @@ if KDEVOPS_DEVCONFIG_ENABLE_CONSOLE config KDEVOPS_DEVCONFIG_KERNEL_CONSOLE_SETTINGS string "Kernel command line console kernel parameters to use" default "console=tty0 console=tty1 console=ttyS0,115200n8" - help + help Linux kernel console kernel parameters to use. This will be appended to the GRUB configuration file /etc/default/grub on the variable GRUB_CMDLINE_LINUX_DEFAULT, if and only if you did not have any @@ -59,7 +53,7 @@ config KDEVOPS_DEVCONFIG_KERNEL_CONSOLE_SETTINGS config KDEVOPS_DEVCONFIG_GRUB_SERIAL_COMMAND string "GRUB specific serial settings" default "serial --speed=115200 --unit=0 --parity=no --stop=1" - help + help GRUB console settings to use. This will be appended to the GRUB configuration file /etc/default/grub on the variable GRUB_SERIAL_COMMAND, if and only if we did change the your console @@ -68,7 +62,7 @@ config KDEVOPS_DEVCONFIG_GRUB_SERIAL_COMMAND config KDEVOPS_GRUB_TIMEOUT int "GRUB timeout" default 2 - help + help GRUB timeout to wait for user interaction to let you pick another kernel or boot options. @@ -104,15 +98,9 @@ config KDEVOPS_DEVCONFIG_SYSTEMD_WATCHDOG_TIMEOUT_KEXEC endif # KDEVOPS_DEVCONFIG_ENABLE_SYSTEMD_WATCHDOG -config KDEVOPS_PLAYBOOK_DIR - string "The directory for the ansible playbooks to use" - default $(shell, echo $KDEVOPS_PLAYBOOKS_DIR) - help - The directory where ansible playbooks are found. - config KDEVOPS_ANSIBLE_INVENTORY_FILE string "The ansible inventory file to use" - default $(shell, echo $KDEVOPS_HOSTFILE) + default $(shell, scripts/append-makefile-vars.sh $(KDEVOPS_HOSTFILE)) help The file to use for the ansible inventory. diff --git a/terraform/aws/Kconfig b/terraform/aws/Kconfig index dafacaeada15..a94045afcfee 100644 --- a/terraform/aws/Kconfig +++ b/terraform/aws/Kconfig @@ -280,13 +280,6 @@ config TERRAFORM_AWS_INSTANCE_IS4GEN_MEDIUM 6 GiB RAM, 1vCPU, 1 x 937 GiB NVMe SSD, 25 Gbps Net, 9.6 Gbps EBS. https://aws.amazon.com/ec2/instance-types/i4g/ -config TERRAFORM_AWS_INSTANCE_IS4GEN_8XLARGE - bool "is4gen.8xlarge" - depends on TARGET_ARCH_ARM64 - help - 192 GiB RAM, 32 vCPUs, 4 x 7500 GiB NVMe SSD, 50 Gbps Net, 19 Gbps EBS. - https://aws.amazon.com/ec2/instance-types/i4g/ - config TERRAFORM_AWS_INSTANCE_IS4GEN_8XLARGE bool "is4gen.8xlarge" depends on TARGET_ARCH_ARM64 @@ -308,13 +301,6 @@ config TERRAFORM_AWS_INSTANCE_IM4GN_4XLARGE 64 GiB RAM, 16 vcpus, 1 x 7500 NVMe SSD, 25 Gbps Net, 9.5 Gbps EBS. https://aws.amazon.com/ec2/instance-types/i4g/ -config TERRAFORM_AWS_INSTANCE_IM4GN_4XLARGE - bool "im4gn.4xlarge" - depends on TARGET_ARCH_ARM64 - help - 64 GiB RAM, 16 vcpus, 1 x 7500 NVMe SSD, 25 Gbps Net, 9.5 Gbps EBS. - https://aws.amazon.com/ec2/instance-types/i4g/ - config TERRAFORM_AWS_INSTANCE_I4I_LARGE bool "i4i.large" depends on TARGET_ARCH_X86_64 diff --git a/vagrant/Kconfig b/vagrant/Kconfig index 93480274885e..ecf7bcafe1ad 100644 --- a/vagrant/Kconfig +++ b/vagrant/Kconfig @@ -1,4 +1,5 @@ if VAGRANT + choice prompt "Vagrant virtualization technology to use" default VAGRANT_LIBVIRT_SELECT @@ -89,7 +90,7 @@ config VIRTUALBOX_EXTRA_DRIVE_FORMAT default "vmdk" if VIRTUALBOX_EXTRA_DRIVE_VMDK default "vhd" if VIRTUALBOX_EXTRA_DRIVE_VHD -endif +endif # VAGRANT_VIRTUALBOX config HAVE_SUSE_VAGRANT bool diff --git a/vagrant/Kconfig.opensuse b/vagrant/Kconfig.opensuse index 2ffb1f31c02b..6da402755c26 100644 --- a/vagrant/Kconfig.opensuse +++ b/vagrant/Kconfig.opensuse @@ -56,28 +56,6 @@ config VAGRANT_OPENSUSE_X86_64_LEAP_15_3 help This enables the OpenSUSE Leap 15.3 release. -config VAGRANT_OPENSUSE_X86_64_LEAP_15_4 - bool "Leap-15.4.x86_64" - depends on TARGET_ARCH_X86_64 - select HAVE_VAGRANT_BOX_URL - select HAVE_DISTRO_BTRFS_DISABLES_RAID56 if FSTESTS_BTRFS - select HAVE_DISTRO_XFS_SUPPORTS_CRC if FSTESTS_XFS - select HAVE_DISTRO_XFS_SUPPORTS_EXTERNAL_LOG if FSTESTS_XFS - select HAVE_DISTRO_XFS_SUPPORTS_REFLINKS if FSTESTS_XFS - select HAVE_DISTRO_XFS_SUPPORTS_BIGBLOCKS if FSTESTS_XFS - select HAVE_DISTRO_PREFERS_FSTESTS_WATCHDOG - select HAVE_DISTRO_PREFERS_FSTESTS_WATCHDOG_KILL - select HAVE_DISTRO_BLKTESTS_TEST_BLOCK if KDEVOPS_WORKFLOW_ENABLE_BLKTESTS - select HAVE_DISTRO_BLKTESTS_TEST_LOOP if KDEVOPS_WORKFLOW_ENABLE_BLKTESTS - select HAVE_DISTRO_BLKTESTS_TEST_NBD if KDEVOPS_WORKFLOW_ENABLE_BLKTESTS - select HAVE_DISTRO_PREFERS_BLKTESTS_WATCHDOG if KDEVOPS_WORKFLOW_ENABLE_BLKTESTS - select HAVE_DISTRO_PREFERS_BLKTESTS_WATCHDOG_KILL if KDEVOPS_WORKFLOW_ENABLE_BLKTESTS - select HAVE_DISTRO_PREFERS_REFRESH - select HAVE_DISTRO_PREFERS_UPDATE - select HAVE_DISTRO_PREFERS_INSTALL_KDEVTOOLS - help - This enables the OpenSUSE Leap 15.4 release. - endchoice if VAGRANT_OPENSUSE_X86_64_TW -- 2.43.0