From 04f3a1c726c7f269f4829dccea5f75fb01102e4e Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Thu, 10 Oct 2024 01:01:47 +0000 Subject: [PATCH] git: upgrade 2.46.1 -> 2.47.0 --- ...nfig.mak.uname-do-not-force-RHEL-7-specific-build-.patch | 6 +++--- meta/recipes-devtools/git/git/fixsort.patch | 4 ++-- meta/recipes-devtools/git/{git_2.46.1.bb => git_2.47.0.bb} | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename meta/recipes-devtools/git/{git_2.46.1.bb => git_2.47.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 3f0bc4aaa1..5950724c64 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 be83596773e42b88ba1104f044a139f35d90a7f5 Mon Sep 17 00:00:00 2001 +From 223f02a47780f17e0f2d90a19480cc5ec5ab8fd5 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 @@ -17,10 +17,10 @@ Signed-off-by: Robert Yang 1 file changed, 4 deletions(-) diff --git a/config.mak.uname b/config.mak.uname -index 85d6382..bdf06ca 100644 +index d511216..3144228 100644 --- a/config.mak.uname +++ b/config.mak.uname -@@ -64,10 +64,6 @@ ifeq ($(uname_S),Linux) +@@ -63,10 +63,6 @@ ifeq ($(uname_S),Linux) PROCFS_EXECUTABLE_PATH = /proc/self/exe HAVE_PLATFORM_PROCINFO = YesPlease COMPAT_OBJS += compat/linux/procinfo.o diff --git a/meta/recipes-devtools/git/git/fixsort.patch b/meta/recipes-devtools/git/git/fixsort.patch index d9a3672f1d..8ce5e75769 100644 --- a/meta/recipes-devtools/git/git/fixsort.patch +++ b/meta/recipes-devtools/git/git/fixsort.patch @@ -1,7 +1,7 @@ -From 83ae059943d3efd824978a759bcfd894ce5085d4 Mon Sep 17 00:00:00 2001 +From 5739830e263558931a58de216a4cdc3414261880 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 +Subject: [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 diff --git a/meta/recipes-devtools/git/git_2.46.1.bb b/meta/recipes-devtools/git/git_2.47.0.bb similarity index 98% rename from meta/recipes-devtools/git/git_2.46.1.bb rename to meta/recipes-devtools/git/git_2.47.0.bb index d301c474f2..67356874b5 100644 --- a/meta/recipes-devtools/git/git_2.46.1.bb +++ b/meta/recipes-devtools/git/git_2.47.0.bb @@ -164,4 +164,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "b0a4d1ad50e820edd84c0d1b609c29349d4ae2681ed458914ea759aafcd4bf21" +SRC_URI[tarball.sha256sum] = "a84a7917e0ab608312834413f01fc01edc7844f9f9002ba69f3b4f4bcb8d937a" -- 2.44.1