summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2024-03-06 07:42:23 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-03-07 17:25:03 +0000
commit494b7c73c8a38efdfa3d4894e8078bf69e371a38 (patch)
tree88e7985d7087da1c47d0a7a120279c03b681a7dc /meta/recipes-devtools
parent8479b1d2f9c69e663b84c6ec93e962cae5fc350c (diff)
downloadpoky-494b7c73c8a38efdfa3d4894e8078bf69e371a38.tar.gz
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>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/repo/repo/0001-python3-shebang.patch26
-rw-r--r--meta/recipes-devtools/repo/repo_2.42.bb (renamed from meta/recipes-devtools/repo/repo_2.41.bb)3
2 files changed, 1 insertions, 28 deletions
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 @@
1From b8e84b202cd302a7c99288d3835dc9c63071f8f2 Mon Sep 17 00:00:00 2001
2From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
3Date: Tue, 14 Sep 2021 16:46:51 +0200
4Subject: [PATCH] python3 shebang
5
6Yocto does not symlink from python to python3, thus change the shebang from
7python to python3.
8
9Upstream-Status: Inappropriate [configuration]
10Signed-off-by: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com>
11---
12 repo | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/repo b/repo
16index b13e34c..205e0e5 100755
17--- a/repo
18+++ b/repo
19@@ -1,4 +1,4 @@
20-#!/usr/bin/env python
21+#!/usr/bin/env python3
22 #
23 # Copyright (C) 2008 The Android Open Source Project
24 #
25--
262.33.0
diff --git a/meta/recipes-devtools/repo/repo_2.41.bb b/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"
10LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" 10LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
11 11
12SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main \ 12SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main \
13 file://0001-python3-shebang.patch \
14 " 13 "
15SRCREV = "4217a82bec7b95c1a0bc7b081a1764a6a6d6c59b" 14SRCREV = "5554572f02537b8646139d59ab520e59e1d5f7b3"
16 15
17MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git" 16MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git"
18 17