diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-09-02 14:39:37 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-09-03 13:18:38 +0200 |
| commit | d55ad7fe96eb1edf438a7a41a465723bd29d4b10 (patch) | |
| tree | 6f357fcd48fd63d53818fc4d2173690d0ab090a4 | |
| parent | 6ad92aaf901a47bc96cb42192f26f03c48fbd702 (diff) | |
| download | systemd-d55ad7fe96eb1edf438a7a41a465723bd29d4b10.tar.gz | |
mkosi: move distro files to mkosi.default.d/
With this change, "mkosi build" will automatically build systemd for the
current distro without any further configuration. If people want to do a
cross-distro build by default, they can still create mkosi.default, but I
assume that this is relatively rare.
If people have symlinked mkosi.default to one of the files in .mkosi/, they'll
need to adjust the symlink.
(Building without configuration would always fail, since systemd has many many
required dependencies. I think it's nicer to do the most commonly expected
thing by default, i.e. rebuild for the current distro.)
Mkosi is nowadays packaged for most distros, so recommend installing of distro
packages as the primary installation mechanism.
| -rw-r--r-- | docs/HACKING.md | 11 | ||||
| -rw-r--r-- | mkosi.default.d/arch/mkosi.arch (renamed from .mkosi/mkosi.arch) | 0 | ||||
| -rw-r--r-- | mkosi.default.d/debian/mkosi.debian (renamed from .mkosi/mkosi.debian) | 0 | ||||
| -rw-r--r-- | mkosi.default.d/fedora/mkosi.fedora (renamed from .mkosi/mkosi.fedora) | 0 | ||||
| -rw-r--r-- | mkosi.default.d/opensuse/mkosi.opensuse (renamed from .mkosi/mkosi.opensuse) | 0 | ||||
| -rw-r--r-- | mkosi.default.d/ubuntu/mkosi.ubuntu (renamed from .mkosi/mkosi.ubuntu) | 0 |
6 files changed, 4 insertions, 7 deletions
diff --git a/docs/HACKING.md b/docs/HACKING.md index 7982be34d0..3131597c22 100644 --- a/docs/HACKING.md +++ b/docs/HACKING.md @@ -34,13 +34,10 @@ possible, however. In order to simplify testing for cases like this we provide a set of `mkosi` build files directly in the source tree. `mkosi` is a tool for building clean OS images from an upstream distribution in combination with a fresh build of the project in the local working directory. To make use of this, -please acquire `mkosi` from https://github.com/systemd/mkosi first, unless your -distribution has packaged it already and you can get it from there. After the -tool is installed, symlink the settings file for your distribution of choice -from .mkosi/ to mkosi.default in the project root directory (note that the -package manager for this distro needs to be installed on your host system). -After doing that, it is sufficient to type `mkosi` in the systemd project -directory to generate a disk image `image.raw` you can boot either in +please install the `mkosi` package (if not packaged for your distro, it can be +downloaded from https://github.com/systemd/mkosi). `mkosi` will build an image +for the host distro by default. It is sufficient to type `mkosi` in the systemd +project directory to generate a disk image `image.raw` you can boot either in `systemd-nspawn` or in an UEFI-capable VM: ``` diff --git a/.mkosi/mkosi.arch b/mkosi.default.d/arch/mkosi.arch index f584d2d126..f584d2d126 100644 --- a/.mkosi/mkosi.arch +++ b/mkosi.default.d/arch/mkosi.arch diff --git a/.mkosi/mkosi.debian b/mkosi.default.d/debian/mkosi.debian index 9bd504bf57..9bd504bf57 100644 --- a/.mkosi/mkosi.debian +++ b/mkosi.default.d/debian/mkosi.debian diff --git a/.mkosi/mkosi.fedora b/mkosi.default.d/fedora/mkosi.fedora index cc3a5a2d1a..cc3a5a2d1a 100644 --- a/.mkosi/mkosi.fedora +++ b/mkosi.default.d/fedora/mkosi.fedora diff --git a/.mkosi/mkosi.opensuse b/mkosi.default.d/opensuse/mkosi.opensuse index 7eb7b857ca..7eb7b857ca 100644 --- a/.mkosi/mkosi.opensuse +++ b/mkosi.default.d/opensuse/mkosi.opensuse diff --git a/.mkosi/mkosi.ubuntu b/mkosi.default.d/ubuntu/mkosi.ubuntu index c9c473e7ba..c9c473e7ba 100644 --- a/.mkosi/mkosi.ubuntu +++ b/mkosi.default.d/ubuntu/mkosi.ubuntu |