From 312e441a8e4c1bd6c90d6f2570c2746139086be6 Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Wed, 21 Oct 2020 19:27:05 -0400 Subject: [PATCH] build: fix external patch application to not create .orig files - Generation of patched original files (eg. dpdk-devbind.py.orig) causes build breakage of 'make install-ext-deps' on CentOS-8. Note: this only occurs on builds using 'make' for dpdk instead of 'meson'. Thus only applies to stable/2009. Type: fix Signed-off-by: Dave Wallace Change-Id: I3f1f70781b7a5564cd38e8876644d817e2eb4aad --- build/external/packages.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/external/packages.mk b/build/external/packages.mk index 005c2a958b2..bcd1d38a387 100644 --- a/build/external/packages.mk +++ b/build/external/packages.mk @@ -79,7 +79,7 @@ $(B)/.$1.patch.ok: $(B)/.$1.extract.ok ifneq ($$(wildcard $$($1_patch_dir)/*.patch),) @for f in $$($1_patch_dir)/*.patch ; do \ echo "Applying patch: $$$$(basename $$$$f)" ; \ - patch -p1 -d $$($1_src_dir) < $$$$f ; \ + patch -p1 -d $$($1_src_dir) --no-backup-if-mismatch < $$$$f ; \ done endif @touch $$@ -- 2.16.6