diff options
| author |   Ross Burton <ross.burton@intel.com> | 2018-03-09 20:55:50 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-11 06:25:21 -0700 |
| commit | ca733ba0e28d6d4c199e149ce8ae428397dfa51f (patch) | |
| tree | 6b874a8941bf2b04d3dd9feb916b058c39842490 /meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch | |
| parent | 87118e6a2ed6da1ceaf484c326ec6d0ac8c1b8be (diff) | |
| download | openembedded-core-contrib-ca733ba0e28d6d4c199e149ce8ae428397dfa51f.tar.gz | |
opkg-utils: 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>
Diffstat (limited to 'meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch')
| -rw-r--r-- | meta/recipes-devtools/opkg-utils/opkg-utils/0002-opkg-build-Use-local-time-for-build_date-since-opkg-.patch | 13 |
1 files changed, 5 insertions, 8 deletions
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 b42d7878c9..0a7403d674 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.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 - |