Signed-off-by: Richard Purdie <[email protected]> --- ...uname-do-not-force-RHEL-7-specific-build-.patch | 4 ++-- meta/recipes-devtools/git/git/fixsort.patch | 14 +++++++------- .../git/{git_2.53.0.bb => git_2.54.0.bb} | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) rename meta/recipes-devtools/git/{git_2.53.0.bb => git_2.54.0.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 61bf0e12dce..b0c8e652aa4 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 @@ -From 325c30dac4eafdd463c8ffcfe1215858d642ab91 Mon Sep 17 00:00:00 2001 +From d73b4c666aa12452a26c3fac83371a707e6f13c0 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <[email protected]> Date: Mon, 7 Feb 2022 10:13:15 +0100 Subject: [PATCH] config.mak.uname: do not force RHEL-7 specific build settings @@ -17,7 +17,7 @@ Signed-off-by: Robert Yang <[email protected]> 1 file changed, 4 deletions(-) diff --git a/config.mak.uname b/config.mak.uname -index b12d4e1..b5b8d82 100644 +index 5feb582..060cd29 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -63,10 +63,6 @@ ifeq ($(uname_S),Linux) diff --git a/meta/recipes-devtools/git/git/fixsort.patch b/meta/recipes-devtools/git/git/fixsort.patch index 7066e1808d1..046d09160aa 100644 --- a/meta/recipes-devtools/git/git/fixsort.patch +++ b/meta/recipes-devtools/git/git/fixsort.patch @@ -1,4 +1,4 @@ -From 65fa5c0f849fe4a1e3cb8e6af0086ef0748c28de Mon Sep 17 00:00:00 2001 +From f928abf16841e42bfd49ccaabc164318f61e842a Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Wed, 17 Feb 2021 17:57:13 +0000 Subject: [PATCH] generate-configlist.sh: Fix determinism issue @@ -19,14 +19,14 @@ shell script generating the header. Signed-off-by: Richard Purdie <[email protected]> Upstream-Status: Submitted [https://public-inbox.org/git/f029a942dd3d50d85e60bd37d8e454524987842f.ca...@linuxfoundation.org/T/#u] --- - generate-configlist.sh | 2 +- + tools/generate-configlist.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/generate-configlist.sh b/generate-configlist.sh -index 75c39ad..6d4525e 100755 ---- a/generate-configlist.sh -+++ b/generate-configlist.sh -@@ -23,7 +23,7 @@ EOF +diff --git a/tools/generate-configlist.sh b/tools/generate-configlist.sh +index e28054f..96ddd51 100755 +--- a/tools/generate-configlist.sh ++++ b/tools/generate-configlist.sh +@@ -24,7 +24,7 @@ EOF d' \ "$SOURCE_DIR"/Documentation/*config.adoc \ "$SOURCE_DIR"/Documentation/config/*.adoc | diff --git a/meta/recipes-devtools/git/git_2.53.0.bb b/meta/recipes-devtools/git/git_2.54.0.bb similarity index 98% rename from meta/recipes-devtools/git/git_2.53.0.bb rename to meta/recipes-devtools/git/git_2.54.0.bb index 8d71905f419..80c535a726f 100644 --- a/meta/recipes-devtools/git/git_2.53.0.bb +++ b/meta/recipes-devtools/git/git_2.54.0.bb @@ -170,7 +170,7 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "429dc0f5fe5f14109930cdbbb588c5d6ef5b8528910f0d738040744bebdc6275" +SRC_URI[tarball.sha256sum] = "45e8107643a44e3ce46f5665beb35af3932fb0d70017687905ab5d4e3aafa8eb" CVE_STATUS[CVE-2024-32002] = "fixed-version: fixed since v2.46.0" CVE_STATUS[CVE-2024-50349] = "fixed-version: fixed since v2.49.0"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#236319): https://lists.openembedded.org/g/openembedded-core/message/236319 Mute This Topic: https://lists.openembedded.org/mt/119117199/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
