From: Robert Yang <liezhi.y...@windriver.com>

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

Signed-off-by: Robert Yang <liezhi.y...@windriver.com>
---
 ...mak.uname-do-not-force-RHEL-7-specific-build-.patch | 10 +++++++---
 .../git/{git_2.44.1.bb => git_2.45.1.bb}               |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/git/{git_2.44.1.bb => git_2.45.1.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 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 <a...@linutronix.de>
 
+Rebased for 2.45.1.
+
+Signed-off-by: Robert Yang <liezhi.y...@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.1.bb 
b/meta/recipes-devtools/git/git_2.45.1.bb
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 53d67eb40a4..d1b3e6ad408 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 \
                  "
 EXTRA_OEMAKE += "NO_GETTEXT=1"
 
-SRC_URI[tarball.sha256sum] = 
"118214bb8d7ba971a62741416e757562b8f5451cefc087a407e91857897c92cc"
+SRC_URI[tarball.sha256sum] = 
"10acb581993061e616be9c5674469335922025a666318e0748cb8306079fef24"
-- 
2.44.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199982): 
https://lists.openembedded.org/g/openembedded-core/message/199982
Mute This Topic: https://lists.openembedded.org/mt/106363138/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to