diff options
Diffstat (limited to 'meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch')
-rw-r--r-- | meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch new file mode 100644 index 0000000000..945979bc8a --- /dev/null +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/fix-reproducibility.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | Fix reproducibility issues in opkg-build | ||
2 | |||
3 | There is a sorting problem with opkg-build where the ipk generated is depending | ||
4 | upon the order of files on disk. The reason is the --sort option to tar only | ||
5 | influences the orders of files tar reads, not those passed by the -T option. | ||
6 | |||
7 | Add in a sort call to resolve this issue. To ensure consistent sorting we | ||
8 | also need to force to a specific locale (C) else the results are still not | ||
9 | deterministic. | ||
10 | |||
11 | RP 2020/2/5 | ||
12 | |||
13 | Upstream-Status: Submitted [https://groups.google.com/forum/#!topic/opkg-devel/YttZ73NLrYQ] | ||
14 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
15 | |||
16 | Index: opkg-utils-0.4.2/opkg-build | ||
17 | =================================================================== | ||
18 | --- opkg-utils-0.4.2.orig/opkg-build | ||
19 | +++ opkg-utils-0.4.2/opkg-build | ||
20 | @@ -305,8 +305,10 @@ if [ ! -z "$SOURCE_DATE_EPOCH" ]; then | ||
21 | mtime_args="--mtime=@$build_date --clamp-mtime" | ||
22 | fi | ||
23 | |||
24 | -( cd $pkg_dir/$CONTROL && find . -type f > $tmp_dir/control_list ) | ||
25 | -( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print > $tmp_dir/file_list ) | ||
26 | +export LANG=C | ||
27 | +export LC_ALL=C | ||
28 | +( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list ) | ||
29 | +( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list ) | ||
30 | ( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) | ||
31 | ( 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 ) | ||
32 | rm $tmp_dir/file_list | ||