> -----Original Message----- > From: [email protected] > <[email protected]> On Behalf Of Richard Purdie > Sent: den 21 februari 2021 23:17 > To: [email protected] > Subject: [OE-core] [PATCH 1/7] rsync: Fix a file sorting determinism issue > > Signed-off-by: Richard Purdie <[email protected]> > --- > .../rsync/files/determism.patch | 28 +++++++++++++++++++ > meta/recipes-devtools/rsync/rsync_3.2.3.bb | 1 + > 2 files changed, 29 insertions(+) > create mode 100644 meta/recipes-devtools/rsync/files/determism.patch > > diff --git a/meta/recipes-devtools/rsync/files/determism.patch > b/meta/recipes-devtools/rsync/files/determism.patch > new file mode 100644 > index 00000000000..53a4ca75058 > --- /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 <[email protected]> > +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
Rather than using a patch, can't this be achieved by doing: export LC_COLLATE=C or: export LC_ALL=C in the recipe? > ++ > + .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 b7205e5bdef..c08f93884f5 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" > -- > 2.27.0 //Peter
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#148486): https://lists.openembedded.org/g/openembedded-core/message/148486 Mute This Topic: https://lists.openembedded.org/mt/80811235/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
