i2c-tools: 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 <ross.burton@intel.com>
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch b/meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch
index e47c02ab7f5fb16749e7b31a8d8131e839b605e5..33cf2d42a87c7ce17395fbe9d9f96f2712ac1b14 100644 (file)
--- a/meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch
+++ b/meta/recipes-devtools/i2c-tools/files/0001-tools-Module.mk-Add-missing-dependencies.patch
@@ -17,12 +17,12 @@ Signed-off-by: Maxin B. John <maxin.john@intel.com>
  tools/Module.mk | 10 +++++-----
  2 files changed, 12 insertions(+), 5 deletions(-)
 
-diff --git a/lib/Module.mk b/lib/Module.mk
-index 8a58f5b..67afe91 100644
---- a/lib/Module.mk
-+++ b/lib/Module.mk
-@@ -37,6 +37,13 @@ ifeq ($(BUILD_STATIC_LIB),1)
- LIB_TARGETS   += $(LIB_STLIBNAME)
+Index: i2c-tools-4.0/lib/Module.mk
+===================================================================
+--- i2c-tools-4.0.orig/lib/Module.mk
++++ i2c-tools-4.0/lib/Module.mk
+@@ -35,6 +35,13 @@ LIB_TARGETS += $(LIB_STLIBNAME)
+ LIB_OBJECTS   += smbus.ao
  endif
  
 +# Library file to link against (static or dynamic)
@@ -35,11 +35,11 @@ index 8a58f5b..67afe91 100644
  #
  # Libraries
  #
-diff --git a/tools/Module.mk b/tools/Module.mk
-index 6421a23..609de7a 100644
---- a/tools/Module.mk
-+++ b/tools/Module.mk
-@@ -24,19 +24,19 @@ TOOLS_TARGETS      := i2cdetect i2cdump i2cset i2cget i2ctransfer
+Index: i2c-tools-4.0/tools/Module.mk
+===================================================================
+--- i2c-tools-4.0.orig/tools/Module.mk
++++ i2c-tools-4.0/tools/Module.mk
+@@ -24,19 +24,19 @@ TOOLS_TARGETS      := i2cdetect i2cdump i2cse
  # Programs
  #
  
@@ -64,6 +64,3 @@ index 6421a23..609de7a 100644
        $(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
  
  #
--- 
-2.4.0
-