From 0afb0ccc28c606f151dbf564696afa4a283a4ad1 Mon Sep 17 00:00:00 2001
From: Wang Mingyu <wangmy@fujitsu.com>
Date: Wed, 25 Sep 2024 14:49:12 +0800
Subject: repo: upgrade 2.46 -> 2.47

Changelog:
==========
- sync: include TARGET_RELEASE when constructing smart sync target.
- color: fix have_fg not re assign to true
- tox.ini: Make the lint and format environments run black for all code
- tox.ini, constraints.txt: Lock the version of black to <24
- project: run fetch --refetch onacould not parse commit
- Add a --rebase option to sync command
- sync: Fix git command for aborting rebase being called incorrectly.

(From OE-Core rev: 1cf6b36ca45e584aa949974c71df9249e0f81f26)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-devtools/repo/repo_2.46.bb | 30 ------------------------------
 meta/recipes-devtools/repo/repo_2.47.bb | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 meta/recipes-devtools/repo/repo_2.46.bb
 create mode 100644 meta/recipes-devtools/repo/repo_2.47.bb

diff --git a/meta/recipes-devtools/repo/repo_2.46.bb b/meta/recipes-devtools/repo/repo_2.46.bb
deleted file mode 100644
index 147b09ce85..0000000000
--- a/meta/recipes-devtools/repo/repo_2.46.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-# SPDX-License-Identifier: MIT
-# Copyright (C) 2021 iris-GmbH infrared & intelligent sensors
-
-SUMMARY = "Tool for managing many Git repositories"
-DESCRIPTION = "Repo is a tool built on top of Git. Repo helps manage many Git repositories, does the uploads to revision control systems, and automates parts of the development workflow."
-HOMEPAGE = "https://android.googlesource.com/tools/repo"
-SECTION = "console/utils"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main \
-           "
-SRCREV = "0444ddf78e3026056ee3786119e595909c039ff2"
-
-MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git"
-
-S = "${WORKDIR}/git"
-
-do_configure:prepend() {
-	sed -Ei "s/REPO_REV\s*=\s*('|\")stable('|\")/REPO_REV = '${SRCREV}'/g" ${S}/repo
-}
-
-do_install() {
-	install -D ${S}/repo ${D}${bindir}/repo
-}
-
-RDEPENDS:${PN} = "python3 git"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/repo/repo_2.47.bb b/meta/recipes-devtools/repo/repo_2.47.bb
new file mode 100644
index 0000000000..adebea1c8e
--- /dev/null
+++ b/meta/recipes-devtools/repo/repo_2.47.bb
@@ -0,0 +1,30 @@
+# SPDX-License-Identifier: MIT
+# Copyright (C) 2021 iris-GmbH infrared & intelligent sensors
+
+SUMMARY = "Tool for managing many Git repositories"
+DESCRIPTION = "Repo is a tool built on top of Git. Repo helps manage many Git repositories, does the uploads to revision control systems, and automates parts of the development workflow."
+HOMEPAGE = "https://android.googlesource.com/tools/repo"
+SECTION = "console/utils"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main \
+           "
+SRCREV = "1e19f7dd61923b8835d9c6e1a7e560575dafaf1e"
+
+MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git"
+
+S = "${WORKDIR}/git"
+
+do_configure:prepend() {
+	sed -Ei "s/REPO_REV\s*=\s*('|\")stable('|\")/REPO_REV = '${SRCREV}'/g" ${S}/repo
+}
+
+do_install() {
+	install -D ${S}/repo ${D}${bindir}/repo
+}
+
+RDEPENDS:${PN} = "python3 git"
+
+BBCLASSEXTEND = "native nativesdk"
-- 
cgit v1.2.3-54-g00ecf