[ptxdist] [PATCH v2 1/4] barebox, kernel: set <PKG>_CONF_TOOL := kconfig explicitely

[Roland Hieber <rhi@pengutronix.de>]

Until now this worked without setting the variable because
ptxd_make_world_init tries to autodetect the config tool, but we should
make this explicit.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>

---
 v2: tab-align where tabs already exist

 rules/barebox.make                              | 1 +
 rules/kernel.make                               | 1 +
 rules/templates/template-barebox-imx-habv4-make | 1 +
 rules/templates/template-barebox-make           | 1 +
 rules/templates/template-kernel-make            | 1 +
 5 files changed, 5 insertions(+)

diff --git a/rules/barebox.make b/rules/barebox.make
index 90e193c8ea9a..94534db39ebe 100644
--- a/rules/barebox.make
+++ b/rules/barebox.make
@@ -40,6 +40,7 @@ BAREBOX_PATH := PATH=$(HOST_PATH)
 BAREBOX_WRAPPER_BLACKLIST := \
 	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
+BAREBOX_CONF_TOOL := kconfig
 BAREBOX_CONF_OPT := \
 	-C $(BAREBOX_DIR) \
 	O=$(BAREBOX_BUILD_DIR) \
diff --git a/rules/kernel.make b/rules/kernel.make
index 593e03dc4a3e..73c72da57473 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -81,6 +81,7 @@ KERNEL_SHARED_OPT += \
 	HOSTCC="$(HOSTCC) -DGENERATOR_FILE"
 endif
 
+KERNEL_CONF_TOOL := kconfig
 KERNEL_CONF_OPT := \
 	$(KERNEL_SHARED_OPT)
 
diff --git a/rules/templates/template-barebox-imx-habv4-make b/rules/templates/template-barebox-imx-habv4-make
index a7d287822547..cfe4c2de36eb 100644
--- a/rules/templates/template-barebox-imx-habv4-make
+++ b/rules/templates/template-barebox-imx-habv4-make
@@ -37,6 +37,7 @@ BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH)
 BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \
 	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
+BAREBOX_@PACKAGE@_CONF_TOOL := kconfig
 BAREBOX_@PACKAGE@_CONF_OPT := \
 	-C $(BAREBOX_@PACKAGE@_DIR) \
 	O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \
diff --git a/rules/templates/template-barebox-make b/rules/templates/template-barebox-make
index ae7e06038e23..6a9599240b64 100644
--- a/rules/templates/template-barebox-make
+++ b/rules/templates/template-barebox-make
@@ -37,6 +37,7 @@ BAREBOX_@PACKAGE@_PATH := PATH=$(HOST_PATH)
 BAREBOX_@PACKAGE@_WRAPPER_BLACKLIST := \
 	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
 
+BAREBOX_@PACKAGE@_CONF_TOOL := kconfig
 BAREBOX_@PACKAGE@_CONF_OPT := \
 	-C $(BAREBOX_@PACKAGE@_DIR) \
 	O=$(BAREBOX_@PACKAGE@_BUILD_DIR) \
diff --git a/rules/templates/template-kernel-make b/rules/templates/template-kernel-make
index 697c18145cec..c7448b2a8be4 100644
--- a/rules/templates/template-kernel-make
+++ b/rules/templates/template-kernel-make
@@ -46,6 +46,7 @@ KERNEL_@PACKAGE@_SHARED_OPT	+= \
 	HOSTCXX="$(HOSTCXX) -DGENERATOR_FILE" \
 	HOSTCC="$(HOSTCC) -DGENERATOR_FILE"
 
+KERNEL_@PACKAGE@_CONF_TOOL	:= kconfig
 KERNEL_@PACKAGE@_CONF_OPT	:= \
 	$(KERNEL_@PACKAGE@_SHARED_OPT)
 
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de