From: Tim Orling <ticotimo@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Tim Orling <tim.orling@konsulko.com>
Subject: [PATCH 1/3] lib/oe/distro_check: find the latest Ubuntu release from meta-release
Date: Sat, 14 Nov 2026 18:19:12 -0800 [thread overview]
Message-ID: <20261115021914.67744-2-tim.orling@konsulko.com> (raw)
In-Reply-To: <20261115021914.67744-1-tim.orling@konsulko.com>
find_latest_ubuntu_release() asked the archive for its dists/ listing
newest first and took the first *-updates entry, but the archive ignores
the sort and lists the oldest first, so Ubuntu was always xenial. Read
the release list that do-release-upgrade uses instead, and take the last
supported release.
Tested against changelogs.ubuntu.com and archive.ubuntu.com: resolute,
with main and updates packages.
[YOCTO #16509]
AI-Generated: Claude Opus 5.5
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
meta/lib/oe/distro_check.py | 26 ++++++++++---------
.../oeqa/selftest/cases/oelib/distro_check.py | 26 +++++++++++++++++++
2 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/meta/lib/oe/distro_check.py b/meta/lib/oe/distro_check.py
index 223bed2ec2..814b35b8d8 100644
--- a/meta/lib/oe/distro_check.py
+++ b/meta/lib/oe/distro_check.py
@@ -131,23 +131,25 @@ def get_latest_released_debian_source_package_list(d):
package_names |= get_debian_style_source_package_list(url, "updates", d)
return latest, package_names
-def find_latest_ubuntu_release(url, d):
+def find_latest_ubuntu_release(d):
"""
- Find the latest listed Ubuntu release on the given ubuntu/dists/ URL.
-
- To avoid matching development releases look for distributions that have
- updates, so the resulting distro could be any supported release.
+ Find the latest supported Ubuntu release, from the list of releases
+ that do-release-upgrade reads. The releases are listed oldest first.
"""
- url += "?C=M;O=D" # Descending Sort by Last Modified
- for link in get_links_from_url(url, d):
- if "-updates" in link:
- distro = link.replace("-updates", "")
- return distro
- return "_NotFound_"
+ latest = "_NotFound_"
+ dist = None
+ listing = create_socket("https://changelogs.ubuntu.com/meta-release", d).read().decode("utf-8")
+ for line in listing.splitlines():
+ key, _, value = line.partition(":")
+ if key == "Dist":
+ dist = value.strip()
+ elif key == "Supported" and value.strip() == "1" and dist:
+ latest = dist
+ return latest
def get_latest_released_ubuntu_source_package_list(d):
"Returns list of all the name os packages in the latest ubuntu distro"
- latest = find_latest_ubuntu_release("http://archive.ubuntu.com/ubuntu/dists/", d)
+ latest = find_latest_ubuntu_release(d)
url = "http://archive.ubuntu.com/ubuntu/dists/%s/main/source/Sources.gz" % latest
package_names = get_debian_style_source_package_list(url, "main", d)
url = "http://archive.ubuntu.com/ubuntu/dists/%s-updates/main/source/Sources.gz" % latest
diff --git a/meta/lib/oeqa/selftest/cases/oelib/distro_check.py b/meta/lib/oeqa/selftest/cases/oelib/distro_check.py
index f47d1dd4a4..7545fa0c42 100644
--- a/meta/lib/oeqa/selftest/cases/oelib/distro_check.py
+++ b/meta/lib/oeqa/selftest/cases/oelib/distro_check.py
@@ -31,6 +31,32 @@ class TestDebianStyleSourcePackageList(TestCase):
def test_xz(self):
self.check("http://example.com/Sources.xz", lzma.compress(SOURCES))
+META_RELEASE = b"""Dist: noble
+Name: Noble Numbat
+Version: 24.04.5 LTS
+Supported: 1
+
+Dist: questing
+Name: Questing Quokka
+Version: 25.10
+Supported: 0
+
+Dist: resolute
+Name: Resolute Raccoon
+Version: 26.04.1 LTS
+Supported: 1
+
+Dist: zzz
+Name: Not supported any more
+Version: 99.10
+Supported: 0
+"""
+
+class TestFindLatestUbuntuRelease(TestCase):
+ def test_latest_supported(self):
+ with mock.patch.object(oe.distro_check, "create_socket", return_value=io.BytesIO(META_RELEASE)):
+ self.assertEqual(oe.distro_check.find_latest_ubuntu_release(None), "resolute")
+
class TestCreateDistroPackagesList(TestCase):
def test_skip_failed_distro(self):
"""
--
2.56.1
next prev parent reply other threads:[~2026-11-15 2:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-15 2:19 [PATCH 0/3] distro_check: fix the Ubuntu and openSUSE package lists, drop Clear Tim Orling
2026-11-15 2:19 ` Tim Orling [this message]
2026-11-15 2:19 ` [PATCH 2/3] lib/oe/distro_check: fix the openSUSE Leap package lists Tim Orling
2026-11-16 15:01 ` [OE-core] " Richard Purdie
2026-11-15 2:19 ` [PATCH 3/3] lib/oe/distro_check: drop Clear Linux Tim Orling
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261115021914.67744-2-tim.orling@konsulko.com \
--to=ticotimo@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=tim.orling@konsulko.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox