summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rsync/files
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-21 09:45:48 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-10 00:24:26 +0000
commit462b40d8192e5afcd9c43e49ebfa5a90cd94d16c (patch)
tree6644e5332a59e52dc01d8f53e5c903ebd6b5abf9 /meta/recipes-devtools/rsync/files
parent45d0de3cdf33a0bc7f961d5824471132d896b0dc (diff)
downloadpoky-462b40d8192e5afcd9c43e49ebfa5a90cd94d16c.tar.gz
rsync: Fix a file sorting determinism issue
(From OE-Core rev: 52250e330aa5c84efd13b166530c1a89656c904d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit f6b7f395ae2d98363e365d31f5e95ce41a12e5b4) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rsync/files')
-rw-r--r--meta/recipes-devtools/rsync/files/determism.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rsync/files/determism.patch b/meta/recipes-devtools/rsync/files/determism.patch
new file mode 100644
index 0000000000..53a4ca7505
--- /dev/null
+++ b/meta/recipes-devtools/rsync/files/determism.patch
@@ -0,0 +1,28 @@
1The Makefile calls awk on a "*.c" glob. The results of this glob are sorted
2but the order depends on the locale settings, particularly whether
3"util.c" and "util2.c" sort before or after each other. In en_US.UTF-8
4they sort one way, in C, they sort the other. The sorting order changes
5the output binaries. The behaviour also changes dependning on whether
6SHELL (/bin/sh) is dash or bash.
7
8Specify a C locale setting to be deterministic.
9
10Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
11Upstream-Status: Pending
12
13Index: rsync-3.2.3/Makefile.in
14===================================================================
15--- rsync-3.2.3.orig/Makefile.in
16+++ rsync-3.2.3/Makefile.in
17@@ -26,6 +26,11 @@ MKDIR_P=@MKDIR_P@
18 VPATH=$(srcdir)
19 SHELL=/bin/sh
20
21+# We use globbing in commands, need to be deterministic
22+unexport LC_ALL
23+LC_COLLATE=C
24+export LC_COLLATE
25+
26 .SUFFIXES:
27 .SUFFIXES: .c .o
28