@@ -1,4 +1,4 @@
-From 2a97f61c558a03282c7d81797f1cd8b594f953dc Mon Sep 17 00:00:00 2001
+From 325c30dac4eafdd463c8ffcfe1215858d642ab91 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Mon, 7 Feb 2022 10:13:15 +0100
Subject: [PATCH] config.mak.uname: do not force RHEL-7 specific build settings
@@ -1,4 +1,4 @@
-From 0ada98b8e1de3fe835b439777303dfaf9ac65a08 Mon Sep 17 00:00:00 2001
+From 65fa5c0f849fe4a1e3cb8e6af0086ef0748c28de 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] generate-configlist.sh: Fix determinism issue
@@ -23,12 +23,12 @@ Upstream-Status: Submitted [https://public-inbox.org/git/f029a942dd3d50d85e60bd3
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/generate-configlist.sh b/generate-configlist.sh
-index 5794226..6b0b939 100755
+index dffdaad..cc35a21 100755
--- a/generate-configlist.sh
+++ b/generate-configlist.sh
@@ -15,7 +15,7 @@ static const char *config_name_list[] = {
EOF
- grep -h '^[a-zA-Z].*\..*::$' "$SOURCE_DIR"/Documentation/*config.txt "$SOURCE_DIR"/Documentation/config/*.txt |
+ grep -h '^[a-zA-Z].*\..*::$' "$SOURCE_DIR"/Documentation/*config.adoc "$SOURCE_DIR"/Documentation/config/*.adoc |
sed '/deprecated/d; s/::$//; s/, */\n/g' |
- sort |
+ LC_ALL=C sort |
similarity index 98%
rename from meta/recipes-devtools/git/git_2.48.1.bb
rename to meta/recipes-devtools/git/git_2.49.0.bb
@@ -164,4 +164,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
"
EXTRA_OEMAKE += "NO_GETTEXT=1"
-SRC_URI[tarball.sha256sum] = "51b4d03b1e311ba673591210f94f24a4c5781453e1eb188822e3d9cdc04c2212"
+SRC_URI[tarball.sha256sum] = "f8047f572f665bebeb637fd5f14678f31b3ca5d2ff9a18f20bd925bd48f75d3c"
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- ...nfig.mak.uname-do-not-force-RHEL-7-specific-build-.patch | 2 +- meta/recipes-devtools/git/git/fixsort.patch | 6 +++--- meta/recipes-devtools/git/{git_2.48.1.bb => git_2.49.0.bb} | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename meta/recipes-devtools/git/{git_2.48.1.bb => git_2.49.0.bb} (98%)