[13/16] git: upgrade 2.34.0 -> 2.34.1

Message ID 20211207130703.3196805-13-alex@linutronix.de
State Accepted, archived
Commit 83635a1925e2d69344ea3f7b66f6b735b48f9eb7
Headers show
Series [01/16] insane.bbclass: do not hardcode oe-core path in upstream-status check | expand

Commit Message

Alexander Kanavin Dec. 7, 2021, 1:07 p.m. UTC
The issue with COMPUTE_HEADER_DEPENDENCIES
has been reported upstream, as it causes build races:
https://lore.kernel.org/git/20211207113101.69686-1-alex.kanavin@gmail.com/T/#u

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/git/git.inc                          | 1 +
 meta/recipes-devtools/git/{git_2.34.0.bb => git_2.34.1.bb} | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/git/{git_2.34.0.bb => git_2.34.1.bb} (51%)

Patch

diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc
index 9dd2cf4549..1d74270fdd 100644
--- a/meta/recipes-devtools/git/git.inc
+++ b/meta/recipes-devtools/git/git.inc
@@ -33,6 +33,7 @@  inherit autotools-brokensep perlnative bash-completion
 
 EXTRA_OEMAKE = "NO_PYTHON=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
 EXTRA_OEMAKE += "'PERL_PATH=/usr/bin/env perl'"
+EXTRA_OEMAKE += "COMPUTE_HEADER_DEPENDENCIES=no"
 EXTRA_OEMAKE:append:class-native = " NO_CROSS_DIRECTORY_HARDLINKS=1"
 
 do_compile:prepend () {
diff --git a/meta/recipes-devtools/git/git_2.34.0.bb b/meta/recipes-devtools/git/git_2.34.1.bb
similarity index 51%
rename from meta/recipes-devtools/git/git_2.34.0.bb
rename to meta/recipes-devtools/git/git_2.34.1.bb
index fa9299b494..24081764a2 100644
--- a/meta/recipes-devtools/git/git_2.34.0.bb
+++ b/meta/recipes-devtools/git/git_2.34.1.bb
@@ -5,6 +5,5 @@  EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
                  "
 EXTRA_OEMAKE += "NO_GETTEXT=1"
 
-SRC_URI[tarball.sha256sum] = "0ce6222bfd31938b29360150286b51c77c643fa97740b1d35b6d1ceef8b0ecd7"
-SRC_URI[manpages.sha256sum] = "fe66a69244def488306c3e05c1362ea53d8626d2a7e57cd7311df2dab1ef8356"
-
+SRC_URI[tarball.sha256sum] = "fc4eb5ecb9299db91cdd156c06cdeb41833f53adc5631ddf8c0cb13eaa2911c1"
+SRC_URI[manpages.sha256sum] = "220f1ed68582caeddf79c4db15e4eaa4808ec01fd11889e19232f0a74d7f31b0"