It is no longer needed, since get_yaml_array uses `readarray -t` command now instead of regular `readarray`.
It may also fix rare parsing issue some user had (array element looks fine, but it's still not parsed properly). Note that this is a speculated issue, not something we're 100% sure of.
Merge this after BlueBuild transition period, since legacy build.sh doesn't have get_yaml_array fix.
Alternatively, I can define custom get_yaml_array function here, with note for supporting legacy templates.
* docs(akmods): Add notice when builds are failing due to upstream issue
* chore: add missing "a"
---------
Co-authored-by: xyny <60004820+xynydev@users.noreply.github.com>
* chore(default-flatpaks): Switch to standardized BlueBuild location
Use
`/usr/etc/bluebuild/default-flatpaks`
location instead of
`/usr/etc/flatpaks`
If possible, we should ideally use this location for system modifications:
`/usr/share/bluebuild/default-flatpaks`
While having user modifications in:
`/usr/etc/bluebuild/default-flatpaks`
But it needs to be figured out how the logic will work for separating system & user modifications this way.
I used this logic in unofficial `initramfs-setup` module & it works well, by merging both system & user files into 1 output.
However, this method can create duplicates if user specified it in it's modification, so I mentioned that user should look if the system entry has modifications they need. Perhaps, array diff can be done, which would circumvent this.
So merge this for start.
Only other module which has potential for migrating to standardized BlueBuild config is yafti (more details in other PR I'll do in some time).
* refactor(default-flatpaks): Make default-flatpaks more robust
Document in detail to user how he can change the config in files itself.
Also document what files do in `/usr/share/bluebuild/default-flatpaks` as well.
Refactor flatpak lists detection to be more reliable by excluding words starting with # symbols, whitelines & duplicate entries. Use `comm` for comparing flatpak list to existing flatpaks output instead of using `grep`, as it's easier to use & it's more reliable.
Separate user's & maintainer's modifications better by utilizing read-only `/usr/share/bluebuild/default-flatpaks` directory for maintainers, while for users we would use `(/usr)/etc/bluebuild/default-flatpaks` directory. Reverting to defaults is more reliable as it would avoid users from touching maintainer's modification directly.
I wouldn't modify repo-info.yml doc content, as we restrict it from user's modification & we wouldn't want to potentially ruin yaml parsing just for that.
Only thing that remains is to test this in a VM. And look to potentially make code cleaner.
* draft(default-flatpaks): Avoid install/remove duplicate loop scenario
I have to figure out this part
* draft(default-flatpaks): Avoid install/remove duplicate loop scenario pt.2
* draft(default-flatpaks): Avoid install/remove duplicate loop scenario pt.3
* fix(default-flatpaks): Avoid install/remove duplicate loop scenario
* chore(default-flatpaks): minor grammar adjustment
* draft(default-flatpaks): Account for scenario...
when user sets the same package in install list that is in maintainer's remove list & vice-versa
* fix(default-flatpaks): Account for scenario when user sets the same package in install list that is in maintainer's remove list & vice-versa
* fix(default-flatpaks): Typo in code for combined install list
* chore(default-flatpaks): Remove unnecessary echo
* chore(default-flatpaks): Make directory for user config
* chore(default-flatpaks): Explain user's vs maintainer's flatpak list situation better
* fix(default-flatpaks): Typo in user's configuration for system flatpaks install
* chore(default-flatpaks): There is no need to mkdir parent folder if child folder is created
* chore(default-flatpaks): Make config organization cleaner
Don't use echos for writing configs, use files instead for easier & more intuitive editing.
* fix(default-flatpaks): Copy notification file properly
Made a mistake in variable name
* docs: README fixes
- don't use ambiguous term "live-user"
- capitalize Flatpak
- grammar and phrasing changes
* docs: grammar and phrasing changes in configuration file docs
- replace "maintainer's config" with "image's default config"
- rewrite flatpak list format explanation
* docs: slightly reword local modification section again
* chore(default-flatpaks): Add a missing newline to system flatpak list
---------
Co-authored-by: xynydev
* chore(gschema-overrides): Get rid of `files` module dependency
Gschema.override files are now placed in /config/gschema-override folder.
* chore(gschema-overrides): Don't use 1st slash for new override location in docs
* chore: Use `zz1-` prefix instead of `z1-`
It ensures that no gschema override will bypass user one with override starting with letter z.
* fix(files): Fix build error on copying dotfiles
Enable dotglob when copying folders/files, disable when it's finished.
* chore(files): Ensure that dotglob is executed outside of loop
* fix(files): Ensure that .gitkeep file is not present in the build image
* fix(files): Ensure that cp command ignores if something is present in directory or not
* feat: signing module
* docs: add docs for `signing` module
* fix(signing.sh): add space to if
Co-authored-by: Gerald Pinder <gmpinder@gmail.com>
* fix(signing): grammar in README and formatting in signing.sh
* fix: only modify image-info.json
* fix: typo in image vendor name
---------
Co-authored-by: Gerald Pinder <gmpinder@gmail.com>
* feat: Add `gschema-overrides` module
* chore: Clarify "including prefix" section better
* chore: Some formatting fix
* chore: Don't mention higher prefix, as it can confuse users
* fix: Add partial troubleshooting of most preferred gschema-overide
It does not support aborting on fail currently, as I have to think on how to implement it when multiple gschema-override files are included in the module.
* Revert "fix: Add partial troubleshooting of most preferred gschema-overide"
This reverts commit 1dde51938e45648c7f53b696e61249339a2eb277.
* fix: Use `z1-` prefix for to avoid future conflict with Universal Blue images
* chore: Fix some README remarks from xynydev
* chore: Note that GTK DEs other than Gnome are also supported
* chore: Be more specific about GTK-based DEs
* chore: Clarify using module section a tiny bit better
* chore: Add editing gschema.overrides section & make README formatting cleaner
* chore: Reword some sentences better
* fix: don't use multiple toplevel headings, replace <br> tags with spammed spaces
---------
Co-authored-by: xyny <60004820+xynydev@users.noreply.github.com>
* feat(default-flatpaks): Support for notifications that inform the user before flatpak install/uninstall procedure begins
This can be implemented to be more readable maybe, but this should work.
* chore(default-flatpaks): There is no need to call notifications true statement twice
* chore(default-flatpaks): Make starting notifications consistent with finished ones
* chore(default-flatpaks): Use "listed" term rather than "some"
* chore(default-flatpaks): Use "some" notification only for uninstalling flatpaks
* fix(akmods): Xone installs conflicted "akmod-xone" package
This sets higher priority for `akmods repo` compared to `multimedia repo`, which should fix potential issues in the future for other akmods too.
Thanks to the debugging done here:
https://github.com/ublue-os/akmods/pull/116
* fix(akmods): There is no need to revert to default, as it doesn't cause issues
On the other side, enabled multimedia repo afterwards causes issues.
* chore(akmods): Format function spacing same as other 2 functions
* chore(akmods): Make ENABLE_MULTIMEDIA_REPO more readable
* fix(default-flatpaks): Install/uninstall system flatpaks regardless if current user has permissions or not
Fixes: https://github.com/ublue-os/bling/pull/93
To make notify-send working for --system systemd units, I have to thank @gerblesh for his code & idea in ublue-updater.
I tested this in Silverblue & it works.
However, I would like this to be tested in other DEs like Kinoite too, to see if it's working correctly.
Feel free to improve code if you find some space for that.
@lorduskordus
* Use json parser instead as a more reliable solution on fetching values
* There is no need for echo when parsing json
* Fetch DISPLAY environment variable from printenv
* Make functions for notify-sends, to make script clearer
* Whiteline fixes
* feat: Add kmods installer module
Credits: @C0dePlayer
This is not ideal as it does not support custom kernels & it involves editing Containerfile.
I believe there is no other way but to make users edit Containerfile for those files to be even pulled of.
I would like this to be through the recipe only, so I will put this as a draft until some better ideas come.
* Rename kmods installer to akmods
* Update README
Address:
https://github.com/ublue-os/startingpoint/pull/212#issuecomment-1870156327https://github.com/ublue-os/bling/pull/89#discussion_r1436890002
* Fix README typo
* Remove non-needed space for yml in README
* Add support for Surface & Asus images
* Clarify tagged base image warning better
* Clarify tagged base image warning better pt.2
* There is no need to fetch main-nvidia build for now
* Use simpler =~ for conditioning instead of grep & sed
This finally fixes akmods module
* Install kernel-devel-matched for all builds
* Assure that Surface installs their version of kernel-devel-matched
* Mention that framework images can be used as a base
* Delete duplicate warning message
* Remove non-needed explanation on why only Universal Blue builds are supported
* Clarify 1st warning better
* Clarify `main` akmods compatibility better
This would avoid editing README if some other compatible image gets announced or discontinued.
* docs(akmods): grammar fixes
* docs: add link to akmod tag matrix
---------
Co-authored-by: xyny <60004820+xynydev@users.noreply.github.com>
* fix:(default-flatpaks): Missing notification for system flatpaks
This approach, while more fragmented, it's cleaner, as there is a clearer separation of root & non-root operations done by flatpak-setup service. This should probably increase security too (but I'm not the expert to talk seriously about that). It also gets rid of some non-harming error for /var data, can't remember it fully.
While it may be confusing for users that they have to type:
`systemctl status --user system-flatpak-setup`
instead of previous:
`systemctl status system-flatpak-setup`
It is something worth sacrificing for the important user-experience fix.
* feat(default-flatpaks): Add info about which flatpaks are installed & uninstalled in notification. Also implement notification enable/disable config support.
* feat(default-flatpaks): Add support for configuring notifications in recipe file
* fix(default-flatpaks): Formatting fixes
* fix(default-flatpaks): Fix "enabling" typo instead of "configuring" notifications
* chore(default-flatpaks): Remove unused yq command
* fix(default-flatpaks): There is no need for 2 double quotes
I switched my custom ublue image from using
"ublue-os/silverblue-nvidia" to "ublue-os/bazzite-gnome-nvidia" and
received the following error when the build action kicked off:
`ln: failed to create symbolic link '/usr/etc/profile.d/ublue-firstboot.sh': File exists`
The yafti module should be the only thing creating this symlink, so it
should be safe to use the `-f` flag to force creating it.
Signed-off-by: Micah Abbott <miabbott@redhat.com>
