Drop one patch that was submitted and merged upstream. Signed-off-by: Richard Purdie <[email protected]> --- .../opkg-utils/fix-reproducibility.patch | 32 ------------------- ...pkg-utils_0.4.2.bb => opkg-utils_0.4.3.bb} | 7 ++-- 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch rename meta/recipes-devtools/opkg-utils/{opkg-utils_0.4.2.bb => opkg-utils_0.4.3.bb} (91%)
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch deleted file mode 100644 index 945979bc8a7..00000000000 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fix reproducibility issues in opkg-build - -There is a sorting problem with opkg-build where the ipk generated is depending -upon the order of files on disk. The reason is the --sort option to tar only -influences the orders of files tar reads, not those passed by the -T option. - -Add in a sort call to resolve this issue. To ensure consistent sorting we -also need to force to a specific locale (C) else the results are still not -deterministic. - -RP 2020/2/5 - -Upstream-Status: Submitted [https://groups.google.com/forum/#!topic/opkg-devel/YttZ73NLrYQ] -Signed-off-by: Richard Purdie <[email protected]> - -Index: opkg-utils-0.4.2/opkg-build -=================================================================== ---- opkg-utils-0.4.2.orig/opkg-build -+++ opkg-utils-0.4.2/opkg-build -@@ -305,8 +305,10 @@ if [ ! -z "$SOURCE_DATE_EPOCH" ]; then - mtime_args="--mtime=@$build_date --clamp-mtime" - fi - --( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list ) --( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print > $tmp_dir/file_list ) -+export LANG=C -+export LC_ALL=C -+( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list ) -+( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list ) - ( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) - ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz ) - rm $tmp_dir/file_list diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.3.bb similarity index 91% rename from meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb rename to meta/recipes-devtools/opkg-utils/opkg-utils_0.4.3.bb index 9315240190f..68d069ebd1d 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.2.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.3.bb @@ -7,13 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://opkg.py;beginline=2;endline=18;md5=ffa11ff3c15eb31c6a7ceaa00cc9f986" PROVIDES += "${@bb.utils.contains('PACKAGECONFIG', 'update-alternatives', 'virtual/update-alternatives', '', d)}" -SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz \ - file://fix-reproducibility.patch \ -" +SRC_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/${BPN}/snapshot/${BPN}-${PV}.tar.gz"; UPSTREAM_CHECK_URI = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/refs/"; -SRC_URI[md5sum] = "cc210650644fcb9bba06ad5ec95a63ec" -SRC_URI[sha256sum] = "5929ad87d541789e0b82d626db01a1201ac48df6f49f2262fcfb86cf815e5d6c" +SRC_URI[sha256sum] = "046517600fb0aed6c4645edefe02281f4fa2f1c02f71596152d93172452c0b01" TARGET_CC_ARCH += "${LDFLAGS}" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#140041): https://lists.openembedded.org/g/openembedded-core/message/140041 Mute This Topic: https://lists.openembedded.org/mt/75156879/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
