]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
git: 2.44.1 -> 2.45.1
authorRobert Yang <liezhi.yang@windriver.com>
Wed, 29 May 2024 03:26:09 +0000 (20:26 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 3 Jun 2024 06:47:00 +0000 (07:47 +0100)
Rebased 0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch
meta/recipes-devtools/git/git_2.45.1.bb [moved from meta/recipes-devtools/git/git_2.44.1.bb with 98% similarity]

index d80d082ba3f0818086695bb3561bc6ea5bce194f..fc803c73c78463ec7f70894a5e14bc292dc9445b 100644 (file)
@@ -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
similarity index 98%
rename from meta/recipes-devtools/git/git_2.44.1.bb
rename to meta/recipes-devtools/git/git_2.45.1.bb
index 53d67eb40a4e1fe69612670cdb8e6103f9f0df76..d1b3e6ad408ac5898303465d5d827d6ed29d17e5 100644 (file)
@@ -164,4 +164,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
                  "
 EXTRA_OEMAKE += "NO_GETTEXT=1"
 
-SRC_URI[tarball.sha256sum] = "118214bb8d7ba971a62741416e757562b8f5451cefc087a407e91857897c92cc"
+SRC_URI[tarball.sha256sum] = "10acb581993061e616be9c5674469335922025a666318e0748cb8306079fef24"