[PATCH 1/5] Makefile: add support for selective yamlconfig

[Luis Chamberlain <mcgrof@kernel.org>]

Leverage support for selective yaml config support, this will let us
start removing the requirement to use Makefiles to append variables
into extra_vars.yaml, all we need to do is use the "output yaml" on
the symbols we want converted over.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
 Makefile            |  3 ++-
 Makefile.extra_vars | 11 +++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 9d4e954811ab..f9f2b04c6586 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ EXTRAVERSION =
 all: deps
 
 export KCONFIG_DIR=$(CURDIR)/scripts/kconfig
+export KCONFIG_YAMLCFG=$(CURDIR)/.extra_vars_auto.yaml
 include $(KCONFIG_DIR)/kconfig.Makefile
 include Makefile.subtrees
 
@@ -250,7 +251,7 @@ mrproper:
 	$(Q)rm -f terraform/*/terraform.tfvars
 	$(Q)rm -f $(KDEVOPS_NODES)
 	$(Q)rm -f $(KDEVOPS_HOSTFILE) $(KDEVOPS_MRPROPER)
-	$(Q)rm -f .config .config.old extra_vars.yaml
+	$(Q)rm -f .config .config.old extra_vars.yaml $(KCONFIG_YAMLCFG)
 	$(Q)rm -f playbooks/secret.yml $(KDEVOPS_EXTRA_ADDON_DEST)
 	$(Q)rm -rf include
 
diff --git a/Makefile.extra_vars b/Makefile.extra_vars
index 1fbacb3441fe..d77ea67c20d4 100644
--- a/Makefile.extra_vars
+++ b/Makefile.extra_vars
@@ -45,13 +45,12 @@ endef
 #$(patsubst $(firstword $(subst =, ,$(1)))=%,$(firstword $(subst =, ,$(1))):%,$(1))
 #$(patsubst $(firstword $(subst =, ,$(1))=)%,$(firstword $(subst =, , $(1):)%,$(1)),$(1))
 
-# We can transform most of .config things we need to using
-# looping on ANSIBLE_EXTRA_ARGS and converting those with
-# this target. If you need to do more complex fancy stuff
-# extend the EXTRA_VAR_INPUTS variable in your workflow with
-# your custom stuff.
+# extra_vars.yaml first gets the selective yaml entries which kconfig writes
+# to for us in KCONFIG_YAMLCFG, then we expand on it with more dynamic data.
+# We use awk NF to just remove empty lines.
 most_extra_vars:
-	@echo --- > $(KDEVOPS_EXTRA_VARS)
+	@awk NF $(KCONFIG_YAMLCFG) > $(KDEVOPS_EXTRA_VARS)
+	@echo "# end of of yamlconfig auto output yaml variables " >> $(KDEVOPS_EXTRA_VARS)
 	@$(foreach exp,$(ANSIBLE_EXTRA_ARGS),echo $(call YAML_ENTRY,$(subst =,: ,$(exp)) >> $(KDEVOPS_EXTRA_VARS)))
 
 # ANSIBLE_EXTRA_ARGS_SEPARATED is to be used for variables in .config
-- 
2.43.0