diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-03-06 07:42:23 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-07 17:25:03 +0000 |
commit | 494b7c73c8a38efdfa3d4894e8078bf69e371a38 (patch) | |
tree | 88e7985d7087da1c47d0a7a120279c03b681a7dc /meta/recipes-devtools/repo | |
parent | 8479b1d2f9c69e663b84c6ec93e962cae5fc350c (diff) | |
download | poky-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/repo')
-rw-r--r-- | meta/recipes-devtools/repo/repo/0001-python3-shebang.patch | 26 | ||||
-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 @@ | |||
1 | From b8e84b202cd302a7c99288d3835dc9c63071f8f2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com> | ||
3 | Date: Tue, 14 Sep 2021 16:46:51 +0200 | ||
4 | Subject: [PATCH] python3 shebang | ||
5 | |||
6 | Yocto does not symlink from python to python3, thus change the shebang from | ||
7 | python to python3. | ||
8 | |||
9 | Upstream-Status: Inappropriate [configuration] | ||
10 | Signed-off-by: Jasper Orschulko <Jasper.Orschulko@iris-sensing.com> | ||
11 | --- | ||
12 | repo | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/repo b/repo | ||
16 | index 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 | -- | ||
26 | 2.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" | |||
10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
11 | 11 | ||
12 | SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main \ | 12 | SRC_URI = "git://gerrit.googlesource.com/git-repo.git;protocol=https;branch=main \ |
13 | file://0001-python3-shebang.patch \ | ||
14 | " | 13 | " |
15 | SRCREV = "4217a82bec7b95c1a0bc7b081a1764a6a6d6c59b" | 14 | SRCREV = "5554572f02537b8646139d59ab520e59e1d5f7b3" |
16 | 15 | ||
17 | MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git" | 16 | MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git" |
18 | 17 | ||