git: 2.49.0 -> 2.50.0

* Rebased fixsort.patch

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/git/git/fixsort.patch b/meta/recipes-devtools/git/git/fixsort.patch
index e077eba8ff1a7ed205e5f0cbb1c8dbcaf17772ab..7066e1808d13295573c3c46dc4507353cce38853 100644 (file)
--- 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
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/generate-configlist.sh b/generate-configlist.sh
-index dffdaad..cc35a21 100755
+index 75c39ad..6d4525e 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.adoc "$SOURCE_DIR"/Documentation/config/*.adoc |
-       sed '/deprecated/d; s/::$//; s/,  */\n/g' |
--      sort |
-+      LC_ALL=C sort |
-       sed 's/^.*$/    "&",/'
+@@ -23,7 +23,7 @@ EOF
+       d' \
+           "$SOURCE_DIR"/Documentation/*config.adoc \
+           "$SOURCE_DIR"/Documentation/config/*.adoc |
+-      sort
++      LC_ALL=C sort
        cat <<EOF
        NULL,
+ };

diff --git a/meta/recipes-devtools/git/git_2.49.0.bb b/meta/recipes-devtools/git/git_2.50.0.bb
similarity index 98%
rename from meta/recipes-devtools/git/git_2.49.0.bb
rename to meta/recipes-devtools/git/git_2.50.0.bb
index e1b501d62b1f8bdf7cd15dffb0ba3b4ca6d03126..2d28fd05fc2aff74514d193ec5fbdefa53f2c95e 100644 (file)
--- 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 \
                  "
 EXTRA_OEMAKE += "NO_GETTEXT=1"
 
-SRC_URI[tarball.sha256sum] = "f8047f572f665bebeb637fd5f14678f31b3ca5d2ff9a18f20bd925bd48f75d3c"
+SRC_URI[tarball.sha256sum] = "920f8ca563d16a7d4fdecb44349cbffbc5cb814a8b36c96028463478197050da"