Bring back --default to allow OBS builds to select an entry point among many #3768
Conversation
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
8bfaf94 to
d87f24f
Compare
behrmann
reviewed
Jun 12, 2025
Comment on lines
+5162
to
+5166
| if args.default_config is not None: | ||
| if args.directory is not None and not args.default_config.is_absolute(): | ||
| context.default_config = args.directory.parent / args.default_config | ||
| else: | ||
| context.default_config = args.default_config |
There was a problem hiding this comment.
Since the args.default_config is None anyways, this could be shortened into
Suggested change
| if args.default_config is not None: | |
| if args.directory is not None and not args.default_config.is_absolute(): | |
| context.default_config = args.directory.parent / args.default_config | |
| else: | |
| context.default_config = args.default_config | |
| if ( | |
| args.default_config is not None: | |
| and args.directory is not None | |
| and not args.default_config.is_absolute() | |
| ): | |
| context.default_config = args.directory.parent / args.default_config |
(well, it's longer, but slightly less complex)
There was a problem hiding this comment.
With that change, unless args.directory is set, args.default_config is ignored, even if it's an absolute path which would otherwise work
I have no preference, given it's for a specific use case I thought you preferred to have it hidden, but I'll change that |
…ng many When building a mkosi repository called 'particleos', OBS calls mkosi as such: mkosi --directory /usr/src/packages/SOURCES/particleos --default mkosi.conf with mkosi.conf being the source file extracted at source time, ie: defined by the user, among the many files available in the repository. So this can be used to select the entry point, that defines what to build, when a repository provides many build types, profiles, images, etc. Right now --default is a no-op, so make it add the passed conf file as a high priority config file, so that the entry point can have precedence over anything else. The file is placed at: /usr/src/packages/SOURCES/mkosi.conf This cannot be controlled by the user, and it's fixed. Config file parsing requires absolute paths, and aborts otherwise. Because it is called with a filename only, but mkosi executes from the --directory location, special case it and if a non-absolute path is passed, look in the parent of --directory so that the use case of providing an entry point can be enabled.
septatrix
reviewed
Jun 12, 2025
|
No, it's extracted from wherever, either the same repo or another |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When building a mkosi repository called 'particleos', OBS calls mkosi as such:
mkosi --directory /usr/src/packages/SOURCES/particleos --default mkosi.conf
with mkosi.conf being the source file extracted at source time, ie: defined by the user, among the many files available in the repository. So this can be used to select the entry point, that defines what to build, when a repository provides many build types, profiles, images, etc.
Right now --default is a no-op, so make it add the passed conf file as a high priority config file, so that the entry point can have precedence over anything else.
The file is placed at:
/usr/src/packages/SOURCES/mkosi.conf
This cannot be controlled by the user, and it's fixed.
Config file parsing requires absolute paths, and aborts otherwise. Because it is called with a filename only, but mkosi executes from the --directory location, special case it and if a non-absolute path is passed, look in the parent of --directory so that the use case of providing an entry point can be enabled.
With this I can add entry points to hidden directories in a repo, or even outside of it, and select them in the
_serviceon OBS and build multiple different images from the same git repo and branch, for example the particleos gnome image:https://build.opensuse.org/projects/home:bluca:branches:home:bluca:systemd/packages/particleos/files/_service?expand=1