diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-17 17:57:13 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-10 00:24:25 +0000 |
commit | 0d87f87894faa67030fe05d29a264c9ea90c862f (patch) | |
tree | 6567e33eef03e89f3e97a09dc18cc43118c79411 /meta | |
parent | 51c48e60f34e8a07191db1995482d3eace4df97a (diff) | |
download | poky-0d87f87894faa67030fe05d29a264c9ea90c862f.tar.gz |
git: Fix determinism issue
(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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/git/git.inc | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/git/git/fixsort.patch | 31 |
2 files changed, 33 insertions, 1 deletions
diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 544e23c844..586a305b27 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc | |||
@@ -7,7 +7,8 @@ DEPENDS = "openssl curl zlib expat" | |||
7 | PROVIDES_append_class-native = " git-replacement-native" | 7 | PROVIDES_append_class-native = " git-replacement-native" |
8 | 8 | ||
9 | SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ | 9 | SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \ |
10 | ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages" | 10 | ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages \ |
11 | file://fixsort.patch" | ||
11 | 12 | ||
12 | S = "${WORKDIR}/git-${PV}" | 13 | S = "${WORKDIR}/git-${PV}" |
13 | 14 | ||
diff --git a/meta/recipes-devtools/git/git/fixsort.patch b/meta/recipes-devtools/git/git/fixsort.patch new file mode 100644 index 0000000000..07a487e8ca --- /dev/null +++ b/meta/recipes-devtools/git/git/fixsort.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | [PATCH] generate-configlist.sh: Fix determinism issue | ||
2 | |||
3 | Currently git binaries are not entirely reproducible, at least partly | ||
4 | due to config-list.h differing in order depending on the system's | ||
5 | locale settings. Under different locales, the entries: | ||
6 | |||
7 | "sendemail.identity", | ||
8 | "sendemail.<identity>.*", | ||
9 | |||
10 | would differ in order for example and this leads to differences in | ||
11 | the debug symbols for the binaries. | ||
12 | |||
13 | This can be fixed by specifying the C locale for the sort in the | ||
14 | shell script generating the header. | ||
15 | |||
16 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
17 | Upstream-Status: Submitted [https://public-inbox.org/git/f029a942dd3d50d85e60bd37d8e454524987842f.camel@linuxfoundation.org/T/#u] | ||
18 | |||
19 | Index: git-2.30.0/generate-configlist.sh | ||
20 | =================================================================== | ||
21 | --- git-2.30.0.orig/generate-configlist.sh | ||
22 | +++ git-2.30.0/generate-configlist.sh | ||
23 | @@ -9,7 +9,7 @@ static const char *config_name_list[] = | ||
24 | EOF | ||
25 | grep -h '^[a-zA-Z].*\..*::$' Documentation/*config.txt Documentation/config/*.txt | | ||
26 | sed '/deprecated/d; s/::$//; s/, */\n/g' | | ||
27 | - sort | | ||
28 | + LC_ALL=C sort | | ||
29 | sed 's/^.*$/ "&",/' | ||
30 | cat <<EOF | ||
31 | NULL, | ||