DPDK 20.05 had some deprecation notes after "make config" and after the build. For DPDK 20.08, the config note is replaced with a warning before the config and before the build. After the warning, there is a pause which can be skipped with the variable MAKE_PAUSE.
This deprecation process was discussed in the Technical Board: http://mails.dpdk.org/archives/dev/2020-April/162839.html Signed-off-by: Thomas Monjalon <tho...@monjalon.net> --- mk/rte.sdkconfig.mk | 5 ----- mk/rte.sdkroot.mk | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk index 2ea85e4643..f538649f22 100644 --- a/mk/rte.sdkconfig.mk +++ b/mk/rte.sdkconfig.mk @@ -62,11 +62,6 @@ else config: $(RTE_OUTPUT)/include/rte_config.h $(RTE_OUTPUT)/Makefile @echo "Configuration done using" \ $(patsubst defconfig_%,%,$(notdir $(RTE_CONFIG_TEMPLATE))) - @echo "==== NOTE ====" - @echo "It is recommended to build DPDK using 'meson' and 'ninja'" - @echo "See https://doc.dpdk.org/guides/linux_gsg/build_dpdk.html for instructions" - @echo "Building DPDK with 'make' will be deprecated in a future release" - @echo "==============" endif $(RTE_OUTPUT): diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk index 4043a9d4e8..d3b9cdd048 100644 --- a/mk/rte.sdkroot.mk +++ b/mk/rte.sdkroot.mk @@ -60,7 +60,22 @@ export ROOTDIRS-y ROOTDIRS- ROOTDIRS-n .PHONY: default test-build default test-build: all +.PHONY: warning +warning: + @echo + @echo "=========================== WARNING ============================" + @echo "It is recommended to build DPDK using 'meson' and 'ninja'" + @echo "See https://doc.dpdk.org/guides/linux_gsg/build_dpdk.html"; + @echo "Building DPDK with 'make' will be deprecated in a future release" + @echo "================================================================" + @echo + @test "$(MAKE_PAUSE)" = n || ( \ + echo "This deprecation warning can be passed by adding MAKE_PAUSE=n"; \ + echo "to 'make' command line or as an exported environment variable."; \ + echo "Press enter to continue..."; read) + .PHONY: config defconfig showconfigs showversion showversionum +config: warning config defconfig showconfigs showversion showversionum: $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkconfig.mk $@ @@ -96,4 +111,5 @@ examples examples_clean: # all other build targets %: $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkconfig.mk checkconfig + $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkroot.mk warning $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkbuild.mk $@ -- 2.26.2
