summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2024-05-28 20:26:09 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-06-03 07:47:04 +0100
commit56c578f6643c09e6d9274bb21381978deb1f4af1 (patch)
tree89eea3bec51a29b52d40dd911406408ee26fc3a4 /meta/recipes-devtools
parent0c3d9ff24fae6bee16c7b517c6968714cde3f09a (diff)
downloadpoky-56c578f6643c09e6d9274bb21381978deb1f4af1.tar.gz
git: 2.44.1 -> 2.45.1
Rebased 0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch (From OE-Core rev: 903cc51746262be4b71261e0ad66cf5a49af2186) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch10
-rw-r--r--meta/recipes-devtools/git/git_2.45.1.bb (renamed from meta/recipes-devtools/git/git_2.44.1.bb)2
2 files changed, 8 insertions, 4 deletions
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..fc803c73c7 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.
9Upstream-Status: Inappropriate [upstream needs to check compiler and component versions properly] 9Upstream-Status: Inappropriate [upstream needs to check compiler and component versions properly]
10Signed-off-by: Alexander Kanavin <alex@linutronix.de> 10Signed-off-by: Alexander Kanavin <alex@linutronix.de>
11 11
12Rebased for 2.45.1.
13
14Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
15
12--- 16---
13 config.mak.uname | 4 ---- 17 config.mak.uname | 4 ----
14 1 file changed, 4 deletions(-) 18 1 file changed, 4 deletions(-)
15 19
16diff --git a/config.mak.uname b/config.mak.uname 20diff --git a/config.mak.uname b/config.mak.uname
17index 259d151..136ae3b 100644 21index a7607a5..251057e 100644
18--- a/config.mak.uname 22--- a/config.mak.uname
19+++ b/config.mak.uname 23+++ b/config.mak.uname
20@@ -64,10 +64,6 @@ ifeq ($(uname_S),Linux) 24@@ -64,10 +64,6 @@ ifeq ($(uname_S),Linux)
@@ -22,9 +26,9 @@ index 259d151..136ae3b 100644
22 HAVE_PLATFORM_PROCINFO = YesPlease 26 HAVE_PLATFORM_PROCINFO = YesPlease
23 COMPAT_OBJS += compat/linux/procinfo.o 27 COMPAT_OBJS += compat/linux/procinfo.o
24- # centos7/rhel7 provides gcc 4.8.5 and zlib 1.2.7. 28- # centos7/rhel7 provides gcc 4.8.5 and zlib 1.2.7.
25- ifneq ($(findstring .el7.,$(uname_R)),) 29- ifneq ($(findstring .el7.,$(uname_R)),)
26- BASIC_CFLAGS += -std=c99 30- BASIC_CFLAGS += -std=c99
27- endif 31- endif
28 endif 32 endif
29 ifeq ($(uname_S),GNU/kFreeBSD) 33 ifeq ($(uname_S),GNU/kFreeBSD)
30 HAVE_ALLOCA_H = YesPlease 34 HAVE_ALLOCA_H = YesPlease
diff --git a/meta/recipes-devtools/git/git_2.44.1.bb b/meta/recipes-devtools/git/git_2.45.1.bb
index 53d67eb40a..d1b3e6ad40 100644
--- a/meta/recipes-devtools/git/git_2.44.1.bb
+++ b/meta/recipes-devtools/git/git_2.45.1.bb
@@ -164,4 +164,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
164 " 164 "
165EXTRA_OEMAKE += "NO_GETTEXT=1" 165EXTRA_OEMAKE += "NO_GETTEXT=1"
166 166
167SRC_URI[tarball.sha256sum] = "118214bb8d7ba971a62741416e757562b8f5451cefc087a407e91857897c92cc" 167SRC_URI[tarball.sha256sum] = "10acb581993061e616be9c5674469335922025a666318e0748cb8306079fef24"