From 494b7c73c8a38efdfa3d4894e8078bf69e371a38 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 6 Mar 2024 07:42:23 -0800
Subject: [PATCH] repo: upgrade 2.41 -> 2.42

Drop patch as issue fixed upstream:
https://gerrit.googlesource.com/git-repo/+/b8139bdcf87540fbe88a8b9180c052f5cc3a91b7

(From OE-Core rev: a6f2c8bf9306184e2184d7c5187e4db677cdcae2)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../repo/repo/0001-python3-shebang.patch      | 26 -------------------
 .../repo/{repo_2.41.bb => repo_2.42.bb}       |  3 +--
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 meta/recipes-devtools/repo/repo/0001-python3-shebang.patch
 rename meta/recipes-devtools/repo/{repo_2.41.bb => repo_2.42.bb} (90%)

diff --git a/meta/recipes-devtools/repo/repo/0001-python3-shebang.patch b/meta/recipes-devtools/repo/repo/0001-python3-shebang.patch
deleted file mode 100644
index fba89a32d8..0000000000
--- a/meta/recipes-devtools/repo/repo/0001-python3-shebang.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b8e84b202cd302a7c99288d3835dc9c63071f8f2 Mon Sep 17 00:00:00 2001
-From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
-Date: Tue, 14 Sep 2021 16:46:51 +0200
-Subject: [PATCH] python3 shebang
-
-Yocto does not symlink from python to python3, thus change the shebang from
-python to python3.
-
-Upstream-Status: Inappropriate [configuration]
-Signed-off-by: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
----
- repo | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/repo b/repo
-index b13e34c..205e0e5 100755
---- a/repo
-+++ b/repo
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Copyright (C) 2008 The Android Open Source Project
- #
---
-2.33.0
diff --git a/meta/recipes-devtools/repo/repo_2.41.bb b/meta/recipes-devtools/repo/repo_2.42.bb
similarity index 90%
rename from meta/recipes-devtools/repo/repo_2.41.bb
rename to meta/recipes-devtools/repo/repo_2.42.bb
index 4d614d9c5f..9bb5000fab 100644
--- a/meta/recipes-devtools/repo/repo_2.41.bb
+++ b/meta/recipes-devtools/repo/repo_2.42.bb
@@ -10,9 +10,8 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main \
-           file://0001-python3-shebang.patch \
            "
-SRCREV = "4217a82bec7b95c1a0bc7b081a1764a6a6d6c59b"
+SRCREV = "5554572f02537b8646139d59ab520e59e1d5f7b3"
 
 MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git"