[PATCH 2/5] scripts/guestfs.Makefile: use output yaml for GUESTFS_REQUIRES_UEFI

[Luis Chamberlain <mcgrof@kernel.org>]

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 <mcgrof@kernel.org>
---
 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