]> git.ipfire.org Git - thirdparty/mkosi.git/log
thirdparty/mkosi.git
4 months agokmod: Fix regex compilation in filter_firmware() 3601/head
Daan De Meyer [Wed, 19 Mar 2025 14:25:04 +0000 (15:25 +0100)] 
kmod: Fix regex compilation in filter_firmware()

4 months agokmod: Fix exclusion via glob in filter_firmware()
Daan De Meyer [Wed, 19 Mar 2025 14:24:31 +0000 (15:24 +0100)] 
kmod: Fix exclusion via glob in filter_firmware()

We have to remove firmware if it "doesn't" match, not if it matches.

4 months agokmod: Only log includes/excludes if there are any
Daan De Meyer [Wed, 19 Mar 2025 14:24:12 +0000 (15:24 +0100)] 
kmod: Only log includes/excludes if there are any

4 months agoFormatting nit
Daan De Meyer [Wed, 19 Mar 2025 14:24:04 +0000 (15:24 +0100)] 
Formatting nit

4 months agomkosi/config: show deprecated *Exlude options only if set
Zbigniew Jędrzejewski-Szmek [Wed, 19 Mar 2025 10:26:00 +0000 (11:26 +0100)] 
mkosi/config: show deprecated *Exlude options only if set

Those settings were deprecated in the docs, so only show them
in the Summary output if they are set to make them less prominent.

4 months agoinitrd: Install gzip in all initrds, not just the Arch one
Daan De Meyer [Wed, 19 Mar 2025 09:17:32 +0000 (10:17 +0100)] 
initrd: Install gzip in all initrds, not just the Arch one

Fedora also has keymaps compressed with gzip and doesn't pull in gzip
by default so let's just install gzip everywhere to make the problem
go away.

4 months agoMerge pull request #3598 from DaanDeMeyer/fix
Daan De Meyer [Tue, 18 Mar 2025 17:18:51 +0000 (18:18 +0100)] 
Merge pull request #3598 from DaanDeMeyer/fix

Fix KernelModulesExclude= settings

4 months agoHave filter_kernel_modules() return a list of module names 3598/head
Daan De Meyer [Tue, 18 Mar 2025 15:00:06 +0000 (16:00 +0100)] 
Have filter_kernel_modules() return a list of module names

The only caller of this function only needs the list of module names,
not the full paths so let's just return the list of module names.

4 months agoFix KernelModulesExclude= settings
Daan De Meyer [Tue, 18 Mar 2025 14:54:27 +0000 (15:54 +0100)] 
Fix KernelModulesExclude= settings

With eecf8b3b5c43e4832a11c8718ae43e559a755829, exclude settings have
started taking priority over include or the new glob settings whereas
they should not. Fix the logic so the globs and include patterns always
take priority over the exclude patterns.

4 months agoMerge pull request #3597 from DaanDeMeyer/bind-user
Daan De Meyer [Tue, 18 Mar 2025 13:00:55 +0000 (14:00 +0100)] 
Merge pull request #3597 from DaanDeMeyer/bind-user

4 months agoSimplify package manager code a little 3597/head
Daan De Meyer [Tue, 18 Mar 2025 12:22:07 +0000 (13:22 +0100)] 
Simplify package manager code a little

4 months agoqemu: Remove unused argument from finalize_drive()
Daan De Meyer [Tue, 18 Mar 2025 10:49:17 +0000 (11:49 +0100)] 
qemu: Remove unused argument from finalize_drive()

4 months agoDrop mkosi-as-caller
Daan De Meyer [Tue, 18 Mar 2025 09:24:59 +0000 (10:24 +0100)] 
Drop mkosi-as-caller

Let's drop this trivial helper as well to clean things up. Migration
is trivial, just drop usage of the helper.

4 months agoDrop git safe.directory="*" environment variables
Daan De Meyer [Tue, 18 Mar 2025 09:24:03 +0000 (10:24 +0100)] 
Drop git safe.directory="*" environment variables

Not required anymore now that we run builds as the user invoking mkosi.

4 months agoDrop expand_specifier()
Daan De Meyer [Tue, 18 Mar 2025 09:20:44 +0000 (10:20 +0100)] 
Drop expand_specifier()

4 months agoman: remove "=" in boolean option
Antonio Alvarez Feijoo [Tue, 18 Mar 2025 09:16:42 +0000 (10:16 +0100)] 
man: remove "=" in boolean option

4 months agoMerge pull request #3531 from keszybz/module-globs
Jörg Behrmann [Tue, 18 Mar 2025 08:55:43 +0000 (09:55 +0100)] 
Merge pull request #3531 from keszybz/module-globs

Add new option syntax with globs

4 months agomkosi-initrd: protect existing initrd image against errors
Antonio Alvarez Feijoo [Sat, 15 Mar 2025 06:21:44 +0000 (07:21 +0100)] 
mkosi-initrd: protect existing initrd image against errors

When `copy_tree()` ends up calling `cp`, if it fails because there is not enough
space, it leaves an incomplete initrd image in the output directory. If we are
writing the initrd image directly where a bootloader entry has an initrd
configured, the system will fail to boot. So, instead of copying the initrd
image directly to the output, copy it next to it in the same output directory,
and if the copy is successful, replace it.

4 months agoMake user provided command line take preference over roothash=
Daan De Meyer [Fri, 14 Mar 2025 16:51:57 +0000 (17:51 +0100)] 
Make user provided command line take preference over roothash=

If the user provides their own root= or mount.usr= configuration,
let's always have that take preference over the partition roothash=
or usrhash=

This is preparation for adding support for root=dissect in which case
we don't need roothash= or usrhash= on the kernel command line.

4 months agoReplace conf tag with ini in markdown
Septatrix [Sat, 15 Mar 2025 14:12:40 +0000 (15:12 +0100)] 
Replace conf tag with ini in markdown

No markdown renderer has any clue which highlighting to use for conf files
whereas INI is well defined and results in proper highlighting.

5 months agomkosi/kmod: add typing info to make mypy happy 3531/head
Zbigniew Jędrzejewski-Szmek [Fri, 14 Mar 2025 10:31:43 +0000 (11:31 +0100)] 
mkosi/kmod: add typing info to make mypy happy

5 months agoci/codespell: add ignore-words-list
Zbigniew Jędrzejewski-Szmek [Fri, 14 Mar 2025 09:58:26 +0000 (10:58 +0100)] 
ci/codespell: add ignore-words-list

5 months agoman: soft-deprecate Firmware{Include,Exclude}
Zbigniew Jędrzejewski-Szmek [Sat, 1 Mar 2025 16:37:31 +0000 (17:37 +0100)] 
man: soft-deprecate Firmware{Include,Exclude}

5 months agoRework firmware-list settings to use globs instead of regexps
Zbigniew Jędrzejewski-Szmek [Sat, 1 Mar 2025 16:13:37 +0000 (17:13 +0100)] 
Rework firmware-list settings to use globs instead of regexps

This mirrors the change to module-list options. The two FirmwareInclude/FirmwareExclude
options are replaced by one FirmwareFiles option that takes positive and negative
globs. (Firmware name is already taken.)

5 months agoman: soft-deprecate KernelModules{Initrd,}{Include,Exclude}
Zbigniew Jędrzejewski-Szmek [Thu, 27 Feb 2025 19:50:33 +0000 (20:50 +0100)] 
man: soft-deprecate KernelModules{Initrd,}{Include,Exclude}

The docs are updated to describe Kernel{Initrd,}Modules. The old settings
continue to work.

5 months agoSwitch over to the new glob syntax
Zbigniew Jędrzejewski-Szmek [Mon, 17 Feb 2025 17:30:23 +0000 (18:30 +0100)] 
Switch over to the new glob syntax

This creates the following difference:
-usr/lib/modules/6.14.0-0.rc1.15.fc42.x86_64/kernel/drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/ch_ipsec.ko.xz
-usr/lib/modules/6.14.0-0.rc1.15.fc42.x86_64/kernel/drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/ch_ktls.ko.xz

In the previous syntax, we included those modules accidentally because
'inline_crypto/' matches 'crypto/'.

5 months agoRework module-list settings to use globs instead of regexps
Zbigniew Jędrzejewski-Szmek [Mon, 17 Feb 2025 17:29:06 +0000 (18:29 +0100)] 
Rework module-list settings to use globs instead of regexps

"If you have a problem, and use a regexp, now you have two problems."
I don't think this quip applies in all cases, but the existing interface with
regexps was problematic for a few reasons:

- users usually want to match at a word boundary, but regexps apply anywhere in
  the string, so to actually match correctly, the regexp has to be carefully
  constructed with word boundary assertions.
  Even our own config for initrds included some modules by mistake,
  e.g. drivers/net/ethernet/chelsio/inline_crypto/ch_ipsec/ch_ipsec.ko.xz
  was matched by crypto/.

- once the regexps include the word boundary assertions, they became quite
  complex and hard to read.

- because of the separate evaluation of include and exlude patterns, we
  need to have exclude patterns in the include patterns. The example given
  in the review:
    ^drivers/net/(?!wireless/)
  But this means that we can do exclusions in two places, making the whole
  scheme very complex.

- the default to include all modules by default goes against the general
  design of mkosi, where only things that are explicitly configured are
  put in the image. That default is only useful when trying to build a
  "maximal" image that matches the current machine. In most uses, the
  default of including only requested modules makes more sense (initrd,
  addons, any not-host-only images).

A new setting that takes glob patterns is added. There is only one setting
instead of a pair, exclusion patterns are prefixed by '-'. The last matching
glob wins. The details of how those globs are interpreted is crafted to
match our particular use cases.

For a single glob, the rules are:
- 'foo' matches the basename, /some/path/foo.ko
- 'bar/foo' matches the last component of the path, bar/foo.ko
- '/full/path/bar' only matches /full/path/bar.ko.
- crypto/* or crypto/ match all modules any crypto/ directory.
- /crypto/* matches the modules in the top-level directory.

This might seem complicated at first glance, but apart from the special
handling of the suffix, those rules mostly match how 'ls' would handle
a local path argument.

Suffixes are not specified in the globs. '-' and '_' are treated as equivalent,
except when part of special glob syntax with […].

New settings are added:
KernelModules=GLOB
KernelInitrdModules=GLOB

(KernelModulesInitrd=BOOL already exists and specifies whether to create a
separate initrd.)

I think the new syntax is more pleasant to read and write. Backward
compatibility is maintained by keeping the old options in place. The change to
exclude all modules by default is a breaking change, but in most uses both
options were used in combination anyway, so I think this should be fine.

The example given in the review:
  KernelModulesInclude=
    ^drivers/net/(?!wireless/)
becomes
  KernelModules=
    /drivers/net/
    -/drivers/net/wireless/

5 months agomkosi,addon: print the mkosi cmdline with --debug
Zbigniew Jędrzejewski-Szmek [Fri, 28 Feb 2025 11:50:23 +0000 (12:50 +0100)] 
mkosi,addon: print the mkosi cmdline with --debug

This is very important, without that it's hard to figure out what is actually
hapenning.

5 months agoUse Path more in initrd.py and addon.py
Daan De Meyer [Thu, 13 Mar 2025 20:05:42 +0000 (21:05 +0100)] 
Use Path more in initrd.py and addon.py

5 months agofedora: Change default release to rawhide
Daan De Meyer [Thu, 13 Mar 2025 14:35:49 +0000 (15:35 +0100)] 
fedora: Change default release to rawhide

Fedora releases new versions quite regularly, sometimes more regularly
than we do mkosi releases. This means that users on the latest official
mkosi release can end up building EOL fedora releases because the default
release will be the latest fedora release at the time of the mkosi release
which might be EOL already. Let's switch to rawhide as the default release
so users are guaranteed to get something recent regardless of how old their
mkosi version is.

This matches what we already do for debian, opensuse, arch and other distros.

5 months agoMerge pull request #3543 from keszybz/initrd-version-short-option
Jörg Behrmann [Thu, 13 Mar 2025 14:18:30 +0000 (15:18 +0100)] 
Merge pull request #3543 from keszybz/initrd-version-short-option

Add short option for initrd kernel version

5 months agoinitrd: add -k as shorthand for --kernel-version 3543/head
Zbigniew Jędrzejewski-Szmek [Mon, 17 Feb 2025 09:16:08 +0000 (10:16 +0100)] 
initrd: add -k as shorthand for --kernel-version

--kernel-version is the option that I use the most often. Having a short
option would be nice.

'-v' would another option for the option, but I think it could be confused
with --version.

5 months agoinitrd: split out argument parser creation to helper function
Zbigniew Jędrzejewski-Szmek [Sun, 16 Feb 2025 20:39:19 +0000 (21:39 +0100)] 
initrd: split out argument parser creation to helper function

5 months agomkosi/dependencies: make invocations shorter
Zbigniew Jędrzejewski-Szmek [Fri, 24 Jan 2025 15:42:44 +0000 (16:42 +0100)] 
mkosi/dependencies: make invocations shorter

Both styles were used by the existing code: ['--foo=bar'] and ['--foo', 'bar'].
Switch to the former exclusively. A single arg like '--foo=bar' is easier to
read and/or select&paste in the log output. Also, we avoid explicit str()
wrappers in a bunch of places.

5 months agoMerge pull request #3588 from behrmann/sandboxfix
Daan De Meyer [Wed, 12 Mar 2025 08:03:31 +0000 (09:03 +0100)] 
Merge pull request #3588 from behrmann/sandboxfix

Check for CAP_SYS_ADMIN instead of root

5 months agoTry to find volatile overlay upperdir directory that's not on overlayfs 3588/head
Daan De Meyer [Tue, 11 Mar 2025 20:12:11 +0000 (21:12 +0100)] 
Try to find volatile overlay upperdir directory that's not on overlayfs

Making a directory on overlayfs the upperdir of another overlayfs is
rejected by the kernel. Let's try to find a directory that's not on
overlayfs. The /dev/shm fallback is because on a default podman container
even /tmp is on overlayfs.

5 months agotree: Make security.selinux detection more robust
Daan De Meyer [Tue, 11 Mar 2025 20:13:57 +0000 (21:13 +0100)] 
tree: Make security.selinux detection more robust

5 months agoCheck for CAP_SYS_ADMIN instead of root
Daan De Meyer [Tue, 11 Mar 2025 13:31:13 +0000 (14:31 +0100)] 
Check for CAP_SYS_ADMIN instead of root

Even if we're running as root, we might not have CAP_SYS_ADMIN, so
let's always check for CAP_SYS_ADMIN.

5 months agoAdd option to persist runtime drives
Septatrix [Sat, 8 Mar 2025 13:21:34 +0000 (14:21 +0100)] 
Add option to persist runtime drives

5 months agoMerge pull request #3585 from DaanDeMeyer/doc
Daan De Meyer [Fri, 7 Mar 2025 10:44:43 +0000 (11:44 +0100)] 
Merge pull request #3585 from DaanDeMeyer/doc

5 months agoRework --run-build-scripts 3585/head
Daan De Meyer [Thu, 6 Mar 2025 22:47:33 +0000 (23:47 +0100)] 
Rework --run-build-scripts

Instead of (optionally) building the image when this option is enabled,
let's insist that the image has already been built and cached. This allows
us to reuse the history of the previous build if History= is enabled. At
the same time, rename the option to --rerun-build-scripts to indicate more
clearly that the image needs to have been built once already.

This allows the option to be used in systemd's mkosi.clangd script to replace
"-t none" and "--incremental=strict" there.

5 months agoDon't run configure scripts if we're reusing the history
Daan De Meyer [Thu, 6 Mar 2025 21:55:32 +0000 (22:55 +0100)] 
Don't run configure scripts if we're reusing the history

5 months agoDrop unnecessary condition
Daan De Meyer [Thu, 6 Mar 2025 21:45:31 +0000 (22:45 +0100)] 
Drop unnecessary condition

A few lines earlier, we already short-circuit run_verb() if the verb
does not need a build, so no need to check here again.

5 months agoUse target path as mount tags
Septatrix [Wed, 5 Mar 2025 20:34:09 +0000 (21:34 +0100)] 
Use target path as mount tags

This prevents collisions when mounting something
to directories of the same name or root.

5 months agoRevert 9f4d174daac954aaa9e18ee9bb58c6d7a946ec9d
Daan De Meyer [Thu, 6 Mar 2025 11:18:59 +0000 (12:18 +0100)] 
Revert 9f4d174daac954aaa9e18ee9bb58c6d7a946ec9d

The declarative package pulls in perl which is not ideal, let's
switch back to the previous approach.

5 months agoMerge pull request #3582 from DaanDeMeyer/downgrade
Daan De Meyer [Thu, 6 Mar 2025 10:48:42 +0000 (11:48 +0100)] 
Merge pull request #3582 from DaanDeMeyer/downgrade

5 months agoMove package installation and removal to PackageManager interface 3582/head
Daan De Meyer [Wed, 5 Mar 2025 19:32:58 +0000 (20:32 +0100)] 
Move package installation and removal to PackageManager interface

There's no need for these to be implemented by the Distribution
interface as they don't need distribution specific knowledge so let's
move them to the PackageManager interface instead.

5 months agoapt: Add higher priority for mkosi local repository
Daan De Meyer [Wed, 5 Mar 2025 19:11:58 +0000 (20:11 +0100)] 
apt: Add higher priority for mkosi local repository

Apt actually supports priorities as well, so add a high priority like
we do for the other package managers as well for the local mkosi repository.

5 months agodebian: Install policy-rcd-declarative by default
Daan De Meyer [Wed, 5 Mar 2025 18:59:26 +0000 (19:59 +0100)] 
debian: Install policy-rcd-declarative by default

Debian switched to systemd ages ago, but as we know legacy stuff
tends to linger in Debian for quite a while. Let's standardize on
using systemd presets to enable daemons by installing packages for
a deny-all policy for sysv-init style packages instead of messing
with the script ourselves.

5 months agoSort packages during parsing
Daan De Meyer [Wed, 5 Mar 2025 14:15:07 +0000 (15:15 +0100)] 
Sort packages during parsing

5 months agoFix grammar
Nils K [Tue, 4 Mar 2025 13:50:11 +0000 (14:50 +0100)] 
Fix grammar

Follow up for aa4c8339484363df032ac72d4a739f4bbc16e183

5 months agoMerge pull request #3580 from DaanDeMeyer/rocky
Daan De Meyer [Tue, 4 Mar 2025 10:58:00 +0000 (11:58 +0100)] 
Merge pull request #3580 from DaanDeMeyer/rocky

5 months agocentos: Handle major/minor releases in derivatives properly 3580/head
Daan De Meyer [Tue, 4 Mar 2025 08:21:25 +0000 (09:21 +0100)] 
centos: Handle major/minor releases in derivatives properly

While centos doesn't have major/minor releases, rocky, alma and rhel
do, so let's make sure we handle those cases properly.

Additionally, we also fix EPEL to use the proper major/minor release
when we're doing EPEL 10, as since EPEL 10 there's major/minor releases
for EPEL as well.

5 months agoinitrd: Pass process environment to mkosi as well
Daan De Meyer [Tue, 4 Mar 2025 09:43:28 +0000 (10:43 +0100)] 
initrd: Pass process environment to mkosi as well

5 months agoImprove error message slightly
Daan De Meyer [Tue, 4 Mar 2025 08:01:33 +0000 (09:01 +0100)] 
Improve error message slightly

5 months agoAdd "raid" initrd profile
Antonio Alvarez Feijoo [Tue, 4 Mar 2025 07:37:25 +0000 (08:37 +0100)] 
Add "raid" initrd profile

This initrd profile provides support for assembling RAID arrays.

5 months agoParse both mkosi.local.conf and mkosi.local/
Septatrix [Sun, 2 Mar 2025 20:53:09 +0000 (21:53 +0100)] 
Parse both mkosi.local.conf and mkosi.local/

This aligns more with what the users expects
and allows working around some limitations of the config system
(esp. regarding the interplay of `Include=` and `Profiles=`).

5 months agoAdd --pretty=no to suppress output from systemd-repart when updating
MoltenArmor [Mon, 3 Mar 2025 09:34:08 +0000 (17:34 +0800)] 
Add --pretty=no to suppress output from systemd-repart when updating

5 months agoDon't mount input read-only if it's the same as output in sign_efi_binary()
Daan De Meyer [Sun, 2 Mar 2025 20:57:57 +0000 (21:57 +0100)] 
Don't mount input read-only if it's the same as output in sign_efi_binary()

Otherwise the output file cannot be written.

Replaces #3573

5 months agoFix Drives= documentation
Nils K [Mon, 3 Mar 2025 00:27:46 +0000 (01:27 +0100)] 
Fix Drives= documentation

Follow up for 7ff9a890c1947b4111010e81e0e64e06a0e8d800

5 months agoRevert "Bypass tmpfiles, sysusers and presets as well when running package ma…"
Luca Boccassi [Sun, 2 Mar 2025 10:58:20 +0000 (10:58 +0000)] 
Revert "Bypass tmpfiles, sysusers and presets as well when running package ma…"

This reverts commit 824d63e0d30e56ee34a193f624230c1ae5af0d58.

5 months agobuild(deps): bump redhat-plumbers-in-action/differential-shellcheck
dependabot[bot] [Sat, 1 Mar 2025 22:43:38 +0000 (22:43 +0000)] 
build(deps): bump redhat-plumbers-in-action/differential-shellcheck

Bumps [redhat-plumbers-in-action/differential-shellcheck](https://github.com/redhat-plumbers-in-action/differential-shellcheck) from 5.5.1 to 5.5.3.
- [Release notes](https://github.com/redhat-plumbers-in-action/differential-shellcheck/releases)
- [Changelog](https://github.com/redhat-plumbers-in-action/differential-shellcheck/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/redhat-plumbers-in-action/differential-shellcheck/compare/5fa026e4797665181a0f7c6fa4a73c09348ae78c...dd551ce780d8af741f8cd8bab6982667b906b457)

---
updated-dependencies:
- dependency-name: redhat-plumbers-in-action/differential-shellcheck
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
5 months agobuild(deps): bump github/codeql-action from 3.28.8 to 3.28.10
dependabot[bot] [Sat, 1 Mar 2025 22:43:35 +0000 (22:43 +0000)] 
build(deps): bump github/codeql-action from 3.28.8 to 3.28.10

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.8 to 3.28.10.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/dd746615b3b9d728a6a37ca2045b68ca76d4841a...b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
5 months agoBypass tmpfiles, sysusers and presets as well when running package managers
Daan De Meyer [Sat, 1 Mar 2025 15:27:38 +0000 (16:27 +0100)] 
Bypass tmpfiles, sysusers and presets as well when running package managers

We invoke all of these ourselves so there's no need to run them
while invoking package managers.

5 months agoRename "storage" initrd profile to "lvm"
Antonio Alvarez Feijoo [Fri, 28 Feb 2025 21:30:06 +0000 (22:30 +0100)] 
Rename "storage" initrd profile to "lvm"

Since it actually only provides support for LVM, it's best to keep the different
specific functionalities separate.

5 months agoMerge pull request #3561 from aafeijoo-suse/initrd-profiles
Daan De Meyer [Fri, 28 Feb 2025 14:50:35 +0000 (15:50 +0100)] 
Merge pull request #3561 from aafeijoo-suse/initrd-profiles

5 months agomkosi-initrd: add --profile option 3561/head
Antonio Alvarez Feijoo [Fri, 28 Feb 2025 12:16:51 +0000 (13:16 +0100)] 
mkosi-initrd: add --profile option

Enable only the initrd profiles specified with this option, rather than all by
default. This saves space and allows the user to choose only what is needed on
each system.

5 months agoSkip createrepo() for apt if there are no debs
Daan De Meyer [Fri, 28 Feb 2025 10:49:41 +0000 (11:49 +0100)] 
Skip createrepo() for apt if there are no debs

reprepro fails if there are no packages passed to it so skip it if
there are no packages.

5 months agoman: remove "=" in boolean options
Antonio Alvarez Feijoo [Fri, 28 Feb 2025 08:30:49 +0000 (09:30 +0100)] 
man: remove "=" in boolean options

5 months agoEnsure environment GNUGPHOME is an absolute path
Nick Labich [Thu, 27 Feb 2025 20:53:50 +0000 (15:53 -0500)] 
Ensure environment GNUGPHOME is an absolute path

5 months agoAdd InitrdProfiles= with initial storage profile
Daan De Meyer [Thu, 27 Feb 2025 15:16:21 +0000 (16:16 +0100)] 
Add InitrdProfiles= with initial storage profile

Let's allow not installing lvm2 in the initrd by introducing a
storage profile which users can disable.

5 months agoqemu: Switch to -blockdev instead of -drive where possible
Daan De Meyer [Wed, 26 Feb 2025 15:42:16 +0000 (16:42 +0100)] 
qemu: Switch to -blockdev instead of -drive where possible

-drive is considered legacy whereas -blockdev is the new interface.
It's slightly more verbose but not incredibly so, let's switch to it.

5 months agoMerge pull request #3556 from DaanDeMeyer/build-overlay
Daan De Meyer [Wed, 26 Feb 2025 14:43:06 +0000 (15:43 +0100)] 
Merge pull request #3556 from DaanDeMeyer/build-overlay

Implement build overlay mounting with mkosi-sandbox

5 months agoMerge pull request #3555 from DaanDeMeyer/history
Daan De Meyer [Wed, 26 Feb 2025 13:55:31 +0000 (14:55 +0100)] 
Merge pull request #3555 from DaanDeMeyer/history

Introduce --run-build-scripts (-R) to always run build scripts

5 months agoImplement build overlay mounting with mkosi-sandbox 3556/head
Daan De Meyer [Wed, 26 Feb 2025 13:42:12 +0000 (14:42 +0100)] 
Implement build overlay mounting with mkosi-sandbox

Now that we have Context.rootoptions(), we can switch out how we set
up the root mount without having to modify code all over the place.

Let's use this to get rid of mount_build_overlay() and instead replace
it with setup_build_overlay(), which simply configures a bunch of
fields on Context that make rootoptions() set up the root mount as an
overlay instead of a bind mount.

5 months agoIntroduce Context.rootoptions()
Daan De Meyer [Wed, 26 Feb 2025 13:24:29 +0000 (14:24 +0100)] 
Introduce Context.rootoptions()

5 months agoIntroduce --run-build-scripts (-R) to always run build scripts 3555/head
Daan De Meyer [Wed, 26 Feb 2025 11:14:38 +0000 (12:14 +0100)] 
Introduce --run-build-scripts (-R) to always run build scripts

Currently we run "mkosi -t none" in systemd and mkosi-kernel to run
the build script(s) without rebuilding the entire image. Using the
"none" output format for this purpose is a hack. It also breaks when
using History=yes as running mkosi -t none will change the output
format in the history after which running mkosi qemu will fail saying
it can't boot the "none" output format.

Let's introduce a --run-build-scripts argument which will make us always
run the build scripts regardless of whether the image has already been
built or not. At the same time, remove various behaviors from the "none"
format that were solely added to enable the hack of using it to run build
scripts without rebuilding the image:

- Clean up outputs from the previous build when the "none" output format
  is used

5 months agotree: Ignore symlinks when checking for subvolumes in rmtree()
Daan De Meyer [Wed, 26 Feb 2025 12:35:04 +0000 (13:35 +0100)] 
tree: Ignore symlinks when checking for subvolumes in rmtree()

5 months agoinstaller: Do not modify buildroot in setup() methods
Daan De Meyer [Wed, 26 Feb 2025 12:25:29 +0000 (13:25 +0100)] 
installer: Do not modify buildroot in setup() methods

5 months agoRemove outputs as well if we don't have a cached image
Daan De Meyer [Wed, 26 Feb 2025 11:31:26 +0000 (12:31 +0100)] 
Remove outputs as well if we don't have a cached image

5 months agoIntroduce Config.is_incremental()
Daan De Meyer [Wed, 26 Feb 2025 11:41:00 +0000 (12:41 +0100)] 
Introduce Config.is_incremental()

5 months agoRename remove_output_dir to remove_outputs in run_clean()
Daan De Meyer [Wed, 26 Feb 2025 11:23:25 +0000 (12:23 +0100)] 
Rename remove_output_dir to remove_outputs in run_clean()

5 months agoDrop rmtree(context.root) in "none" return path as well
Daan De Meyer [Wed, 26 Feb 2025 11:10:55 +0000 (12:10 +0100)] 
Drop rmtree(context.root) in "none" return path as well

Follow up for c71c7d933bbad8851a80d1db83ddc1d8a8b362e1

5 months agoDon't call finalize_staging() for "none" output format
Daan De Meyer [Wed, 26 Feb 2025 11:10:17 +0000 (12:10 +0100)] 
Don't call finalize_staging() for "none" output format

The none output format generates no outputs so there's no need to
call finalize_staging().

5 months agoSave all images to history JSON
Daan De Meyer [Wed, 26 Feb 2025 11:08:55 +0000 (12:08 +0100)] 
Save all images to history JSON

Preparation for the upcoming commit where we'll need all the images
instead of just the main one when reading the history.

5 months agoMerge pull request #3554 from bluca/netesp
Luca Boccassi [Wed, 26 Feb 2025 10:44:13 +0000 (10:44 +0000)] 
Merge pull request #3554 from bluca/netesp

mkosi-obs: assorted fixes for netesp

5 months agomkosi-obs: rearrange settings into a subfile that is only for Profile=main 3554/head
Luca Boccassi [Tue, 25 Feb 2025 14:10:31 +0000 (14:10 +0000)] 
mkosi-obs: rearrange settings into a subfile that is only for Profile=main

These cannot be used with subimages, so move them down one level

5 months agomkosi-obs: support multiple mkosi.postoutput invocations
Luca Boccassi [Tue, 25 Feb 2025 14:05:33 +0000 (14:05 +0000)] 
mkosi-obs: support multiple mkosi.postoutput invocations

When multiple images are built mkosi.postoutput runs once
per image, so add access to output directory and ensure
the hashes.cpio.rsasign archive accumulates the hashes for
all images before proceeding to the next stage

5 months agomkosi-obs: rearrange second stage so that only unsigned hashes are staged for third
Luca Boccassi [Tue, 25 Feb 2025 14:04:22 +0000 (14:04 +0000)] 
mkosi-obs: rearrange second stage so that only unsigned hashes are staged for third

Create cpio for next stage at the very end, after all
signed hashes have been handled and removed, to avoid
resigning already signed files

5 months agomkosi-obs: drop leftover debug env
Luca Boccassi [Tue, 25 Feb 2025 11:42:31 +0000 (11:42 +0000)] 
mkosi-obs: drop leftover debug env

5 months agomkosi-obs: fix compression detection
Luca Boccassi [Tue, 25 Feb 2025 11:40:02 +0000 (11:40 +0000)] 
mkosi-obs: fix compression detection

The recompress variable is not reset in the loop, so if
there is a compressed ddi and an uncompressed one, the
variable will be true for the second one. Reset it.

5 months agomkosi-obs: carry over all raw and efi files, not just those that match IMAGE_ID
Luca Boccassi [Tue, 25 Feb 2025 10:34:12 +0000 (10:34 +0000)] 
mkosi-obs: carry over all raw and efi files, not just those that match IMAGE_ID

e.g.: netesp in particleos

5 months agoMerge pull request #3553 from DaanDeMeyer/cow
Daan De Meyer [Tue, 25 Feb 2025 19:08:51 +0000 (20:08 +0100)] 
Merge pull request #3553 from DaanDeMeyer/cow

Enable Hyperscale rpm COW plugin

5 months agoEnable Hyperscale rpm COW plugin 3553/head
Daan De Meyer [Tue, 25 Feb 2025 17:46:16 +0000 (18:46 +0100)] 
Enable Hyperscale rpm COW plugin

The CentOS Hyperscale SIG provides rpm/dnf plugins to enable rpm
COW which drastically speeds up image builds so let's ship the
necessary logic to make use of it when building images with the
Hyperscale experimental repositories.

5 months agorpm: Enable plugins again
Daan De Meyer [Tue, 25 Feb 2025 17:51:18 +0000 (18:51 +0100)] 
rpm: Enable plugins again

We disabled this a long time ago, likely when we were still using
/etc from the host, let's try enabling the plugins again and see
what happens in CI.

5 months agoAdd Image= match
Daan De Meyer [Tue, 25 Feb 2025 13:35:09 +0000 (14:35 +0100)] 
Add Image= match

5 months agoMove /work directory cleanup out of remove_files()
Daan De Meyer [Tue, 25 Feb 2025 10:50:21 +0000 (11:50 +0100)] 
Move /work directory cleanup out of remove_files()

This has to be done after running the finalize scripts as a
mkosi.finalize.chroot might recreate the /work directory.

5 months agoMerge pull request #3550 from bluca/authvars
Daan De Meyer [Tue, 25 Feb 2025 07:16:01 +0000 (08:16 +0100)] 
Merge pull request #3550 from bluca/authvars

mkosi-obs: fixes, secureboot self-enroll, sign bootloaders

5 months agomkosi-obs: add support for UEFI SecureBoot self enrollment 3550/head
Luca Boccassi [Tue, 25 Feb 2025 00:12:36 +0000 (00:12 +0000)] 
mkosi-obs: add support for UEFI SecureBoot self enrollment

Create authvars and store them in the ESP with the project cert
used as PK/KEK/db

5 months agomkosi-obs: sign bootloaders in ESPs
Luca Boccassi [Tue, 25 Feb 2025 00:11:46 +0000 (00:11 +0000)] 
mkosi-obs: sign bootloaders in ESPs

If there are bootloaders in the ESP(s), sign them too. Useful to
ensure everything is signed also with the certificate in the project
where the image is built.