summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/git
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/git')
-rw-r--r--meta/recipes-devtools/git/git/fixsort.patch16
-rw-r--r--meta/recipes-devtools/git/git_2.50.0.bb (renamed from meta/recipes-devtools/git/git_2.49.0.bb)2
2 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-devtools/git/git/fixsort.patch b/meta/recipes-devtools/git/git/fixsort.patch
index e077eba8ff..7066e1808d 100644
--- a/meta/recipes-devtools/git/git/fixsort.patch
+++ b/meta/recipes-devtools/git/git/fixsort.patch
@@ -23,15 +23,15 @@ Upstream-Status: Submitted [https://public-inbox.org/git/f029a942dd3d50d85e60bd3
23 1 file changed, 1 insertion(+), 1 deletion(-) 23 1 file changed, 1 insertion(+), 1 deletion(-)
24 24
25diff --git a/generate-configlist.sh b/generate-configlist.sh 25diff --git a/generate-configlist.sh b/generate-configlist.sh
26index dffdaad..cc35a21 100755 26index 75c39ad..6d4525e 100755
27--- a/generate-configlist.sh 27--- a/generate-configlist.sh
28+++ b/generate-configlist.sh 28+++ b/generate-configlist.sh
29@@ -15,7 +15,7 @@ static const char *config_name_list[] = { 29@@ -23,7 +23,7 @@ EOF
30 EOF 30 d' \
31 grep -h '^[a-zA-Z].*\..*::$' "$SOURCE_DIR"/Documentation/*config.adoc "$SOURCE_DIR"/Documentation/config/*.adoc | 31 "$SOURCE_DIR"/Documentation/*config.adoc \
32 sed '/deprecated/d; s/::$//; s/, */\n/g' | 32 "$SOURCE_DIR"/Documentation/config/*.adoc |
33- sort | 33- sort
34+ LC_ALL=C sort | 34+ LC_ALL=C sort
35 sed 's/^.*$/ "&",/'
36 cat <<EOF 35 cat <<EOF
37 NULL, 36 NULL,
37 };
diff --git a/meta/recipes-devtools/git/git_2.49.0.bb b/meta/recipes-devtools/git/git_2.50.0.bb
index e1b501d62b..2d28fd05fc 100644
--- a/meta/recipes-devtools/git/git_2.49.0.bb
+++ b/meta/recipes-devtools/git/git_2.50.0.bb
@@ -170,4 +170,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
170 " 170 "
171EXTRA_OEMAKE += "NO_GETTEXT=1" 171EXTRA_OEMAKE += "NO_GETTEXT=1"
172 172
173SRC_URI[tarball.sha256sum] = "f8047f572f665bebeb637fd5f14678f31b3ca5d2ff9a18f20bd925bd48f75d3c" 173SRC_URI[tarball.sha256sum] = "920f8ca563d16a7d4fdecb44349cbffbc5cb814a8b36c96028463478197050da"