diff options
Diffstat (limited to 'poky/meta/recipes-devtools/git')
| -rw-r--r-- | poky/meta/recipes-devtools/git/git.inc | 3 | ||||
| -rw-r--r-- | poky/meta/recipes-devtools/git/git/fixsort.patch | 31 | ||||
| -rw-r--r-- | poky/meta/recipes-devtools/git/git_2.30.1.bb (renamed from poky/meta/recipes-devtools/git/git_2.30.0.bb) | 4 |
3 files changed, 35 insertions, 3 deletions
diff --git a/poky/meta/recipes-devtools/git/git.inc b/poky/meta/recipes-devtools/git/git.inc index 544e23c84..586a305b2 100644 --- a/poky/meta/recipes-devtools/git/git.inc +++ b/poky/meta/recipes-devtools/git/git.inc @@ -7,7 +7,8 @@ DEPENDS = "openssl curl zlib expat" PROVIDES_append_class-native = " git-replacement-native" 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}" diff --git a/poky/meta/recipes-devtools/git/git/fixsort.patch b/poky/meta/recipes-devtools/git/git/fixsort.patch new file mode 100644 index 000000000..07a487e8c --- /dev/null +++ b/poky/meta/recipes-devtools/git/git/fixsort.patch @@ -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, diff --git a/poky/meta/recipes-devtools/git/git_2.30.0.bb b/poky/meta/recipes-devtools/git/git_2.30.1.bb index 93f8ed298..bc1635ada 100644 --- a/poky/meta/recipes-devtools/git/git_2.30.0.bb +++ b/poky/meta/recipes-devtools/git/git_2.30.1.bb @@ -5,5 +5,5 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "d24c4fa2a658318c2e66e25ab67cc30038a35696d2d39e6b12ceccf024de1e5e" -SRC_URI[manpages.sha256sum] = "e23035ae232c9a5eda57db258bc3b7f1c1060cfd66920f92c7d388b6439773a6" +SRC_URI[tarball.sha256sum] = "23a3e53f0d2dd3e62a8147b24a1a91d6ffe95b92123ef4dbae04e9a6205e71c0" +SRC_URI[manpages.sha256sum] = "db323e1b242e9d0337363b1e538c8b879e4c46eedbf94d3bee9e65dab6d49138" |