mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 01:19:52 +00:00
Code Issues Projects Releases Wiki Activity

git: Fix determinism issue

Browse Source 
(From OE-Core rev: 9c6b399081c2f7fe75d8bee003ff614673023be8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9ae740939f8315c64fe7571f912404127a29dc89)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2021-02-17 17:57:13 +00:00
parent 51c48e60f3
commit 0d87f87894
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/git/git.inc
+2 -1
View File
@@ -7,7 +7,8 @@ DEPENDS = "openssl curl zlib expat"
PROVIDES_append_class-native = " git-replacement-native" PROVIDES_append_class-native = " git-replacement-native"
SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \
${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages" ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages \
file://fixsort.patch"
S = "${WORKDIR}/git-${PV}" S = "${WORKDIR}/git-${PV}"
meta/recipes-devtools/git/git/fixsort.patch
+31
View File
@@ -0,0 +1,31 @@
[PATCH] generate-configlist.sh: Fix determinism issue
Currently git binaries are not entirely reproducible, at least partly
due to config-list.h differing in order depending on the system's
locale settings. Under different locales, the entries:
"sendemail.identity",
"sendemail.<identity>.*",
would differ in order for example and this leads to differences in
the debug symbols for the binaries.
This can be fixed by specifying the C locale for the sort in the
shell script generating the header.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upstream-Status: Submitted [https://public-inbox.org/git/f029a942dd3d50d85e60bd37d8e454524987842f.camel@linuxfoundation.org/T/#u]
Index: git-2.30.0/generate-configlist.sh
===================================================================
--- git-2.30.0.orig/generate-configlist.sh
+++ git-2.30.0/generate-configlist.sh
@@ -9,7 +9,7 @@ static const char *config_name_list[] =
EOF
grep -h '^[a-zA-Z].*\..*::$' Documentation/*config.txt Documentation/config/*.txt |
sed '/deprecated/d; s/::$//; s/, */\n/g' |
- sort |
+ LC_ALL=C sort |
sed 's/^.*$/ "&",/'
cat <<EOF
NULL,