From: Ross Burton <ross.bur...@intel.com> 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.bur...@intel.com> Signed-off-by: Alexander Kanavin <alexander.kana...@linux.intel.com> --- ...ly-use-sort-name-on-versions-of-tar-which-support-.patch | 13 +++++-------- ...kg-build-Use-local-time-for-build_date-since-opkg-.patch | 13 +++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch index 7de4b7f723c..203c5850533 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch @@ -11,10 +11,10 @@ Signed-off-by: Alejandro del Castillo <alejandro.delcasti...@ni.com> opkg-build | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -diff --git a/opkg-build b/opkg-build -index 265906f..094d69f 100755 ---- a/opkg-build -+++ b/opkg-build +Index: opkg-utils-0.3.6/opkg-build +=================================================================== +--- opkg-utils-0.3.6.orig/opkg-build ++++ opkg-utils-0.3.6/opkg-build @@ -232,6 +232,11 @@ if [ $compressor = "gzip" ] ; then compressorargs=$zipargs fi @@ -40,13 +40,10 @@ index 265906f..094d69f 100755 echo "2.0" > $tmp_dir/debian-binary @@ -296,7 +301,7 @@ rm -f $pkg_file if [ "$outer" = "ar" ] ; then - ( cd $tmp_dir && ar -crfD $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) + ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) else - ( cd $tmp_dir && tar -c --sort=name --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) + ( cd $tmp_dir && tar -c $tsortargs --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) fi rm $tmp_dir/debian-binary $tmp_dir/data.tar.$cext $tmp_dir/control.tar.gz --- -2.16.1 - diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch index b42d7878c9b..0a7403d6747 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch @@ -12,10 +12,10 @@ Signed-off-by: Alejandro del Castillo <alejandro.delcasti...@ni.com> opkg-build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/opkg-build b/opkg-build -index 094d69f..0050c2b 100755 ---- a/opkg-build -+++ b/opkg-build +Index: opkg-utils-0.3.6/opkg-build +=================================================================== +--- opkg-utils-0.3.6.orig/opkg-build ++++ opkg-utils-0.3.6/opkg-build @@ -282,11 +282,11 @@ fi tmp_dir=$dest_dir/IPKG_BUILD.$$ mkdir $tmp_dir @@ -33,13 +33,10 @@ index 094d69f..0050c2b 100755 echo "2.0" > $tmp_dir/debian-binary @@ -301,7 +301,7 @@ rm -f $pkg_file if [ "$outer" = "ar" ] ; then - ( cd $tmp_dir && ar -crfD $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) + ( cd $tmp_dir && ar -crf $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) else - ( cd $tmp_dir && tar -c $tsortargs --mtime=$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) + ( cd $tmp_dir && tar -c $tsortargs --mtime="$build_date" $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) fi rm $tmp_dir/debian-binary $tmp_dir/data.tar.$cext $tmp_dir/control.tar.gz --- -2.16.1 - -- 2.16.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core