summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
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-02-23 22:35:01 +0000
commit2d2f017240cd2f0ee02635cf0a7d2a612b946ac1 (patch)
treedf546f3e19e8b3adc94bd19135929cb8d87700f6 /meta/recipes-devtools
parentb28a214f2e2eb1dfc64f1906703ab4b59d0df546 (diff)
downloadpoky-2d2f017240cd2f0ee02635cf0a7d2a612b946ac1.tar.gz
rsync: Fix a file sorting determinism issue
(From OE-Core rev: f6b7f395ae2d98363e365d31f5e95ce41a12e5b4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/rsync/files/determism.patch28
-rw-r--r--meta/recipes-devtools/rsync/rsync_3.2.3.bb1
2 files changed, 29 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
diff --git a/meta/recipes-devtools/rsync/rsync_3.2.3.bb b/meta/recipes-devtools/rsync/rsync_3.2.3.bb
index b7205e5bde..c08f93884f 100644
--- a/meta/recipes-devtools/rsync/rsync_3.2.3.bb
+++ b/meta/recipes-devtools/rsync/rsync_3.2.3.bb
@@ -12,6 +12,7 @@ DEPENDS = "popt"
12SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \ 12SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \
13 file://rsyncd.conf \ 13 file://rsyncd.conf \
14 file://makefile-no-rebuild.patch \ 14 file://makefile-no-rebuild.patch \
15 file://determism.patch \
15 " 16 "
16 17
17SRC_URI[sha256sum] = "becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e" 18SRC_URI[sha256sum] = "becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e"