diff options
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | build/external/Makefile | 6 | ||||
| -rw-r--r-- | build/external/packages.mk | 6 |
3 files changed, 18 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 563a1157cf4..ea3ab8de5b8 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,13 @@ /build/external/vpp-* /build/external/dpdk_mlx_default.sh /build/external/downloads/ +/build/external/deb/_build/ +/build/external/deb/debian/changelog +/build/external/deb/debian/debhelper-build-stamp +/build/external/deb/debian/tmp/ +/build/external/deb/debian/files/ +/build/external/deb/debian/.debhelper/ +/build/external/deb/debian/vpp-ext-deps* /path_setup /tools/ # start autotools ignore @@ -139,3 +146,5 @@ compile_commands.json /cmake_install.cmake /startup.conf /startup.vpp +# log file archives +/archives diff --git a/build/external/Makefile b/build/external/Makefile index 6b5f9058dda..ce57c79eec2 100644 --- a/build/external/Makefile +++ b/build/external/Makefile @@ -30,6 +30,12 @@ endif # FreeBSD B := $(BUILD_DIR) I := $(INSTALL_DIR) +ifeq ($(WORKSPACE),) +L := $(B) +else +L := $(WORKSPACE)/archives/vpp-ext-deps +$(shell rm -rf $(L) && mkdir -p $(L)) +endif ifneq ($(shell which cmake3),) CMAKE?=cmake3 diff --git a/build/external/packages.mk b/build/external/packages.mk index eba702222de..e8cbe271d9b 100644 --- a/build/external/packages.mk +++ b/build/external/packages.mk @@ -21,9 +21,9 @@ $1_src_dir ?= $(B)/src-$1 $1_patch_dir ?= $(CURDIR)/patches/$1_$($1_version) $1_build_dir ?= $(B)/build-$1 $1_install_dir ?= $(I) -$1_config_log ?= $(B)/$1.config.log -$1_build_log ?= $(B)/$1.build.log -$1_install_log ?= $(B)/$1.install.log +$1_config_log ?= $(L)/$1.config.log +$1_build_log ?= $(L)/$1.build.log +$1_install_log ?= $(L)/$1.install.log ############################################################################## # Download |