diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-05-05 07:05:35 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-05 21:17:38 +0100 |
commit | 1deff800974eb7b0c6c093ae4acf7a1b63d5ba2c (patch) | |
tree | 4d45b463fa7780d2a1e5fcbba586b40d06f0e5d2 | |
parent | a1e10aea03a2f4b9761faa19f9648bf42c9268e2 (diff) | |
download | poky-1deff800974eb7b0c6c093ae4acf7a1b63d5ba2c.tar.gz |
git: update 2.35.3 -> 2.36.0
(From OE-Core rev: a892685d3a56a966f54fdfa6d0898912adfdfdb2)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch | 12 | ||||
-rw-r--r-- | meta/recipes-devtools/git/git_2.36.0.bb (renamed from meta/recipes-devtools/git/git_2.35.3.bb) | 2 |
2 files changed, 7 insertions, 7 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 e0f702f327..d80d082ba3 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3b2505435bc6f982226eff84bad6bf9a36381573 Mon Sep 17 00:00:00 2001 | 1 | From c0c5241abdc113acbe6bcd960686cea414bce357 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Mon, 7 Feb 2022 10:13:15 +0100 | 3 | Date: Mon, 7 Feb 2022 10:13:15 +0100 |
4 | Subject: [PATCH] config.mak.uname: do not force RHEL-7 specific build settings | 4 | Subject: [PATCH] config.mak.uname: do not force RHEL-7 specific build settings |
@@ -8,22 +8,22 @@ different flags than git builds on other host distros. | |||
8 | 8 | ||
9 | Upstream-Status: Inappropriate [upstream needs to check compiler and component versions properly] | 9 | Upstream-Status: Inappropriate [upstream needs to check compiler and component versions properly] |
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
11 | |||
11 | --- | 12 | --- |
12 | config.mak.uname | 5 ----- | 13 | config.mak.uname | 4 ---- |
13 | 1 file changed, 5 deletions(-) | 14 | 1 file changed, 4 deletions(-) |
14 | 15 | ||
15 | diff --git a/config.mak.uname b/config.mak.uname | 16 | diff --git a/config.mak.uname b/config.mak.uname |
16 | index c48db45..9b3e9bf 100644 | 17 | index 259d151..136ae3b 100644 |
17 | --- a/config.mak.uname | 18 | --- a/config.mak.uname |
18 | +++ b/config.mak.uname | 19 | +++ b/config.mak.uname |
19 | @@ -63,11 +63,6 @@ ifeq ($(uname_S),Linux) | 20 | @@ -64,10 +64,6 @@ ifeq ($(uname_S),Linux) |
20 | PROCFS_EXECUTABLE_PATH = /proc/self/exe | 21 | PROCFS_EXECUTABLE_PATH = /proc/self/exe |
21 | HAVE_PLATFORM_PROCINFO = YesPlease | 22 | HAVE_PLATFORM_PROCINFO = YesPlease |
22 | COMPAT_OBJS += compat/linux/procinfo.o | 23 | COMPAT_OBJS += compat/linux/procinfo.o |
23 | - # centos7/rhel7 provides gcc 4.8.5 and zlib 1.2.7. | 24 | - # centos7/rhel7 provides gcc 4.8.5 and zlib 1.2.7. |
24 | - ifneq ($(findstring .el7.,$(uname_R)),) | 25 | - ifneq ($(findstring .el7.,$(uname_R)),) |
25 | - BASIC_CFLAGS += -std=c99 | 26 | - BASIC_CFLAGS += -std=c99 |
26 | - NO_UNCOMPRESS2 = YesPlease | ||
27 | - endif | 27 | - endif |
28 | endif | 28 | endif |
29 | ifeq ($(uname_S),GNU/kFreeBSD) | 29 | ifeq ($(uname_S),GNU/kFreeBSD) |
diff --git a/meta/recipes-devtools/git/git_2.35.3.bb b/meta/recipes-devtools/git/git_2.36.0.bb index 68981d4fde..0d7d56303c 100644 --- a/meta/recipes-devtools/git/git_2.35.3.bb +++ b/meta/recipes-devtools/git/git_2.36.0.bb | |||
@@ -165,4 +165,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ | |||
165 | " | 165 | " |
166 | EXTRA_OEMAKE += "NO_GETTEXT=1" | 166 | EXTRA_OEMAKE += "NO_GETTEXT=1" |
167 | 167 | ||
168 | SRC_URI[tarball.sha256sum] = "cad708072d5c0b390c71651f5edb44143f00b357766973470bf9adebc0944c03" | 168 | SRC_URI[tarball.sha256sum] = "9785f8c99daea037b8443d2f7397ac6aafbf8d5ff21fbfe2e5c0d443d126e211" |