[PATCH 1/2] base.bbclass: Enable the addition of epoch in an apt SRC_URI's version.

[Amy Fong]

From: Amy Fong <amy....@siemens.com>

If the epoch is added in an apt's package version, there will be an
exception thrown as base.bbclass tries to parse the entry as a URI
(it complains about an invalid port). (man deb-version)

e.g. SRC_URI = "apt://cryptsetup=2:2.6.1-4~deb12u2

Fix: remove apt:// entries in URI validation list.

Signed-off-by: Amy Fong <amy....@siemens.com>
---
meta/classes/base.bbclass | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index b8825bd3..7d4ab49f 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -123,9 +123,10 @@ python() {
needsrcrev = False
srcuri = d.getVar('SRC_URI')
for uri_string in srcuri.split():
- uri = bb.fetch.URI(uri_string)
- if uri.scheme in ("svn", "git", "gitsm", "hg", "p4", "repo"):
- needsrcrev = True
+ if not uri_string.startswith("apt://"):
+ uri = bb.fetch.URI(uri_string)
+ if uri.scheme in ("svn", "git", "gitsm", "hg", "p4", "repo"):
+ needsrcrev = True

if needsrcrev:
d.setVar("SRCPV", "${@bb.fetch2.get_srcrev(d)}")
--
2.39.5

[Jan Kiszka]

Looks good to me.

Jan

--
Siemens AG, Foundational Technologies
Linux Expert Center

[Uladzimir Bely]

Patch 1 applied to next, thanks.

--
Best regards,
Uladzimir.