diff mbox series

[3/3] git: 2.44.0 -> 2.45.1

Message ID dd0be4b86c6f2b2389b037b6f06b297a4acf2451.1716543967.git.liezhi.yang@windriver.com
State New
Headers show
Series [1/3] strace: upgrade 6.8 -> 6.9 | expand

Commit Message

Robert Yang May 24, 2024, 10:28 a.m. UTC 
From: Robert Yang <liezhi.yang@windriver.com>

Rebased 0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 ...mak.uname-do-not-force-RHEL-7-specific-build-.patch | 10 +++++++---
 .../git/{git_2.44.0.bb => git_2.45.1.bb}               |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/git/{git_2.44.0.bb => git_2.45.1.bb} (98%)
diff mbox series

Patch

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 d80d082ba3f..fc803c73c78 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
@@ -9,12 +9,16 @@  different flags than git builds on other host distros.
 Upstream-Status: Inappropriate [upstream needs to check compiler and component versions properly]
 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 259d151..136ae3b 100644
+index a7607a5..251057e 100644
 --- a/config.mak.uname
 +++ b/config.mak.uname
 @@ -64,10 +64,6 @@ ifeq ($(uname_S),Linux)
@@ -22,9 +26,9 @@  index 259d151..136ae3b 100644
  	HAVE_PLATFORM_PROCINFO = YesPlease
  	COMPAT_OBJS += compat/linux/procinfo.o
 -	# centos7/rhel7 provides gcc 4.8.5 and zlib 1.2.7.
--	ifneq ($(findstring .el7.,$(uname_R)),)
+-        ifneq ($(findstring .el7.,$(uname_R)),)
 -		BASIC_CFLAGS += -std=c99
--	endif
+-        endif
  endif
  ifeq ($(uname_S),GNU/kFreeBSD)
  	HAVE_ALLOCA_H = YesPlease
diff --git a/meta/recipes-devtools/git/git_2.44.0.bb b/meta/recipes-devtools/git/git_2.45.1.bb
similarity index 98%
rename from meta/recipes-devtools/git/git_2.44.0.bb
rename to meta/recipes-devtools/git/git_2.45.1.bb
index 78b00dd19f0..d1b3e6ad408 100644
--- a/meta/recipes-devtools/git/git_2.44.0.bb
+++ b/meta/recipes-devtools/git/git_2.45.1.bb
@@ -164,4 +164,4 @@  EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
                  "
 EXTRA_OEMAKE += "NO_GETTEXT=1"
 
-SRC_URI[tarball.sha256sum] = "f9e36f085458fe9688fbbe7846b8c4770b13d161fcd8953655f36b2b85f06b76"
+SRC_URI[tarball.sha256sum] = "10acb581993061e616be9c5674469335922025a666318e0748cb8306079fef24"