2 files changed, 9 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.
 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
index 90e555eba7..d1b3e6ad40 100644
--- a/meta/recipes-devtools/git/git_2.44.0.bb
+++ b/meta/recipes-devtools/git/git_2.45.1.bb
@@ -40,6 +40,7 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \
                 --without-iconv \
 "
 EXTRA_OECONF:append:class-nativesdk = " --with-gitconfig=/etc/gitconfig "
+EXTRA_OECONF:append:class-native = " --with-gitconfig=/etc/gitconfig "
 
 # Needs brokensep as this doesn't use automake
 inherit autotools-brokensep perlnative bash-completion manpages
@@ -163,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"