From 49da048da4f631927be5d590b35dfad460c795c7 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Thu, 15 Feb 2024 07:32:58 +0000 Subject: [PATCH] git: upgrade 2.43.0 -> 2.43.2 --- ...-do-not-force-RHEL-7-specific-build-.patch | 4 ++-- meta/recipes-devtools/git/git/fixsort.patch | 23 ++++++++++++------- .../git/{git_2.43.0.bb => git_2.43.2.bb} | 2 +- 3 files changed, 18 insertions(+), 11 deletions(-) rename meta/recipes-devtools/git/{git_2.43.0.bb => git_2.43.2.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 d80d082ba3..59526f1bcd 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 ac7e40abdbe61d5b0ccf960ecc282d1a92306619 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 7 Feb 2022 10:13:15 +0100 Subject: [PATCH] config.mak.uname: do not force RHEL-7 specific build settings @@ -14,7 +14,7 @@ Signed-off-by: Alexander Kanavin 1 file changed, 4 deletions(-) diff --git a/config.mak.uname b/config.mak.uname -index 259d151..136ae3b 100644 +index 3bb03f4..b5ed7d6 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -64,10 +64,6 @@ ifeq ($(uname_S),Linux) diff --git a/meta/recipes-devtools/git/git/fixsort.patch b/meta/recipes-devtools/git/git/fixsort.patch index 07a487e8ca..d395f7d5d0 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 3e4877a529f0aa0667a5fd2d4a48f3826da9f78e Mon Sep 17 00:00:00 2001 +From: Richard Purdie +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..*", -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 @@ -16,11 +19,15 @@ shell script generating the header. Signed-off-by: Richard Purdie 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[] = +--- + generate-configlist.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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.43.0.bb b/meta/recipes-devtools/git/git_2.43.2.bb similarity index 98% rename from meta/recipes-devtools/git/git_2.43.0.bb rename to meta/recipes-devtools/git/git_2.43.2.bb index f913290081..74c9a514e4 100644 --- a/meta/recipes-devtools/git/git_2.43.0.bb +++ b/meta/recipes-devtools/git/git_2.43.2.bb @@ -160,4 +160,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "ed238f5c72a014f238cc49fe7df4c6883732a3881111b381c105e2c5be77302f" +SRC_URI[tarball.sha256sum] = "0dde66dc6a0ef5ae41f550052e5574a01b5378bf2b396497070fc4913c749f75" -- 2.42.0