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 ED8681741D2 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=O+Y1/X26MNJn4LXkGcCRYzmeUZIicrCobgXCq7uXoC+nmcZGnz3+qQHcYJgTRk6KgA/OLjxsGzROxRJ+PvztyFnHfrnucM1rIFrSRko20auRwahkaqBHVdEj+luT7D3A0LYzRJ50J3geSOU/BLUqlceGNCCAYLvhlR+OFln0rOk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725492643; c=relaxed/simple; bh=In9BunBZNnUAZttDoNWATtZw9bcTJiUzSyirjrjU8dk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BzulEmG/am3vSR9q+Hj2pp321/isAi2wDn3ecpfZ2NIYvJjEE4NcZVm4yA97u0+QWUjRCDs+tLRHcOifwfTfga6r5e+mkt6ly5BJg6QxcybrsOhtVrZcUtvCnR3HZnKywfvPk1EYDYnq6G/nHEPsJ/HJo7BADvz3k3qBOFERbN4= 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=LE3jyrCf; 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="LE3jyrCf" 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=ZrfdGDLjUX4/4Hb47/nNIDk23QZ8tw/gyRxjyhush2Q=; b=LE3jyrCfxDvK3QtDpxzeEVr43Q RoRYvBrWJd5tnnieHYxtXDjsHuPGO3dwlQkWuN5urhn/q+RG0khflv/XyleUiOeTdlGqMajjgGwUa eQaqiOQMGsE6Il2bLJVSre7FFm2pS/Bw9dp2eT0Kh0xsjpPd7teqCf0Wpy51+Jr6943xG4dGrJm32 /VoRssu0sBXyNPLh2D4mq6aMHiyng/IG4jAqifwUAFDRjjBj3zogRDZhLUl5QBnObg82/00w0h4BQ 0eZubNihWI3NvD1KInKqNwnppFqWczSNGwvO7U0sIBO2iDxSf5DpLZ0QR6LHqpO+mXSEN8tItKeqs q8SogiAg==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1slzST-00000006MRt-07GW; Wed, 04 Sep 2024 23:30:41 +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/5] scripts/guestfs.Makefile: use output yaml for GUESTFS_REQUIRES_UEFI Date: Wed, 4 Sep 2024 16:30:37 -0700 Message-ID: <20240904233040.1516250-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240904233040.1516250-1-mcgrof@kernel.org> References: <20240904233040.1516250-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 Since the kconfig symbol name GUESTFS_REQUIRES_UEFI and the ansible variable match exactly we can now just use "output yaml" on the GUESTFS_REQUIRES_UEFI symbol, and so we don't need the Makefile hack to ensure the variable gets converted over. This simplifies our Makefiles considerably. Signed-off-by: Luis Chamberlain --- kconfigs/Kconfig.guestfs | 1 + scripts/guestfs.Makefile | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/kconfigs/Kconfig.guestfs b/kconfigs/Kconfig.guestfs index 5e77704f4027..742781abcddc 100644 --- a/kconfigs/Kconfig.guestfs +++ b/kconfigs/Kconfig.guestfs @@ -8,6 +8,7 @@ config GUESTFS_HAS_CUSTOM_RAW_IMAGE_URL config GUESTFS_REQUIRES_UEFI bool + output yaml config GUESTFS_CUSTOM_RAW_IMAGE_URL depends on GUESTFS_HAS_CUSTOM_RAW_IMAGE diff --git a/scripts/guestfs.Makefile b/scripts/guestfs.Makefile index e4591ab446e3..af901b8ddaa0 100644 --- a/scripts/guestfs.Makefile +++ b/scripts/guestfs.Makefile @@ -7,10 +7,6 @@ KDEVOPS_NODES := guestfs/kdevops_nodes.yaml export KDEVOPS_PROVISIONED_SSH := $(KDEVOPS_PROVISIONED_SSH_DEFAULT_GUARD) -ifeq (y,$(CONFIG_GUESTFS_REQUIRES_UEFI)) -GUESTFS_ARGS += guestfs_requires_uefi=True -endif - GUESTFS_ARGS += kdevops_enable_guestfs=True GUESTFS_ARGS += guestfs_path='$(TOPDIR_PATH)/guestfs' GUESTFS_ARGS += data_home_dir=/home/kdevops -- 2.43.0