From 3200a7d7be7eb1eca61b66d8ee8b5b0eabb78714 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 7 Jul 2022 15:49:01 +0200 Subject: uprev-srcrev: workaround upstream changes The uprev-srcrev tool currently crashes with some python backtraces. This is caused by changes in the bitbake fetcher code. See bitbake, commit 4b5eed16 ("fetch2/cooker: Fix source revision handling with floating upstreams") Workaround it by calling bb.fetch2.get_srcrev() if AUTOINC is not in PV. For makes all recipes we currently uprev succeed. Related-to: ELB-4590 Signed-off-by: Max Krummenacher --- lib/recipetool/updatesrcrev.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/recipetool/updatesrcrev.py b/lib/recipetool/updatesrcrev.py index 0c6fb19..2a48b64 100644 --- a/lib/recipetool/updatesrcrev.py +++ b/lib/recipetool/updatesrcrev.py @@ -50,6 +50,10 @@ def updatesrcrev(args): if not src_uri.startswith(('git://', 'gitsm://')): continue + # Workaround check in fetcher code, see bitbake commit 4b5eed16 + if not "AUTOINC" in pv: + pkgpv = bb.fetch2.get_srcrev(rd, 'gitpkgv_revision') + ud = bb.fetch2.FetchData(src_uri, rd) # Allow multiple "named" git repos for name in ud.names: -- cgit v1.2.3