diff mbox series

[01/16] UBUNTU: [Packaging] propagate makefile variables to kernelconfig

Message ID 20230316090529.199884-2-andrea.righi@canonical.com
State New
Headers show
Series [01/16] UBUNTU: [Packaging] propagate makefile variables to kernelconfig | expand

Commit Message

Andrea Righi March 16, 2023, 9:05 a.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/2007654

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
---
 debian/rules.d/1-maintainer.mk   | 4 ++--
 debian/scripts/misc/kernelconfig | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk
index c7224301d525..a5c81896cc84 100644
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -39,7 +39,7 @@  ifneq ($(wildcard $(DEBIAN)/config/config.common.ubuntu),)
 	debian/scripts/misc/migrate-annotations < build/.annotations > $(DEBIAN)/config/annotations
 	mv build/.README.rst $(DEBIAN)/config/README.rst 2>/dev/null || true
 	rm -rf build
-	conc_level=$(conc_level) $(SHELL) $(DROOT)/scripts/misc/kernelconfig updateconfigs
+	kmake='$(kmake)' conc_level=$(conc_level) $(SHELL) $(DROOT)/scripts/misc/kernelconfig updateconfigs
 endif
 
 configs-targets := updateconfigs defaultconfigs genconfigs editconfigs
@@ -50,7 +50,7 @@  $(configs-targets):
 ifneq ($(wildcard $(DEBIAN)/config/config.common.ubuntu),)
 	conc_level=$(conc_level) $(SHELL) $(DROOT)/scripts/misc/old-kernelconfig $@
 else
-	skip_checks=$(do_skip_checks) conc_level=$(conc_level) \
+	kmake='$(kmake)' skip_checks=$(do_skip_checks) conc_level=$(conc_level) \
 		$(SHELL) $(DROOT)/scripts/misc/kernelconfig $@
 endif
 
diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig
index a3559f323b57..035426762f8a 100755
--- a/debian/scripts/misc/kernelconfig
+++ b/debian/scripts/misc/kernelconfig
@@ -118,7 +118,7 @@  EOF
 	# Call config target
 	echo
 	echo "* Run ${target} on ${arch}/${flavour} ..."
-	make O=build "${env[@]}" "${target}"
+	${kmake} O=build "${env[@]}" "${target}"
 
 	# Move config for further processing
 	mv build/.config "${tmp_conf_file}"