mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

git: 2.45.2 -> 2.46.0

Browse Source 
(From OE-Core rev: 4a387b0ad7a26af6a31dbbcfce1ebc95a76b9ec7)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2024-08-27 07:23:28 +02:00
committed by Richard Purdie
parent 75d90d7cf3
commit 60602a9ff5
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/git/git/0001-config.mak.uname-do-not-force-RHEL-7-specific-build-.patch
+3 -4
View File
@@ -1,4 +1,4 @@
From c0c5241abdc113acbe6bcd960686cea414bce357 Mon Sep 17 00:00:00 2001 From be83596773e42b88ba1104f044a139f35d90a7f5 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de> From: Alexander Kanavin <alex@linutronix.de>
Date: Mon, 7 Feb 2022 10:13:15 +0100 Date: Mon, 7 Feb 2022 10:13:15 +0100
Subject: [PATCH] config.mak.uname: do not force RHEL-7 specific build settings Subject: [PATCH] config.mak.uname: do not force RHEL-7 specific build settings
@@ -12,13 +12,12 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Rebased for 2.45.1. Rebased for 2.45.1.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
--- ---
config.mak.uname | 4 ---- config.mak.uname | 4 ----
1 file changed, 4 deletions(-) 1 file changed, 4 deletions(-)
diff --git a/config.mak.uname b/config.mak.uname diff --git a/config.mak.uname b/config.mak.uname
index a7607a5..251057e 100644 index 85d6382..bdf06ca 100644
--- a/config.mak.uname --- a/config.mak.uname
+++ b/config.mak.uname +++ b/config.mak.uname
@@ -64,10 +64,6 @@ ifeq ($(uname_S),Linux) @@ -64,10 +64,6 @@ ifeq ($(uname_S),Linux)
@@ -29,6 +28,6 @@ index a7607a5..251057e 100644
- ifneq ($(findstring .el7.,$(uname_R)),) - ifneq ($(findstring .el7.,$(uname_R)),)
- BASIC_CFLAGS += -std=c99 - BASIC_CFLAGS += -std=c99
- endif - endif
LINK_FUZZ_PROGRAMS = YesPlease
endif endif
ifeq ($(uname_S),GNU/kFreeBSD) ifeq ($(uname_S),GNU/kFreeBSD)
HAVE_ALLOCA_H = YesPlease
meta/recipes-devtools/git/git/fixsort.patch
+12 -6
View File
@@ -1,4 +1,7 @@
[PATCH] generate-configlist.sh: Fix determinism issue From 83ae059943d3efd824978a759bcfd894ce5085d4 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 17 Feb 2021 17:57:13 +0000
Subject: [PATCH] [PATCH] generate-configlist.sh: Fix determinism issue
Currently git binaries are not entirely reproducible, at least partly Currently git binaries are not entirely reproducible, at least partly
due to config-list.h differing in order depending on the system's due to config-list.h differing in order depending on the system's
@@ -15,12 +18,15 @@ shell script generating the header.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upstream-Status: Submitted [https://public-inbox.org/git/f029a942dd3d50d85e60bd37d8e454524987842f.camel@linuxfoundation.org/T/#u] Upstream-Status: Submitted [https://public-inbox.org/git/f029a942dd3d50d85e60bd37d8e454524987842f.camel@linuxfoundation.org/T/#u]
---
generate-configlist.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: git-2.30.0/generate-configlist.sh diff --git a/generate-configlist.sh b/generate-configlist.sh
=================================================================== index 8692fe5..e67ccac 100755
--- git-2.30.0.orig/generate-configlist.sh --- a/generate-configlist.sh
+++ git-2.30.0/generate-configlist.sh +++ b/generate-configlist.sh
@@ -9,7 +9,7 @@ static const char *config_name_list[] = @@ -9,7 +9,7 @@ static const char *config_name_list[] = {
EOF EOF
grep -h '^[a-zA-Z].*\..*::$' Documentation/*config.txt Documentation/config/*.txt | grep -h '^[a-zA-Z].*\..*::$' Documentation/*config.txt Documentation/config/*.txt |
sed '/deprecated/d; s/::$//; s/, */\n/g' | sed '/deprecated/d; s/::$//; s/, */\n/g' |
meta/recipes-devtools/git/git_2.45.2.bb → meta/recipes-devtools/git/git_2.46.0.bb
+1 -1
View File
@@ -164,4 +164,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
" "
EXTRA_OEMAKE += "NO_GETTEXT=1" EXTRA_OEMAKE += "NO_GETTEXT=1"
SRC_URI[tarball.sha256sum] = "98b26090ed667099a3691b93698d1e213e1ded73d36a2fde7e9125fce28ba234" SRC_URI[tarball.sha256sum] = "b138811e16838f669a2516e40f09d50500e1c7fc541b5ab50ce84b98585e5230"