bitbake: fetch2: support URL rev paramter for named URLs together with default

Support the rev parameter for named SRC_URIs together with SRCREV or
SRCREV:pn-<PN>. Only raise conflicting revisions fetch error for rev
parameter and SRCREV_<NAME> or SRCREV_<NAME>:pn-<PN>

(Bitbake rev: b0776be3de56f6e78d0bb046d6238bdb8dcf8091)

Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 4 insertions, 3 deletions

diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index d26c912df4..05ab2a5b75 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -1226,9 +1226,10 @@ def srcrev_internal_helper(ud, d, name):
         attempts.append("SRCREV_%s:pn-%s" % (name, pn))
     if name != '':
         attempts.append("SRCREV_%s" % name)
-    if pn:
-        attempts.append("SRCREV:pn-%s" % pn)
-    attempts.append("SRCREV")
+    if name == 'default' or 'rev' not in ud.parm:
+        if pn:
+            attempts.append("SRCREV:pn-%s" % pn)
+        attempts.append("SRCREV")
 
     for a in attempts:
         srcrev = d.getVar(a)