-
-
Notifications
You must be signed in to change notification settings - Fork 2.8k
link questing and resolute release pocket to sid #9001
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
leggewie
wants to merge
4
commits into
armbian:main
Choose a base branch
from
leggewie:wip-apa-transition-8965
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
150201b
link questing and resolute release pockets to sid
leggewie 61d55e4
explicitly specify config/cli/sid/debootstrap/packages
leggewie e7f252d
define sid gnome explicitly instead of symlinking to trixie
leggewie 4f8c901
sid: replace explicit package definitions for gnome with APA metapackage
leggewie File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| sid | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| sid |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| apt-utils | ||
| locales | ||
| console-setup | ||
| gnupg | ||
| ca-certificates |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| sid |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| sid |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| arm64, amd64 |
164 changes: 164 additions & 0 deletions
164
config/desktop/sid/environments/gnome/armbian/create_desktop_package.sh
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| # install lightdm greeter | ||
| cp -R "${SRC}"/packages/blobs/desktop/lightdm "${destination}"/etc/armbian | ||
|
|
||
| # install default desktop settings | ||
| mkdir -p "${destination}"/etc/skel | ||
| cp -R "${SRC}"/packages/blobs/desktop/skel/. "${destination}"/etc/skel | ||
|
|
||
| #install cinnamon desktop bar icons | ||
| mkdir -p "${destination}"/usr/share/icons/armbian | ||
| cp "${SRC}"/packages/blobs/desktop/desktop-icons/*.png "${destination}"/usr/share/icons/armbian | ||
|
|
||
| # install wallpapers | ||
| mkdir -p "${destination}"/usr/share/backgrounds/armbian/ | ||
| cp "${SRC}"/packages/blobs/desktop/desktop-wallpapers/*.jpg "${destination}"/usr/share/backgrounds/armbian | ||
|
|
||
| # install wallpapers | ||
| mkdir -p "${destination}"/usr/share/backgrounds/armbian-lightdm/ | ||
| cp "${SRC}"/packages/blobs/desktop/lightdm-wallpapers/*.jpg "${destination}"/usr/share/backgrounds/armbian-lightdm | ||
|
|
||
| # install logo for login screen | ||
| mkdir -p "${destination}"/usr/share/pixmaps/armbian | ||
| cp "${SRC}"/packages/blobs/desktop/icons/armbian.png "${destination}"/usr/share/pixmaps/armbian | ||
|
|
||
| #generate wallpaper list for background changer | ||
| mkdir -p "${destination}"/usr/share/gnome-background-properties | ||
| cat <<EOF > "${destination}"/usr/share/gnome-background-properties/armbian.xml | ||
| <?xml version="1.0"?> | ||
| <!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd"> | ||
| <wallpapers> | ||
| <wallpaper deleted="false"> | ||
| <name>Armbian black-pyscho</name> | ||
| <filename>/usr/share/backgrounds/armbian/armbian-4k-black-psycho.jpg</filename> | ||
| <options>zoom</options> | ||
| <pcolor>#ffffff</pcolor> | ||
| <scolor>#000000</scolor> | ||
| </wallpaper> | ||
| <wallpaper deleted="false"> | ||
| <name>Armbian bluie-circle</name> | ||
| <filename>/usr/share/backgrounds/armbian/armbian-4k-blue-circle.jpg</filename> | ||
| <options>zoom</options> | ||
| <pcolor>#ffffff</pcolor> | ||
| <scolor>#000000</scolor> | ||
| </wallpaper> | ||
| <wallpaper deleted="false"> | ||
| <name>Armbian blue-monday</name> | ||
| <filename>/usr/share/backgrounds/armbian/armbian-4k-blue-monday.jpg</filename> | ||
| <options>zoom</options> | ||
| <pcolor>#ffffff</pcolor> | ||
| <scolor>#000000</scolor> | ||
| </wallpaper> | ||
| <wallpaper deleted="false"> | ||
| <name>Armbian blue-penguin</name> | ||
| <filename>/usr/share/backgrounds/armbian/armbian-4k-blue-penguin.jpg</filename> | ||
| <options>zoom</options> | ||
| <pcolor>#ffffff</pcolor> | ||
| <scolor>#000000</scolor> | ||
| </wallpaper> | ||
| <wallpaper deleted="false"> | ||
| <name>Armbian gray-resultado</name> | ||
| <filename>/usr/share/backgrounds/armbian/armbian-4k-gray.jpg</filename> | ||
| <options>zoom</options> | ||
| <pcolor>#ffffff</pcolor> | ||
| <scolor>#000000</scolor> | ||
| </wallpaper> | ||
| <wallpaper deleted="false"> | ||
| <name>Armbian green-penguin</name> | ||
| <filename>/usr/share/backgrounds/armbian/armbian-4k-green-penguin.jpg</filename> | ||
| <options>zoom</options> | ||
| <pcolor>#ffffff</pcolor> | ||
| <scolor>#000000</scolor> | ||
| </wallpaper> | ||
| <wallpaper deleted="false"> | ||
| <name>Armbian green-retro</name> | ||
| <filename>/usr/share/backgrounds/armbian/armbian-4k-green-retro.jpg</filename> | ||
| <options>zoom</options> | ||
| <pcolor>#ffffff</pcolor> | ||
| <scolor>#000000</scolor> | ||
| </wallpaper> | ||
| <wallpaper deleted="false"> | ||
| <name>Armbian green-wall-penguin</name> | ||
| <filename>/usr/share/backgrounds/armbian/armbian-4k-green-wall-penguin.jpg</filename> | ||
| <options>zoom</options> | ||
| <pcolor>#ffffff</pcolor> | ||
| <scolor>#000000</scolor> | ||
| </wallpaper> | ||
| <wallpaper deleted="false"> | ||
| <name>Armbian 4k-neglated</name> | ||
| <filename>/usr/share/backgrounds/armbian/armbian-4k-neglated.jpg</filename> | ||
| <options>zoom</options> | ||
| <pcolor>#ffffff</pcolor> | ||
| <scolor>#000000</scolor> | ||
| </wallpaper> | ||
| <wallpaper deleted="false"> | ||
| <name>Armbian neon-gray-penguin</name> | ||
| <filename>/usr/share/backgrounds/armbian/armbian-4k-neon-gray-penguin.jpg</filename> | ||
| <options>zoom</options> | ||
| <pcolor>#ffffff</pcolor> | ||
| <scolor>#000000</scolor> | ||
| </wallpaper> | ||
| <wallpaper deleted="false"> | ||
| <name>Armbian plastic-love</name> | ||
| <filename>/usr/share/backgrounds/armbian/armbian-4k-plastic-love.jpg</filename> | ||
| <options>zoom</options> | ||
| <pcolor>#ffffff</pcolor> | ||
| <scolor>#000000</scolor> | ||
| </wallpaper> | ||
| <wallpaper deleted="false"> | ||
| <name>Armbian purple-penguine</name> | ||
| <filename>/usr/share/backgrounds/armbian/armbian-4k-purple-penguine.jpg</filename> | ||
| <options>zoom</options> | ||
| <pcolor>#ffffff</pcolor> | ||
| <scolor>#000000</scolor> | ||
| </wallpaper> | ||
| <wallpaper deleted="false"> | ||
| <name>Armbian purplepunk-resultado</name> | ||
| <filename>/usr/share/backgrounds/armbian/armbian-4k-purplepunk.jpg</filename> | ||
| <options>zoom</options> | ||
| <pcolor>#ffffff</pcolor> | ||
| <scolor>#000000</scolor> | ||
| </wallpaper> | ||
| <wallpaper deleted="false"> | ||
| <name>Armbian red-penguin-dark</name> | ||
| <filename>/usr/share/backgrounds/armbian/armbian-4k-red-penguin-dark.jpg</filename> | ||
| <options>zoom</options> | ||
| <pcolor>#ffffff</pcolor> | ||
| <scolor>#000000</scolor> | ||
| </wallpaper> | ||
| <wallpaper deleted="false"> | ||
| <name>Armbian red-penguin</name> | ||
| <filename>/usr/share/backgrounds/armbian/armbian-4k-red-penguin.jpg</filename> | ||
| <options>zoom</options> | ||
| <pcolor>#ffffff</pcolor> | ||
| <scolor>#000000</scolor> | ||
| </wallpaper> | ||
| <wallpaper deleted="false"> | ||
| <name>Armbian light</name> | ||
| <filename>/usr/share/backgrounds/armbian/armbian18-Dre0x-Minum-light-3840x2160.jpg</filename> | ||
| <options>zoom</options> | ||
| <pcolor>#ffffff</pcolor> | ||
| <scolor>#000000</scolor> | ||
| </wallpaper> | ||
| <wallpaper deleted="false"> | ||
| <name>Armbian dark</name> | ||
| <filename>/usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg</filename> | ||
| <options>zoom</options> | ||
| <pcolor>#ffffff</pcolor> | ||
| <scolor>#000000</scolor> | ||
| </wallpaper> | ||
| <wallpaper deleted="false"> | ||
| <name>Armbian uc</name> | ||
| <filename>/usr/share/backgrounds/armbian/armbian-full-under-construction-3840-2160.jpg</filename> | ||
| <options>zoom</options> | ||
| <pcolor>#ffffff</pcolor> | ||
| <scolor>#000000</scolor> | ||
| </wallpaper> | ||
| <wallpaper deleted="false"> | ||
| <name>Armbian clear</name> | ||
| <filename>/usr/share/backgrounds/armbian/Armbian-clear-rounded-bakcground-3840-2160.jpg</filename> | ||
| <options>zoom</options> | ||
| <pcolor>#ffffff</pcolor> | ||
| <scolor>#000000</scolor> | ||
| </wallpaper> | ||
| </wallpapers> | ||
| EOF |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| armbian-desktop-gnome |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| # overwrite stock lightdm greeter configuration | ||
| if [ -d /etc/armbian/lightdm ]; then cp -R /etc/armbian/lightdm /etc/; fi | ||
| #if [ -f /etc/lightdm/slick-greeter.conf ]; then sed -i 's/armbian03-Dre0x-Minum-dark-blurred-3840x2160.jpg/armbian-4k-black-psycho-gauss.jpg/g' /etc/lightdm/slick-greeter.conf; fi | ||
|
|
||
| # Disable Pulseaudio timer scheduling which does not work with sndhdmi driver | ||
| if [ -f /etc/pulse/default.pa ]; then sed "s/load-module module-udev-detect$/& tsched=0/g" -i /etc/pulse/default.pa; fi | ||
coderabbitai[bot] marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| # set wallpapper to armbian | ||
| keys=/etc/dconf/db/local.d/00-bg | ||
| profile=/etc/dconf/profile/user | ||
|
|
||
| install -Dv /dev/null $keys | ||
| install -Dv /dev/null $profile | ||
|
|
||
| echo "[org/gnome/desktop/background] | ||
| picture-uri='file:///usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg' | ||
| picture-options='zoom' | ||
| primary-color='#456789' | ||
| secondary-color='#FFFFFF' | ||
|
|
||
| [org/gnome/settings-daemon/plugins/power] | ||
| sleep-inactive-ac-timeout='0' | ||
|
|
||
| [org/gnome/desktop/screensaver] | ||
| picture-uri='file:///usr/share/backgrounds/armbian/armbian03-Dre0x-Minum-dark-3840x2160.jpg' | ||
| picture-options='zoom' | ||
| primary-color='#456789' | ||
| secondary-color='#FFFFFF'" >> $keys | ||
|
|
||
| echo "user-db:user | ||
| system-db:local" >> $profile | ||
|
|
||
| dconf update | ||
|
|
||
| #sudo apt-get -y remove gnome-shell-extension-desktop-icons | ||
|
|
||
| #compile schemas | ||
| if [ -d /usr/share/glib-2.0/schemas ]; then | ||
| glib-compile-schemas /usr/share/glib-2.0/schemas | ||
| fi | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| supported |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we need to split
questing&resoluteoff fromsid, so that we can iterate [assuming we can't randomly/gleefully breaksid, this may be untrue].e.g.
config/desktop/questing/environments/gnome/config_base/packagesshould not containarmbian-desktop-gnomebut rather something more innocuous likearmbian-common.Right now, having
extensions/apa.shinstallarmbian-desktop-gnomeis redundant if it gets installed already by the old machinery.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
note: this is only because if the file is empty the build machinery revolts.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no, that cannot be the way forward as we'd be going down the rabbit hole all over again.
Why is that?
Why is that?
Kindly explain, I am not seeing the problem yet.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so first:
"so we can iterate". i.e. assuming that we can freely break
questingorresolutefor the next few months [untilresolutebecomes the LTS release]. If we're allowed to gleefully breaksidat any time [and for potentially months at a time] ANDresolutetoo, then no need to unlink them.to clarify "so we can iterate", the goal here is NOT to go down the 🐰 🕳️, but rather a place to rip and tear at. to force APA to be functional. Give a deadline too, but that's probably not critical.
"the problem": right now
extensions/apa.shdoes not do anything [discounting adding the repo]. Sure, it takes actions but they're to no effect if the things are already being done elsewhere in the legacy methods, and done there first.APA looks like a good idea, but the legacy machinery is getting in the way.
Unless of course you don't care whether we use
extensions/apa.sh'spost_armbian_repo_customize_image__install_from_apaat which point having just the APA packages [specified with the legacy machinery] is considered success.I assumed the idea was to rip much of that machinery out by the root vegetable and feed it to the 🐰 AI.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm sorry, I'm still not sure what the objection is and why we would need to do the things that you claim need to be done.
The whole point of APA is to pull in the necessary packages and a few other things. You are right to point out that currently oftentimes this actually happens before APA really even does much. That does not imply we need to again maintain separate code for three different release pockets sid, resolute and questing. That is exactly what we are trying to get away from.
There is no plan to keep anything in a prolonged broken state. Quite the contrary. Fixes were very swift. What needs to happen is not to go back to the place we are trying to get away from but instead to figure out how to move what is happening with APA to an earlier point so that it gets incorporated into the rootfs so it benefits from caching. Becoming aware of this current "breakage" is one of the benefits of this canary testing. I have ATM almost no experience with what kind of artifact caching is going on. Frankly, that is also not the highest priority for me as it is a question of efficiency as long as the final image contains what it should contain.
You keep painting a picture of severe and ongoing breakage. Unless I am missing something that is simply not the case.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So re "severe and ongoing breakage", I presented two things related thereto:
sid/questing/resoluteare in the automated builds. Which they probably aren't [yet, we have 3-6 months beforeresoluteis relevant]. So this is something that needs fixing, but is also relatively trivial and simultaneously not required immediately.sid/questing/resolute. This is predicated on the idea that we don't supportquestingorsidbuilds & we shouldn't supportresolutebefore its actual release and likely not until Armbian2026.5. The reason to unlinksidfromquesting/resoluteis that there may be a community expectation thatsiddid work and we shouldn't intentionally break it. This expectation cannot exist forquesting/resoluteas they weren't options until a few weeks ago.Meanwhile, iiuc, the goal is to rip out the majority of
config/{cli,desktop}/{sid,questing,resolute}& move the functionality into the APA pkgs &extensions/apa.sh.IMO the easiest way to do this is to reduce the number of packages for
questing/resolutespecified inconfig/{desktop,cli}to an absolute minimum so we can demonstrate that the APA pkgs are in fact doing the right things in an otherwise freestanding environment.Next we decide whether to rip out the old
aggregation.py[and fixtrixieto use APA, ending support forjammy,noble&bookworm] or to let the legacy machinery age out somewhat more gracefully.My expectation atm would be the second option, and instead skip the old machinery when
$APA_IS_ACTIVE, that being the policy for at least the2026.yreleases. I haven't figured out how many places this check has to go yet, and definitely want to minimize it.As to timing, and it otherwise being now, @igorpecovnik just cut the
2025.11release, so we're relatively free to break things for at least a little while.