Skip to content

Enable Ubuntu Resolute image build#9164

Merged
tabrisnet merged 4 commits into
armbian:mainfrom
iav:kernel_with_resolute
Jan 16, 2026
Merged

Enable Ubuntu Resolute image build#9164
tabrisnet merged 4 commits into
armbian:mainfrom
iav:kernel_with_resolute

Conversation

@iav

@iav iav commented Jan 5, 2026

Copy link
Copy Markdown
Contributor

Enable Ubuntu Resolute image build.

Copy file structure from config/cli/resolute to config/cli/noble.

Undo APA (#9164 (comment)).

How Has This Been Tested?

Build edge, current images for noble, resolute, trixie
./compile.sh EXPERT=yes BOARD=helios64 KERNEL_CONFIGURE=no BUILD_MINIMAL=yes KERNEL_BTF=no KERNEL_GIT=shallow INSTALL_HEADERS=yes RELEASE=trixie BRANCH=current

  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

Summary by CodeRabbit

  • Chores
    • Added 56 additional system packages (development tools, system utilities, hardware/network tools, and admin utilities).
    • Pointed variant-specific configurations to shared common configuration entries to centralize behavior.
    • Disabled automatic APA enablement for Debian Unstable; APA will remain off unless manually enabled.

✏️ Tip: You can customize this high-level summary in your review settings.

@iav iav requested review from a team and igorpecovnik as code owners January 5, 2026 06:57
@coderabbitai

coderabbitai Bot commented Jan 5, 2026

Copy link
Copy Markdown
Contributor

Caution

Review failed

The pull request is closed.

📝 Walkthrough

Walkthrough

Adds per-variant symlinked config files for resolute and questing pointing to shared common paths, introduces per-variant package.additional lists (56 packages each), and comments out the APA auto-enable conditional in lib/functions/configuration/main-config.sh.

Changes

Cohort / File(s) Summary
Config redirections (debootstrap & main)
config/cli/resolute/debootstrap/{components,packages}, config/cli/resolute/main/{config_desktop,packages,packages.uninstall}, config/cli/questing/debootstrap/{components,packages}, config/cli/questing/main/{config_desktop,packages,packages.uninstall}
New files with single-line relative references to ../../common/..., delegating resolute/questing configs to shared common paths.
Additional package lists
config/cli/resolute/main/packages.additional, config/cli/questing/main/packages.additional
New data files each adding 56 Debian/apt package names (one per line). No code logic changes.
APA enablement change
lib/functions/configuration/main-config.sh
Removed/disabled the conditional that auto-enabled the APA extension for sid/questing/resolute; left as commented placeholder.

Sequence Diagram(s)

(omitted — changes are config redirections and a minor script tweak, not a multi-component control-flow feature)

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Possibly related PRs

Suggested labels

Ready to merge

Suggested reviewers

  • igorpecovnik
  • tabrisnet
  • rpardini

Poem

🐰 I hop and link the paths I find,
Shared roots for configs, tidy and kind,
Fifty-six packages lined in a row,
APA quiet now, no automatic show,
A little rabbit cheers the branch — off I go!

🚥 Pre-merge checks | ✅ 2 | ❌ 1
❌ Failed checks (1 warning)
Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 50.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (2 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title 'Enable Ubuntu Resolute image build' directly summarizes the main objective of the PR, which is to enable building Ubuntu Resolute images by adding configuration files and disabling APA.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing touches
  • 📝 Generate docstrings


📜 Recent review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

  • Jira integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between 0ec7488 and 77ea430.

📒 Files selected for processing (13)
  • config/cli/questing/debootstrap/components
  • config/cli/questing/debootstrap/packages
  • config/cli/questing/main/config_desktop
  • config/cli/questing/main/packages
  • config/cli/questing/main/packages.additional
  • config/cli/questing/main/packages.uninstall
  • config/cli/resolute/debootstrap/components
  • config/cli/resolute/debootstrap/packages
  • config/cli/resolute/main/config_desktop
  • config/cli/resolute/main/packages
  • config/cli/resolute/main/packages.additional
  • config/cli/resolute/main/packages.uninstall
  • lib/functions/configuration/main-config.sh

✏️ Tip: You can disable this entire section by setting review_details to false in your review settings.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions github-actions Bot added size/medium PR with more then 50 and less then 250 lines 02 Milestone: First quarter release Needs review Seeking for review Framework Framework components labels Jan 5, 2026
@tabrisnet

Copy link
Copy Markdown
Collaborator

@leggewie Does the plan still include APA?

@iav

iav commented Jan 5, 2026

Copy link
Copy Markdown
Contributor Author

No, it's not linked.

@iav

iav commented Jan 5, 2026

Copy link
Copy Markdown
Contributor Author

I'm ashamed to admit, but I don't understand everything that is done with apa at all.

@tabrisnet

Copy link
Copy Markdown
Collaborator

What I was told back around November was that sid, questing & resolute were supposed to start the plan to ditch aggregation. Additionally, Resolute isn't scheduled for a release until April.
Admittedly, it is possible that APA is no longer the future, but I'd rather see that confirmed or not.
Meanwhile, #9000 plus APA [neither of which are really complete] are intended to solve this same problem resolutely.

@tabrisnet

Copy link
Copy Markdown
Collaborator

I'm ashamed to admit, but I don't understand everything that is done with apa at all.

high-level overview: config/cli & config/desktop get converted into task/meta-packages. As @leggewie described it, the goal was for a default install to have as short a list for apt-mark showmanual as reasonably possible, and otherwise have everything handled by Depends/Recommends/Suggests

@iav

iav commented Jan 5, 2026

Copy link
Copy Markdown
Contributor Author

It seems wrong to me to inherit a new version of ubuntu directly from debian if ubuntu is available.
The patch I propose does not change anything in essence, only mechanically continues what works now to the new version. It seemed to me that moving in small steps with small changes would be easier. The project with apa looks like a lot of work, but for now you need to live somehow.
I'm not suggesting that we abandon the new system, but we should live to see it ready.

@tabrisnet

tabrisnet commented Jan 5, 2026

Copy link
Copy Markdown
Collaborator

I don't exactly disagree, except that if resolute is Ubuntu 2026.4, then this PR is premature. We won't be considering resolute as a supported RELEASE before our own 2026.5, and 2026.2 isn't even out yet.
Then trying to rebase trees with components under continual flux is a PITA [which strictly speaking isn't your fault/problem], especially when one tree contains git rm of the files in question.

@iav

iav commented Jan 5, 2026

Copy link
Copy Markdown
Contributor Author

I understand.
But what if noble is too old (for one of my need), oracular eos, plucky not work and too old to fix, no questing, no resolute.
I need something that works. Even if it's not perfect enough, and you can do better. With this PR, I tried to solve the problem with minimal interference for those who want more.
I can suggest that instead of symlinks, just copy the files to the cli/, if this will facilitate the transition to APA.

@rpardini

rpardini commented Jan 5, 2026

Copy link
Copy Markdown
Member

While I agree that 1) we should enable resolute without APA 2) remove the traces of APA until that initiative produces some actual benefit that justifies it's inclusion; I do think we need to enable building on Resolute before targetting Resolute.

@tabrisnet

Copy link
Copy Markdown
Collaborator

While I agree that 1) we should enable resolute without APA 2) remove the traces of APA until that initiative produces some actual benefit that justifies it's inclusion; I do think we need to enable building on Resolute before targetting Resolute.

yes. but, and I admit this is an ass-umption, we won't certify it before our own 2026.5, then we can wait until post-2026.2.
ON THE OTHER HAND, it's a fair question as to the relevant cost of effort [of maintaining 2-3 branches with differing solutions]. I may be blowing that effort out of reasonable proportion, especially if the upstream [aka main] churn is low.
Personally, I just want to know what the plan is, does APA go forward with Leggewie, is another ownership team [I talked to @greeneg Saturday, I think he has sufficient background] formed [who will change how the pkgs are generated], or do we just 🗑️ the idea and rework aggregation.
I expect if we punt at this question for another month, we will effectively punt until the next LTS in 18-24 months.

@iav

iav commented Jan 5, 2026

Copy link
Copy Markdown
Contributor Author

Add questing folder too. Just to start use.
Aaand — without first commit they can't be builded too.

Not stopping from any works for future enhancements and reworks.
I just need buildable ubuntu images fresher than noble.

Please

@rpardini

rpardini commented Jan 6, 2026

Copy link
Copy Markdown
Member

@iav agree 100%.

Out of curiosity, how did you determine the contents of the new files? Did you simply copy one of the existing ones and it worked? Things added or removed?

This shows how we could instead of the APA fiasco, replace the aggregation (using those crazy files/symlinks) with simple bash code and a few helpers and be able to express in a few lines "Resolute is the same as X, minus Z" and gain the power of extensions/hooks on top for free.

@iav

iav commented Jan 6, 2026

Copy link
Copy Markdown
Contributor Author

Out of curiosity, how did you determine the contents of the new files? Did you simply copy one of the existing ones and it worked? Things added or removed?

I just copied the files.
Server build just works, desktop I doesn't try.
But even if it doesn't work — it's much easier to run and fix errors that appear than to design them from scratch.

@iav

iav commented Jan 6, 2026

Copy link
Copy Markdown
Contributor Author

Yes, and I don't see any problem in just replacing the symlink with a regular copy of the file exactly at the very moment when we find that it's time to change the file that was still working as a symlink.
The simlink works very well for a time. When we only needed to fix it for one release — we remove the link, put a copy in its place, and make a correction.

@iav iav force-pushed the kernel_with_resolute branch 4 times, most recently from 7bb1135 to 2d5525b Compare January 15, 2026 16:22
@tabrisnet

Copy link
Copy Markdown
Collaborator

So... having had a discussion with @igorpecovnik
I think this needs to have a revert of #8969 and deletion of https://github.com/leggewie/armbian-build/blob/main/lib/functions/configuration/main-config.sh#L324-L327
That is, APA is being disabled for now, and this can go forward.
NOTE: the prior state was symlinking questing/resolute to sid, but your way [presumably] works.

@tabrisnet

Copy link
Copy Markdown
Collaborator

we can of course revert #8969 separately

@iav

iav commented Jan 15, 2026

Copy link
Copy Markdown
Contributor Author

we can of course revert #8969 separately

Definitely, it will be clearer and cleaner separately.

@iav

iav commented Jan 15, 2026

Copy link
Copy Markdown
Contributor Author

deletion of https://github.com/leggewie/armbian-build/blob/main/lib/functions/configuration/main-config.sh#L324-L327

Sorry, I didn't understand.
In my opinion, "completely removing the lines main-config.sh#L324-L327" and "undoing #8969" are different things.
So should I undo or delete the lines?
Or comment out the only line without a comment in that block, so that I can uncomment it later?

@iav iav force-pushed the kernel_with_resolute branch from 2d5525b to 18fc481 Compare January 15, 2026 19:37
@iav

iav commented Jan 15, 2026

Copy link
Copy Markdown
Contributor Author

Would you like me to prepare a PR with #8969 reverted and the remaining line commented out?
2 steps - to understand the essence of the changes.

@iav iav force-pushed the kernel_with_resolute branch from 18fc481 to de00e23 Compare January 15, 2026 20:00
@tabrisnet

Copy link
Copy Markdown
Collaborator

Would you like me to prepare a PR with #8969 reverted and the remaining line commented out? 2 steps - to understand the essence of the changes.

sounds reasonable.

@iav iav marked this pull request as draft January 15, 2026 21:20
@iav iav force-pushed the kernel_with_resolute branch 2 times, most recently from df6065c to 498ff45 Compare January 15, 2026 23:06
iav added a commit to iav/armbian that referenced this pull request Jan 15, 2026
@iav

iav commented Jan 15, 2026

Copy link
Copy Markdown
Contributor Author

Would you like me to prepare a PR with #8969 reverted and the remaining line commented out? 2 steps - to understand the essence of the changes.

sounds reasonable.

done

@tabrisnet

Copy link
Copy Markdown
Collaborator

Would you like me to prepare a PR with #8969 reverted and the remaining line commented out? 2 steps - to understand the essence of the changes.

sounds reasonable.

done

minor nit: the commit message should say "Disable APA" not "ATF"

@iav iav marked this pull request as ready for review January 15, 2026 23:22
iav added a commit to iav/armbian that referenced this pull request Jan 15, 2026
@iav iav force-pushed the kernel_with_resolute branch from e4c3969 to 0ec7488 Compare January 15, 2026 23:26

@tabrisnet tabrisnet left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@github-actions github-actions Bot added the Ready to merge Reviewed, tested and ready for merge label Jan 16, 2026
@github-actions

Copy link
Copy Markdown
Contributor

✅ This PR has been reviewed and approved — all set for merge!

@github-actions github-actions Bot removed the Needs review Seeking for review label Jan 16, 2026
@tabrisnet tabrisnet force-pushed the kernel_with_resolute branch from 0ec7488 to 77ea430 Compare January 16, 2026 13:09
@github-actions github-actions Bot added Needs review Seeking for review and removed Ready to merge Reviewed, tested and ready for merge labels Jan 16, 2026
@tabrisnet tabrisnet merged commit 0a52e65 into armbian:main Jan 16, 2026
1 check was pending
@iav iav deleted the kernel_with_resolute branch January 16, 2026 18:22
iav added a commit to iav/armbian that referenced this pull request Jan 31, 2026
yury-deltsov pushed a commit to yury-deltsov/build that referenced this pull request Feb 8, 2026
yury-deltsov pushed a commit to yury-deltsov/build that referenced this pull request Feb 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

02 Milestone: First quarter release Framework Framework components Needs review Seeking for review size/medium PR with more then 50 and less then 250 lines

Development

Successfully merging this pull request may close these issues.

3 participants