From 53c268bc8710bb1c2c8a845463689f90f2bc7b78 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Sun, 17 May 2026 00:19:19 -0600
Subject: [PATCH] ubuntu-release-upgrade: add support for non-amd64

---
 .../006-tune-final_sources.list.patch         | 39 +++++++++++++++++++
 helpers/make-ubuntu-release-upgrader          |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/helpers/DATA/ubuntu-release-upgrader/patch_changes/006-tune-final_sources.list.patch b/helpers/DATA/ubuntu-release-upgrader/patch_changes/006-tune-final_sources.list.patch
index 8e2998c2..f3a29c25 100644
--- a/helpers/DATA/ubuntu-release-upgrader/patch_changes/006-tune-final_sources.list.patch
+++ b/helpers/DATA/ubuntu-release-upgrader/patch_changes/006-tune-final_sources.list.patch
@@ -59,3 +59,42 @@ index a03dad7a..1f1b74df 100644
                                "valid entry for '%s' was found.\n\n"
                                "Should default entries for '%s' be "
                                "added? If you select 'No', the upgrade "
+diff --git a/DistUpgrade/DistUpgradeController.py b/DistUpgrade/DistUpgradeController.py
+index dd9d171d..10e545fb 100644
+--- a/DistUpgrade/DistUpgradeController.py
++++ b/DistUpgrade/DistUpgradeController.py
+@@ -781,16 +781,6 @@ class DistUpgradeController(object):
+                     self.sources_disabled = True
+                     logging.debug("entry '%s' was disabled (unknown dist)" % get_string_with_no_auth_from_source_entry(entry))
+ 
+-                # if we make it to this point, we have an official or
+-                # third-party mirror check if the arch is one not on the main
+-                # archive and if so, transition to ports.ubuntu.com
+-                if (entry.type == "deb" and
+-                    ("archive.trisquel.org" in entry.uri or
+-                     "archive.trisquel.org" in entry.uri) and
+-                    (self.arch not in ("amd64", "i386"))):
+-                    logging.debug("moving %s source entry to 'ports.ubuntu.com' " % self.arch)
+-                    entry.uri = "http://ports.ubuntu.com/ubuntu-ports/"
+-
+                 # gather what components are enabled and are inconsistent
+                 for d in ["%s" % self.toDist,
+                           "%s-updates" % self.toDist,
+@@ -1202,8 +1192,7 @@ class DistUpgradeController(object):
+ 
+             # deb-src entries, security archive URIs, and sources without only
+             # -security or -backports enabled are not valid "to" sources.
+-            valid_uris = [u for u in entry.uris \
+-                          if "/archive.trisquel.org" not in u]
++            valid_uris = entry.uris
+             valid_suites = [s for s in entry.suites \
+                             if s.rsplit('-', 1)[-1] not in ["backports", "security"]]
+             valid_to = "deb" in entry.types and valid_uris and valid_suites
+@@ -2254,7 +2243,6 @@ class DistUpgradeController(object):
+                 self.isMirror(entry.uri) and
+                 "main" in entry.comps and
+                 "%s-updates" % self.fromDist in entry.dist and
+-                not entry.uri.startswith("http://archive.trisquel.org") and
+                 not entry.uri.startswith("http://archive.trisquel.org") ):
+                 new_line = "deb %s %s-updates main\n" % (entry.uri, self.fromDist)
+                 if not new_line in lines:
diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader
index 76a4199b..eaafc555 100644
--- a/helpers/make-ubuntu-release-upgrader
+++ b/helpers/make-ubuntu-release-upgrader
@@ -25,7 +25,7 @@
 # Also, don't forget to update the meta-release files at archive and packages.t.i
 # The "obsoletes" list from ubuntu has been removed
 
-VERSION=24
+VERSION=25
 
 . ./config
 # Previous upstream release name, update for each release.