diff options
Diffstat (limited to 'meta/recipes-devtools/rsync/files/determism.patch')
-rw-r--r-- | meta/recipes-devtools/rsync/files/determism.patch | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/meta/recipes-devtools/rsync/files/determism.patch b/meta/recipes-devtools/rsync/files/determism.patch index e3494fdded..f915d658c8 100644 --- a/meta/recipes-devtools/rsync/files/determism.patch +++ b/meta/recipes-devtools/rsync/files/determism.patch | |||
@@ -1,7 +1,12 @@ | |||
1 | From 41b859a9df9611b7b3f6cbe28af47118d947080f Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Sun, 21 Feb 2021 09:45:48 +0000 | ||
4 | Subject: [PATCH] rsync: Fix a file sorting determinism issue | ||
5 | |||
1 | The Makefile calls awk on a "*.c" glob. The results of this glob are sorted | 6 | The Makefile calls awk on a "*.c" glob. The results of this glob are sorted |
2 | but the order depends on the locale settings, particularly whether | 7 | but 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 | 8 | "util.c" and "util2.c" sort before or after each other. In en_US.UTF-8 |
4 | they sort one way, in C, they sort the other. The sorting order changes | 9 | they sort one way, in C, they sort the other. The sorting order changes |
5 | the output binaries. The behaviour also changes dependning on whether | 10 | the output binaries. The behaviour also changes dependning on whether |
6 | SHELL (/bin/sh) is dash or bash. | 11 | SHELL (/bin/sh) is dash or bash. |
7 | 12 | ||
@@ -15,12 +20,15 @@ Upstream-Status: Backport [ish, see below] | |||
15 | After discussion upstream renamed util.c to util1.c which avoids the problem | 20 | After discussion upstream renamed util.c to util1.c which avoids the problem |
16 | in a different way. This patch can be dropped when we upgrade to include: | 21 | in a different way. This patch can be dropped when we upgrade to include: |
17 | https://github.com/WayneD/rsync/commit/d3085f7add38a5cf833a0b31cb0637ff46c80f8d | 22 | https://github.com/WayneD/rsync/commit/d3085f7add38a5cf833a0b31cb0637ff46c80f8d |
23 | --- | ||
24 | Makefile.in | 5 +++++ | ||
25 | 1 file changed, 5 insertions(+) | ||
18 | 26 | ||
19 | Index: rsync-3.2.3/Makefile.in | 27 | diff --git a/Makefile.in b/Makefile.in |
20 | =================================================================== | 28 | index 1d13e8c..2c5cf99 100644 |
21 | --- rsync-3.2.3.orig/Makefile.in | 29 | --- a/Makefile.in |
22 | +++ rsync-3.2.3/Makefile.in | 30 | +++ b/Makefile.in |
23 | @@ -26,6 +26,11 @@ MKDIR_P=@MKDIR_P@ | 31 | @@ -27,6 +27,11 @@ MKDIR_P=@MKDIR_P@ |
24 | VPATH=$(srcdir) | 32 | VPATH=$(srcdir) |
25 | SHELL=/bin/sh | 33 | SHELL=/bin/sh |
26 | 34 | ||