From 4e4330df784279da9879feb9550e4d079ac6ae7a Mon Sep 17 00:00:00 2001
From: Packet Please <pktpls@systemli.org>
Date: Sun, 3 Nov 2024 04:14:25 +0100
Subject: [PATCH 1/3] buildbot: assemble a profiles.json of all targets

---
 roles/buildbot/files/targets.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/roles/buildbot/files/targets.py b/roles/buildbot/files/targets.py
index ac82ecd..7ca77df 100644
--- a/roles/buildbot/files/targets.py
+++ b/roles/buildbot/files/targets.py
@@ -246,6 +246,7 @@ def targetsFactory(f, wwwPrefix):
         "%(kw:prefix)s/builds/targets/%(prop:buildnumber)s", prefix=wwwPrefix
     )
     pubdir = util.Interpolate("%(kw:pr)s/%(kw:pd)s", pr=wwwPrefix, pd=targetsPubDir)
+
     f.addStep(
         steps.MasterShellCommand(
             name="publish",
@@ -279,7 +280,9 @@ def targetsFactory(f, wwwPrefix):
                     # since we want to be able to just delete that at any time,
                     # without worrying about symlinks pointing to deleted stuff.
                     """\
-mkdir -p %(kw:p)s %(kw:p)s.new \
+cat %(kw:w)s/tunneldigger/*/*/profiles.json | jq -s . > %(kw:w)s/tunneldigger/profiles.json \
+    && cat %(kw:w)s/notunnel/*/*/profiles.json | jq -s . > %(kw:w)s/notunnel/profiles.json \
+    && mkdir -p %(kw:p)s %(kw:p)s.new \
     && rm -rf %(kw:p)s.new/* %(kw:p)s.prev \
     && mv %(kw:w)s/* %(kw:p)s.new/ \
     && mv %(kw:p)s %(kw:p)s.prev \

From 828ebe47460e5e8ba7b8bf212fbfefed3aa87245 Mon Sep 17 00:00:00 2001
From: Packet Please <pktpls@systemli.org>
Date: Sun, 3 Nov 2024 04:15:29 +0100
Subject: [PATCH 2/3] buildbot: remove ui options removed in 4.0

---
 roles/buildbot/files/master.cfg | 2 --
 1 file changed, 2 deletions(-)

diff --git a/roles/buildbot/files/master.cfg b/roles/buildbot/files/master.cfg
index 1748370..7cc966a 100644
--- a/roles/buildbot/files/master.cfg
+++ b/roles/buildbot/files/master.cfg
@@ -59,8 +59,6 @@ c['www']['ui_default_config'] = {
     'Builders.page_size': 500,
     'Build.trigger_step_page_size': 100,
     'BuildRequests.buildrequestFetchLimit': 100,
-    'Home.max_recent_builds': 1, # broken?
-    'Home.max_recent_builders': 3, # broken?
 }
 
 c['change_source'] = []

From 90979579de92bcb2a1b664d9e48c45f51ab64737 Mon Sep 17 00:00:00 2001
From: Packet Please <pktpls@systemli.org>
Date: Sun, 3 Nov 2024 04:16:17 +0100
Subject: [PATCH 3/3] buildbot: OpenWrt 24.10 and Falter 1.5.0 branches

---
 roles/buildbot/files/packages.py | 1 +
 roles/buildbot/files/targets.py  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/roles/buildbot/files/packages.py b/roles/buildbot/files/packages.py
index 5680d92..a26da0f 100644
--- a/roles/buildbot/files/packages.py
+++ b/roles/buildbot/files/packages.py
@@ -102,6 +102,7 @@ def archTriggerStep(arch):
 def branchToFalterBranch(props):
     o2f = {
         "main": "snapshot",
+        "openwrt-24.10": "1.5.0-snapshot",
         "openwrt-23.05": "1.4.0-snapshot",
         "openwrt-22.03": "1.3.0-snapshot",
         "openwrt-21.02": "1.2.3-snapshot",
diff --git a/roles/buildbot/files/targets.py b/roles/buildbot/files/targets.py
index 7ca77df..5264497 100644
--- a/roles/buildbot/files/targets.py
+++ b/roles/buildbot/files/targets.py
@@ -167,6 +167,8 @@ def targetsFalterBranch(props):
         return "1.3.0-snapshot"
     elif fv.startswith("1.4.0"):
         return "1.4.0-snapshot"
+    elif fv.startswith("1.5.0"):
+        return "1.5.0-snapshot"
     else:
         return "snapshot"