Add Ubuntu 26.04 resolute support#659
Conversation
|
This Pull Request has been automatically marked as "stale" because it has not had recent activity (for 15 days). It will be closed if no further activity occurs. Thank you for your contribution. |
|
@samip5 Could you take a look at my PR? Thanks |
|
No as I no longer maintain it. |
|
I am looking at it now. |
There was a problem hiding this comment.
Pull request overview
Adds an Ubuntu 26.04 "Resolute" track to the multi-track baseimage build system, alongside the existing Noble (24.04) and Jammy (22.04) tracks. Because 24.04+ ships APT sources in the new DEB822 (.sources) format, prepare.sh is updated to handle both formats when enabling Universe/Multiverse.
Changes:
- Register
resolute-*tag prefix →ubuntu:26.04in the build workflow and add a Resolute entry to the scheduled rebuild matrix. - Teach
prepare.shto enable Universe/Multiverse in DEB822.sourcesfiles on Ubuntu ≥ 24.04, falling back to the legacysources.listedits otherwise. - Update README to reflect the multi-track lineup.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| .github/workflows/main.yml | Map resolute-* release tag prefix to ubuntu:26.04; update warning message to list the new prefix. |
| .github/workflows/scheduled-build.yml | Add a resolute / ubuntu:26.04 entry to the weekly rebuild matrix; bump one actions/checkout use to v6. |
| image/prepare.sh | Detect Ubuntu ≥ 24.04 and edit DEB822 .sources files; keep legacy sources.list handling for older releases. |
| README.md | Update component table to mention the 26.04/24.04/22.04 tracks. |
Comments suppressed due to low confidence (2)
image/prepare.sh:22
- The DEB822 sed patterns only match exact strings
Components: mainorComponents: main restricted. If the Ubuntu base image's.sourcesfile has any other combination (e.g.,Components: main restricted universe, an additional component, or a different order/spacing), neither substitution will match and universe/multiverse will silently remain disabled. The legacy branch above was tolerant viadeb.*universepatterns; consider a more robust approach such as parsing/rewriting theComponents:line generically (e.g., always appendinguniverseandmultiverseif absent) so this doesn't silently break on a future image update.
sed -i 's/^Components: main$/Components: main restricted universe multiverse/' "$f"
sed -i 's/^Components: main restricted$/Components: main restricted universe multiverse/' "$f"
image/prepare.sh:23
- The DEB822 branch only edits the
Components:line, but the legacy branch also uncommenteddeb-srclines (the original code's intent stated in the comment on line 13 — "and deb-src for main"). DEB822 source files use a separateTypes: debline; on Ubuntu 24.04 ubuntu.sources defaults toTypes: deb(nodeb-src). After this change, source packages will not be available on the 24.04/26.04 tracks, which is a behavioral regression relative to the jammy track. Consider also rewritingTypes: debtoTypes: deb deb-srcif deb-src is intended to be enabled.
# DEB822 format: enable universe and multiverse components
for f in /etc/apt/sources.list.d/*.sources; do
sed -i 's/^Components: main$/Components: main restricted universe multiverse/' "$f"
sed -i 's/^Components: main restricted$/Components: main restricted universe multiverse/' "$f"
done
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
@houssemexo26 Please apply copilot's suggestions and let me know, then I will merge this in. |
… the existing Noble (24.04) and Jammy (22.04) tracks. Changes: main.yml: add resolute-* tag prefix → ubuntu:26.04 mapping scheduled-build.yml: add Resolute matrix entry to weekly security rebuild prepare.sh: handle DEB822 .sources format (used by Ubuntu 24.04+) alongside legacy sources.list for universe/multiverse activation README.md: update component table to reflect multi-track support
Done |
Add Ubuntu 26.04 "Resolute" as a supported base image track alongside the existing Noble (24.04) and Jammy (22.04) tracks.
Changes:
resolute-*tag prefix → ubuntu:26.04 mapping