From f369e9dce9dc2bcd89b2492545112da78aca690e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 15 Nov 2017 16:47:16 +0000 Subject: iproute2: refresh patches 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 --- .../iproute2/iproute2/configure-cross.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'meta') diff --git a/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch index 866609ca99..5536fb5765 100644 --- a/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch +++ b/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch @@ -9,19 +9,19 @@ Upstream-Status: Pending Signed-off-by: Koen Kooi Signed-off-by: Shane Wang -Index: iproute2-3.7.0/configure +Index: iproute2-4.11.0/configure =================================================================== ---- iproute2-3.7.0.orig/configure -+++ iproute2-3.7.0/configure +--- iproute2-4.11.0.orig/configure ++++ iproute2-4.11.0/configure @@ -2,6 +2,7 @@ - # This is not an autconf generated configure + # 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) -@@ -158,7 +159,7 @@ check_ipt_lib_dir() +@@ -192,7 +193,7 @@ check_ipt_lib_dir() return fi -- cgit 1.2.3-korg