build: fix external patch application to not create .orig files 84/29584/1
authorDave Wallace <dwallacelf@gmail.com>
Wed, 21 Oct 2020 23:27:05 +0000 (19:27 -0400)
committerDave Wallace <dwallacelf@gmail.com>
Wed, 21 Oct 2020 23:27:05 +0000 (19:27 -0400)
- 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 <dwallacelf@gmail.com>
Change-Id: I3f1f70781b7a5564cd38e8876644d817e2eb4aad

build/external/packages.mk

index 005c2a9..bcd1d38 100644 (file)
@@ -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 $$@