UBUNTU: [Packaging] propagate makefile variables to kernelconfig
BugLink: https://bugs.launchpad.net/bugs/2007654 Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
This commit is contained in:
committed by
Paolo Pisati
parent
5ddf9aec34
commit
ad500f1b65
Vendored
+2
-2
@@ -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
|
||||
|
||||
|
||||
Vendored
+1
-1
@@ -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}"
|
||||
|
||||
Reference in New Issue
Block a user