diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-21 09:45:48 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-10 00:24:18 +0000 |
| commit | 52250e330aa5c84efd13b166530c1a89656c904d (patch) | |
| tree | 91a5bdcbe95e2ef9317e24be144aad1f4363cd48 | |
| parent | 247e950a69fd0dc48913172a0e96f4efedffff3e (diff) | |
| download | openembedded-core-contrib-52250e330aa5c84efd13b166530c1a89656c904d.tar.gz | |
rsync: Fix a file sorting determinism issue
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit f6b7f395ae2d98363e365d31f5e95ce41a12e5b4)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
| -rw-r--r-- | meta/recipes-devtools/rsync/files/determism.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-devtools/rsync/rsync_3.2.3.bb | 1 |
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 @@ +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 + diff --git a/meta/recipes-devtools/rsync/rsync_3.2.3.bb b/meta/recipes-devtools/rsync/rsync_3.2.3.bb index 375efa0dea..08778ec908 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" 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" |