From 63f2b46a8cc0779e4a4778e47e769349c044a2a8 Mon Sep 17 00:00:00 2001 From: Burt Silverman Date: Mon, 30 Sep 2019 09:50:42 -0400 Subject: build: build-root/Makefile rm of install tree Type: fix The scenario is touch of a dpdk source file in places like /build-root/build-vpp-native/external/dpdk-19.08/. The subsequent build will trigger an rm -rf $(PACKAGE_INSTALL_DIR) by build-root/Makefile at around line 709. Because the package in question, "external", consists of various "sub" packages, all of which are controlled with files like .quicly.install.ok located in build-root/build-vpp[_debug]-native/external, we end up not handling the .*.install.ok files to reflect the removal of that PACKAGE_INSTALL_DIR. This fix will correct that, at least for the case of touching/changing dpdk files. A better long term solution would be to change the "sub" packages to be full fledged build system packages, as Dave Barach points out. Signed-off-by: Burt Silverman Change-Id: Ia94ccaa2795cbf354b5921c3001a7141313b66be (cherry picked from commit 839a7bce3872f992f4807ee6d6a76f9b361151dc) --- build/external/packages/dpdk.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/build/external/packages/dpdk.mk b/build/external/packages/dpdk.mk index 17a2638ecce..7e8af071f53 100644 --- a/build/external/packages/dpdk.mk +++ b/build/external/packages/dpdk.mk @@ -289,6 +289,7 @@ dpdk-config: $(B)/.dpdk-config.ok $(B)/.dpdk-build.ok: dpdk-config $(DPDK_BUILD_DEPS) @if [ ! -e $(B)/.dpdk-config.ok ] ; then echo 'Please run "make config" first' && false ; fi + @rm -f $(B)/.*.install.ok #deals with build-root/Makefile line 709 @make $(DPDK_MAKE_ARGS) install @touch $@ -- cgit 1.2.3-korg