summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2022-10-04 23:48:44 -0400
committerDave Wallace <dwallacelf@gmail.com>2022-10-07 18:54:15 +0000
commit61bae8a54d14899337b0d0a7ca9b9367f6321951 (patch)
treeea7c5b12baf61fb609a9b3422cf6416f8d33cbed
parent582c81e68622d44200406137d261688adde0aed9 (diff)
build: retain dpdk_mlx_default setting for ci scriptv22.10-rc2
- tell git to ignore all build/external generated files Type: make Signed-off-by: Dave Wallace <dwallacelf@gmail.com> Change-Id: I4af26a76a0248939366cd09b577d422af801c0c3 (cherry picked from commit 14b118b4c7f5bd3927af48010092c5313884fbb2)
-rw-r--r--.gitignore4
-rw-r--r--build/external/packages/dpdk.mk2
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 71225df0e90..06c57c3cb85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,8 +27,8 @@
/build-config.mk
/build/external/*.tar.gz
/build/external/*.tar.xz
-/build/external/vpp-*.deb
-/build/external/vpp-*.changes
+/build/external/vpp-*
+/build/external/dpdk_mlx_default.sh
/build/external/downloads/
/path_setup
/tools/
diff --git a/build/external/packages/dpdk.mk b/build/external/packages/dpdk.mk
index bf27d8aa731..9519b2845ff 100644
--- a/build/external/packages/dpdk.mk
+++ b/build/external/packages/dpdk.mk
@@ -175,7 +175,7 @@ PIP_DOWNLOAD_DIR = $(CURDIR)/downloads/
define dpdk_config_cmds
cd $(dpdk_build_dir) && \
- echo "DPDK_MLX_DEFAULT=$(DPDK_MLX_DEFAULT)" > dpdk_mlx_default.sh && \
+ echo "DPDK_MLX_DEFAULT=$(DPDK_MLX_DEFAULT)" > ../../../dpdk_mlx_default.sh && \
rm -rf ../dpdk-meson-venv && \
mkdir -p ../dpdk-meson-venv && \
python3 -m venv ../dpdk-meson-venv && \