[PATCH 08/34] git: 2.45.2 -> 2.46.0

Alexander Kanavin
2024-08-27T05:24:09Z

...-do-not-force-RHEL-7-specific-build-.patch | 7 +++---
meta/recipes-devtools/git/git/fixsort.patch | 22 ++++++++++++-------
.../git/{git_2.45.2.bb => git_2.46.0.bb} | 2 +-
3 files changed, 18 insertions(+), 13 deletions(-)
rename meta/recipes-devtools/git/{git_2.45.2.bb => git_2.46.0.bb} (98%)

diff --git a/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch b/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch
index fc803c73c78..3f0bc4aaa1b 100644
--- a/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch
+++ b/meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch
@@ -1,4 +1,4 @@
-From c0c5241abdc113acbe6bcd960686cea414bce357 Mon Sep 17 00:00:00 2001
+From be83596773e42b88ba1104f044a139f35d90a7f5 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Mon, 7 Feb 2022 10:13:15 +0100
Subject: [PATCH] config.mak.uname: do not force RHEL-7 specific build settings
@@ -12,13 +12,12 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Rebased for 2.45.1.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-
---
config.mak.uname | 4 ----
1 file changed, 4 deletions(-)

diff --git a/config.mak.uname b/config.mak.uname
-index a7607a5..251057e 100644
+index 85d6382..bdf06ca 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -64,10 +64,6 @@ ifeq ($(uname_S),Linux)
@@ -29,6 +28,6 @@ index a7607a5..251057e 100644
- ifneq ($(findstring .el7.,$(uname_R)),)
- BASIC_CFLAGS += -std=c99
- endif
+ LINK_FUZZ_PROGRAMS = YesPlease
endif
ifeq ($(uname_S),GNU/kFreeBSD)
- HAVE_ALLOCA_H = YesPlease
diff --git a/meta/recipes-devtools/git/git/fixsort.patch b/meta/recipes-devtools/git/git/fixsort.patch
index 07a487e8ca6..d9a3672f1d6 100644
--- a/meta/recipes-devtools/git/git/fixsort.patch
+++ b/meta/recipes-devtools/git/git/fixsort.patch
@@ -1,13 +1,16 @@
-[PATCH] generate-configlist.sh: Fix determinism issue
+From 83ae059943d3efd824978a759bcfd894ce5085d4 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Wed, 17 Feb 2021 17:57:13 +0000
+Subject: [PATCH] [PATCH] generate-configlist.sh: Fix determinism issue

-Currently git binaries are not entirely reproducible, at least partly
+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
+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
@@ -15,12 +18,15 @@ 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]
+---
+ generate-configlist.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)

-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[] =
+diff --git a/generate-configlist.sh b/generate-configlist.sh
+index 8692fe5..e67ccac 100755
+--- a/generate-configlist.sh
++++ b/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' |
diff --git a/meta/recipes-devtools/git/git_2.45.2.bb b/meta/recipes-devtools/git/git_2.46.0.bb
similarity index 98%
rename from meta/recipes-devtools/git/git_2.45.2.bb
rename to meta/recipes-devtools/git/git_2.46.0.bb
index 6393c976e6a..7c6beb5b5cc 100644
--- a/meta/recipes-devtools/git/git_2.45.2.bb
+++ b/meta/recipes-devtools/git/git_2.46.0.bb
@@ -164,4 +164,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
"
EXTRA_OEMAKE += "NO_GETTEXT=1"

-SRC_URI[tarball.sha256sum] = "98b26090ed667099a3691b93698d1e213e1ded73d36a2fde7e9125fce28ba234"
+SRC_URI[tarball.sha256sum] = "b138811e16838f669a2516e40f09d50500e1c7fc541b5ab50ce84b98585e5230"
--
2.39.2