From patchwork Fri Oct 11 01:01:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 13831715 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 06FF95256 for ; Fri, 11 Oct 2024 01:01:12 +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=1728608475; cv=none; b=iAUgw3LI6/8x9ghpMikijgASmEISGceOCfy9rLpCmS0xFd1+JuCam4wLLQRjj0vOW0CUE5na8GaHjaOkYWyWgo1bfLkELrRL9Wm91vwC/rTQxndHpy4Fbl/RMKZrc/1JffK2K3+oTaD5mhtY2TGJFNBv7rlXjVTkS03X84nR4F8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728608475; c=relaxed/simple; bh=2R5yklc6V9JI78WQN3YdU9VN+t0/IqMQm5XCVfbYdrk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E2SpmzIaswZoENDLROLkpL+aDj0EmyI5H5+Dx+Ke1qnUwqnTtbTjbag/eyefnmWgpBnJfBPsxycrwJR6QsIehombOG70n9llEa1ET3DDQEvkWgTnf2bpjpYIHZ2+5Z/pmEm7C+s+7eIA70TyXSDikzlVkKe6Un9X39Fu3qAex8w= 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=HGDBMlI/; 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="HGDBMlI/" 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=3M1fXIqrGAdTXZQyuQv87K3v/ySmmLAvo8gMTRimRG4=; b=HGDBMlI/eN+bBuV5ofaoNYCn4c qVxLPE8spd6P3PHQ5ND+k4CUBR6CZ3+Y72TJnTJVuzWpfPFNFKhHXXF4cCoLQKIu91R0si+4AmxgS IMXUN26/hrXbX17ERQnKGLhgep6pD0RYuFHsXX0p+W9f4adM4tZAry39N2KIqIJaMa4HDtq1rkgPZ Grrx3F4V/UZIc82N5uTPMs/tUcARExLYVo+/ldJBYN+JaZWbEn/bj/0x37/GQvOhPy2nC/CPyYRAz kce7fKPB42xpQ3IAx+IIKZfYxzJBJjTA/Zwmqm84aJxhY6qrUY3/c6uzcnOBkfoZfk6Ihrp3G+UkP 0YAF3j+w==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1sz41o-0000000ErxK-1guq; Fri, 11 Oct 2024 01:01:12 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev, ross@kallisti.us Cc: mcgrof@kernel.org Subject: [PATCH kdevops 1/4] guestfs: make trixie generic image the default Date: Thu, 10 Oct 2024 18:01:08 -0700 Message-ID: <20241011010111.3543993-2-mcgrof@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241011010111.3543993-1-mcgrof@kernel.org> References: <20241011010111.3543993-1-mcgrof@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Sender: Luis Chamberlain The cloud image lacks 9p fs support so can't be used for kernel hacking on kdevops unless you don't want to use 9p fs.. So while at it codify all this by disabling bootlinux 9p support if the user selects that image. Signed-off-by: Luis Chamberlain --- kconfigs/Kconfig.guestfs | 14 ++++++++++++-- workflows/linux/Kconfig | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/kconfigs/Kconfig.guestfs b/kconfigs/Kconfig.guestfs index 742781abcddc..da2f5e3961d7 100644 --- a/kconfigs/Kconfig.guestfs +++ b/kconfigs/Kconfig.guestfs @@ -10,6 +10,9 @@ config GUESTFS_REQUIRES_UEFI bool output yaml +config GUESTFS_LACKS_9P + bool + config GUESTFS_CUSTOM_RAW_IMAGE_URL depends on GUESTFS_HAS_CUSTOM_RAW_IMAGE depends on GUESTFS_HAS_CUSTOM_RAW_IMAGE_URL @@ -111,19 +114,26 @@ if GUESTFS_DEBIAN_TRIXIE choice prompt "Debian trixie flavor" - default GUESTFS_DEBIAN_TRIXIE_GENERIC_CLOUD_AMD64 + default GUESTFS_DEBIAN_TRIXIE_GENERIC_AMD64 config GUESTFS_DEBIAN_TRIXIE_GENERIC_AMD64 bool "debian-13-generic-amd64-daily" help Should run in any environment using cloud-init, for e.g. OpenStack, - DigitalOcean and also on bare metal. + DigitalOcean and also on bare metal. This is the image you should + try to use and stick to for kernel testing. config GUESTFS_DEBIAN_TRIXIE_GENERIC_CLOUD_AMD64 bool "debian-13-genericcloud-amd64-daily" help Similar to generic. Should run in any virtualised environment. Is smaller than generic by excluding drivers for physical hardware. + Note that the 9p client filesystem module will not be available to + you with this image and so you cannot leverage 9p for building + Linux on the host. This image also requires a EFI boot loader + and secure boot is enabled by default which means your custom + kernels will need to be signed and this plumbing is not supported + yet so you are on your own. config GUESTFS_DEBIAN_TRIXIE_NOCLOUD_AMD64 bool "debian-13-nocloud-amd64-daily" diff --git a/workflows/linux/Kconfig b/workflows/linux/Kconfig index 8b1dfd3b25c7..b51d8ee3fb3d 100644 --- a/workflows/linux/Kconfig +++ b/workflows/linux/Kconfig @@ -38,7 +38,7 @@ endif # HAVE_SUPPORTS_PURE_IOMAP config BOOTLINUX_9P bool "Use 9p to build Linux" - depends on LIBVIRT + depends on LIBVIRT && !GUESTFS_LACKS_9P default LIBVIRT help This will let you choose use 9p to build Linux. What this does is