[yocto-autobuilder2] builders: Show tags on separate gits

diff --git a/builders.py b/builders.py
index 18c119aa7617..b7379ece71f2 100644
--- a/builders.py
+++ b/builders.py
@@ -272,6 +272,13 @@  def prioritizeBuilders(master, builders):
     #log.msg("Using %s" % str(rv))
     return rv
 
+# Tags in poky-ci-archive are prefixed with the name of the repo, except for
+# poky itself.
+tag_prefixes = {"poky": "",
+                "bitbake": "bitbake/",
+                "oecore": "oecore/",
+                "meta-yocto": "meta-yocto/"}
+
 @util.renderer
 def createBuildTag(props):
     buildername = props.getProperty('buildername')
@@ -313,10 +320,12 @@  def create_parent_builder_factory(buildername, waitname):
         name="Prepare shared repositories"))
     factory.addStep(steps.SetProperty(
         property="poky-ci-archive_tag", value=createBuildTag))
-    tagurl = util.Interpolate('https://git.yoctoproject.org/poky-ci-archive/log/?h=%(kw:tag)s',
-                              tag=createBuildTag)
-    factory.addStep(steps.SetProperty(
-        property="poky-ci-archive_url", value=tagurl))
+
+    for repo, prefix in tag_prefixes.items():
+        tagurl = util.Interpolate('https://git.yoctoproject.org/poky-ci-archive/log/?h=%(kw:prefix)s%(kw:tag)s',
+                                  prefix=prefix, tag=createBuildTag)
+        factory.addStep(steps.SetProperty(
+            property=f"poky-ci-archive_url_{repo}", value=tagurl))
     factory.addStep(steps.SetProperty(
         property="sharedrepolocation",
         value=util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir))
@@ -366,7 +375,6 @@  def create_parent_builder_factory(buildername, waitname):
             "yp_build_revision": util.Property("yp_build_revision"),
             "yp_build_branch": util.Property("yp_build_branch"),
             "poky-ci-archive_tag": util.Property("poky-ci-archive_tag"),
-            "poky-ci-archive_url": util.Property("poky-ci-archive_url")
         }
 
         for repo in config.buildertorepos[buildername]:
@@ -377,6 +385,9 @@  def create_parent_builder_factory(buildername, waitname):
         set_props["milestone_number"] = util.Property("milestone_number")
         set_props["rc_number"] = util.Property("rc_number")
 
+        for repo in tag_prefixes:
+            set_props[f"poky-ci-archive_url_{repo}"] = util.Property(f"poky-ci-archive_url_{repo}")
+
         return set_props
 
     factory.addStep(steps.Trigger(schedulerNames=[waitname],
diff --git a/docker/yocto-autobuilder2_patches/0001-builders-Do-not-create-tags-during-builds.patch b/docker/yocto-autobuilder2_patches/0001-builders-Do-not-create-tags-during-builds.patch
index b36f2ea7e83e..c1482f72c8e4 100644
--- a/docker/yocto-autobuilder2_patches/0001-builders-Do-not-create-tags-during-builds.patch
+++ b/docker/yocto-autobuilder2_patches/0001-builders-Do-not-create-tags-during-builds.patch
@@ -5,14 +5,14 @@  Subject: [PATCH 1/2] builders: Do not create tags during builds
 
 Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
 ---
- builders.py | 9 ---------
- 1 file changed, 9 deletions(-)
+ builders.py | 13 -------------
+ 1 file changed, 13 deletions(-)
 
 diff --git a/builders.py b/builders.py
-index 2fb0bf827b0f..af1cc263fd2e 100644
+index b7379ece71f2..d87e41c9233e 100644
 --- a/builders.py
 +++ b/builders.py
-@@ -307,16 +307,9 @@ def create_parent_builder_factory(buildername, waitname):
+@@ -314,18 +314,9 @@ def create_parent_builder_factory(buildername, waitname):
              util.Interpolate("%(prop:builddir)s/layerinfo.json"),
              util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir)),
              "-p", get_publish_dest,
@@ -22,22 +22,33 @@  index 2fb0bf827b0f..af1cc263fd2e 100644
          name="Prepare shared repositories"))
 -    factory.addStep(steps.SetProperty(
 -        property="poky-ci-archive_tag", value=createBuildTag))
--    tagurl = util.Interpolate('https://git.yoctoproject.org/poky-ci-archive/log/?h=%(kw:tag)s',
--                              tag=createBuildTag)
--    factory.addStep(steps.SetProperty(
--        property="poky-ci-archive_url", value=tagurl))
+-
+-    for repo, prefix in tag_prefixes.items():
+-        tagurl = util.Interpolate('https://git.yoctoproject.org/poky-ci-archive/log/?h=%(kw:prefix)s%(kw:tag)s',
+-                                  prefix=prefix, tag=createBuildTag)
+-        factory.addStep(steps.SetProperty(
+-            property=f"poky-ci-archive_url_{repo}", value=tagurl))
      factory.addStep(steps.SetProperty(
          property="sharedrepolocation",
          value=util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir))
-@@ -365,8 +358,6 @@ def create_parent_builder_factory(buildername, waitname):
+@@ -374,7 +365,6 @@ def create_parent_builder_factory(buildername, waitname):
              "rc_number": util.Property("rc_number"),
              "yp_build_revision": util.Property("yp_build_revision"),
              "yp_build_branch": util.Property("yp_build_branch"),
 -            "poky-ci-archive_tag": util.Property("poky-ci-archive_tag"),
--            "poky-ci-archive_url": util.Property("poky-ci-archive_url")
          }
  
          for repo in config.buildertorepos[buildername]:
+@@ -385,9 +375,6 @@ def create_parent_builder_factory(buildername, waitname):
+         set_props["milestone_number"] = util.Property("milestone_number")
+         set_props["rc_number"] = util.Property("rc_number")
+ 
+-        for repo in tag_prefixes:
+-            set_props[f"poky-ci-archive_url_{repo}"] = util.Property(f"poky-ci-archive_url_{repo}")
+-
+         return set_props
+ 
+     factory.addStep(steps.Trigger(schedulerNames=[waitname],
 -- 
 2.47.3