mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

opkg-utils: refresh patches

Browse Source 
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.

(From OE-Core rev: ca733ba0e28d6d4c199e149ce8ae428397dfa51f)

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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2018-03-09 20:55:50 +02:00
committed by Richard Purdie
parent 19e4de6eba
commit 2a0f0adf05
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/opkg-utils/opkg-utils/0001-Only-use-sort-name-on-versions-of-tar-which-support-.patch
+5 -8
View File
@@ -11,10 +11,10 @@ Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@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
meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch
+5 -8
View File
@@ -12,10 +12,10 @@ Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@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