mirror of
https://git.yoctoproject.org/poky
synced 2026-04-17 09:32:12 +02:00
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>
This commit is contained in:
28
meta/recipes-devtools/rsync/files/determism.patch
Normal file
28
meta/recipes-devtools/rsync/files/determism.patch
Normal file
@@ -0,0 +1,28 @@
|
||||
The Makefile calls awk on a "*.c" glob. The results of this glob are sorted
|
||||
but the order depends on the locale settings, particularly whether
|
||||
"util.c" and "util2.c" sort before or after each other. In en_US.UTF-8
|
||||
they sort one way, in C, they sort the other. The sorting order changes
|
||||
the output binaries. The behaviour also changes dependning on whether
|
||||
SHELL (/bin/sh) is dash or bash.
|
||||
|
||||
Specify a C locale setting to be deterministic.
|
||||
|
||||
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Upstream-Status: Pending
|
||||
|
||||
Index: rsync-3.2.3/Makefile.in
|
||||
===================================================================
|
||||
--- rsync-3.2.3.orig/Makefile.in
|
||||
+++ rsync-3.2.3/Makefile.in
|
||||
@@ -26,6 +26,11 @@ MKDIR_P=@MKDIR_P@
|
||||
VPATH=$(srcdir)
|
||||
SHELL=/bin/sh
|
||||
|
||||
+# We use globbing in commands, need to be deterministic
|
||||
+unexport LC_ALL
|
||||
+LC_COLLATE=C
|
||||
+export LC_COLLATE
|
||||
+
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .c .o
|
||||
|
||||
@@ -12,6 +12,7 @@ DEPENDS = "popt"
|
||||
SRC_URI = "https://download.samba.org/pub/${BPN}/src/${BP}.tar.gz \
|
||||
file://rsyncd.conf \
|
||||
file://makefile-no-rebuild.patch \
|
||||
file://determism.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e"
|
||||
|
||||
Reference in New Issue
Block a user