]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
iproute2: refresh patches
authorRoss Burton <ross.burton@intel.com>
Fri, 9 Mar 2018 18:55:43 +0000 (20:55 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 11 Mar 2018 13:25:20 +0000 (06:25 -0700)
The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch

index 5536fb57656491e9eda89cc4bf969d04bdc51324..8b75a2ada4e5f521e314eafea921bc8393ebeac6 100644 (file)
@@ -9,19 +9,19 @@ Upstream-Status: Pending
 Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
 Signed-off-by: Shane Wang <shane.wang@intel.com>
 
-Index: iproute2-4.11.0/configure
+Index: iproute2-4.14.1/configure
 ===================================================================
---- iproute2-4.11.0.orig/configure
-+++ iproute2-4.11.0/configure
+--- iproute2-4.14.1.orig/configure
++++ iproute2-4.14.1/configure
 @@ -2,6 +2,7 @@
  # This is not an autoconf generated configure
  #
  INCLUDE=${1:-"$PWD/include"}
 +SYSROOT=$1
  
- # Make a temp directory in build tree.
- TMPDIR=$(mktemp -d config.XXXXXX)
-@@ -192,7 +193,7 @@ check_ipt_lib_dir()
+ # Output file which is input to Makefile
+ CONFIG=config.mk
+@@ -195,7 +196,7 @@ check_ipt_lib_dir()
                return
        fi