rdfind: Upgrade 1.3.4 -> 1.4.1
PATCH 1/1 rdfind: Upgrade 1.3.4 -> 1.4.1
Remove patch for issue fixed upstream.
Signed-off-by Adrian Bunk <[email protected]>
---
.../rdfind/files/reproducible_build.patch | 46 -------------------
.../{rdfind_1.3.4.bb => rdfind_1.4.1.bb} | 5 +-
2 files changed, 2 insertions(+), 49 deletions(-)
delete mode 100644 meta-oe/recipes-support/rdfind/files/reproducible_build.patch
rename meta-oe/recipes-support/rdfind/{rdfind_1.3.4.bb => rdfind_1.4.1.bb} (62%)meta-oe/recipes-support/rdfind/files/reproducible_build.patch deleted +0 -46
@@ -1,46 +0,0 @@ -Description: sort the filelist when it is complete to get reproducible behaviour -Author: Reiner Herrmann <[email protected]> -Bug-Debian: https://bugs.debian.org/795790 - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy <[email protected]> - -Index: rdfind-1.3.4/Fileinfo.hh -=================================================================== ---- rdfind-1.3.4.orig/Fileinfo.hh -+++ rdfind-1.3.4/Fileinfo.hh -@@ -189,6 +189,10 @@ public: - static bool compareondepth(const Fileinfo &a, const Fileinfo &b) - {return (a.depth() < b.depth());} - -+ //returns true if a has lower filename than b) -+ static bool compareonfilename(const Fileinfo &a, const Fileinfo &b) -+ {return (a.name().compare(b.name()) < 0);} -+ - //fills with bytes from the file. if lasttype is supplied, - //it is used to see if the file needs to be read again - useful if - //file is shorter than the length of the bytes field. -@@ -235,6 +239,10 @@ public: - static bool equaldepth(const Fileinfo &a, const Fileinfo &b) - {return (a.depth()==b.depth());} - -+ //returns true if filenames are equal -+ static bool equalfilename(const Fileinfo &a, const Fileinfo &b) -+ {return (a.name()==b.name());} -+ - //returns true if file is a regular file. call readfileinfo first! - bool isRegularFile() {return m_info.is_file;} - -Index: rdfind-1.3.4/rdfind.cc -=================================================================== ---- rdfind-1.3.4.orig/rdfind.cc -+++ rdfind-1.3.4/rdfind.cc -@@ -349,6 +349,7 @@ int main(int narg, char *argv[]) - cout<<dryruntext<<"Now have "<<filelist1.size()<<" files in total."<<endl; - - -+ gswd.sortlist(&Fileinfo::compareonfilename,&Fileinfo::equalfilename); - - //mark files with a unique number - gswd.markitems();
meta-oe/recipes-support/rdfind/rdfind_1.4.1.bb renamed from meta-oe/recipes-support/rdfind/rdfind_1.3.4.bb +2 -3
@@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" DEPENDS = "nettle" SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz \ - file://reproducible_build.patch \ " -SRC_URI[md5sum] = "97c0cb35933588413583c61d3b5f9adf" -SRC_URI[sha256sum] = "a5f0b3f72093d927b93898c993479b35682cccb47f7393fb72bd4803212fcc7d" +SRC_URI[md5sum] = "180418c863b861d1df221bc486a07ce7" +SRC_URI[sha256sum] = "30c613ec26eba48b188d2520cfbe64244f3b1a541e60909ce9ed2efb381f5e8c" inherit autotools
Signature · 1 line
2.17.1
license checksum failures seen
https://errors.yoctoproject.org/Errors/Details/240051/
Quoted 84 lines · Adrian Bunk
Remove patch for issue fixed upstream.
Signed-off-by Adrian Bunk <[email protected]>--- .../rdfind/files/reproducible_build.patch | 46 ------------------- .../{rdfind_1.3.4.bb => rdfind_1.4.1.bb} | 5 +- 2 files changed, 2 insertions(+), 49 deletions(-)delete mode 100644
meta-oe/recipes-support/rdfind/files/reproducible_build.patchrename meta-oe/recipes-support/rdfind/{rdfind_1.3.4.bb => rdfind_1.4.1.bb} (62%)meta-oe/recipes-support/rdfind/files/reproducible_build.patch deleted +0
-46@@ -1,46 +0,0 @@ -Description: sort the filelist when it is complete to get reproducible behaviour -Author: Reiner Herrmann <[email protected]> -Bug-Debian: https://bugs.debian.org/795790 - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy <[email protected]> - -Index: rdfind-1.3.4/Fileinfo.hh -=================================================================== ---- rdfind-1.3.4.orig/Fileinfo.hh -+++ rdfind-1.3.4/Fileinfo.hh -@@ -189,6 +189,10 @@ public: - static bool compareondepth(const Fileinfo &a, const Fileinfo &b) - {return (a.depth() < b.depth());} - -+ //returns true if a has lower filename than b) -+ static bool compareonfilename(const Fileinfo &a, const Fileinfo &b) -+ {return (a.name().compare(b.name()) < 0);} -+ - //fills with bytes from the file. if lasttype is supplied, - //it is used to see if the file needs to be read again - useful if - //file is shorter than the length of the bytes field. -@@ -235,6 +239,10 @@ public: - static bool equaldepth(const Fileinfo &a, const Fileinfo &b) - {return (a.depth()==b.depth());} - -+ //returns true if filenames are equal -+ static bool equalfilename(const Fileinfo &a, const Fileinfo &b) -+ {return (a.name()==b.name());} -+ - //returns true if file is a regular file. call readfileinfo first! - bool isRegularFile() {return m_info.is_file;} - -Index: rdfind-1.3.4/rdfind.cc -=================================================================== ---- rdfind-1.3.4.orig/rdfind.cc -+++ rdfind-1.3.4/rdfind.cc -@@ -349,6 +349,7 @@ int main(int narg, char *argv[]) - cout<<dryruntext<<"Now have "<<filelist1.size()<<" files in total."<<endl; - - -+ gswd.sortlist(&Fileinfo::compareonfilename,&Fileinfo::equalfilename); - - //mark files with a unique number - gswd.markitems();meta-oe/recipes-support/rdfind/rdfind_1.4.1.bb renamed from meta-oe/recipes-support/rdfind/rdfind_1.3.4.bb +2
-3@@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" DEPENDS = "nettle" SRC_URI = "https://rdfind.pauldreik.se/${BP}.tar.gz \ - file://reproducible_build.patch \ " -SRC_URI[md5sum] = "97c0cb35933588413583c61d3b5f9adf" -SRC_URI[sha256sum] = "a5f0b3f72093d927b93898c993479b35682cccb47f7393fb72bd4803212fcc7d" +SRC_URI[md5sum] = "180418c863b861d1df221bc486a07ce7" +SRC_URI[sha256sum] = "30c613ec26eba48b188d2520cfbe64244f3b1a541e60909ce9ed2efb381f5e8c" inherit autotools