mirror of
https://github.com/systemd/systemd.git
synced 2024-10-27 10:25:37 +03:00
Merge pull request #29143 from DaanDeMeyer/mkosi-presets
Various mkosi improvements
This commit is contained in:
commit
3cdf7861a0
5
.github/workflows/mkosi.yml
vendored
5
.github/workflows/mkosi.yml
vendored
@ -76,13 +76,10 @@ jobs:
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
|
||||
- uses: systemd/mkosi@cb5974d013f7c4c2a45f67c9ae990767e32e9034
|
||||
- uses: systemd/mkosi@adaa41512aa30c952daae5ba0abcf2622d66b93b
|
||||
|
||||
- name: Configure
|
||||
run: |
|
||||
# We configure ExtraSearchPaths=build/ so make sure build/ exists.
|
||||
mkdir build/
|
||||
|
||||
tee mkosi.conf <<- EOF
|
||||
[Distribution]
|
||||
Distribution=${{ matrix.distro }}
|
||||
|
7
mkosi.conf.d/10-extra-search-paths.conf
Normal file
7
mkosi.conf.d/10-extra-search-paths.conf
Normal file
@ -0,0 +1,7 @@
|
||||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
|
||||
[Match]
|
||||
PathExists=build/
|
||||
|
||||
[Host]
|
||||
ExtraSearchPaths=build/
|
@ -4,4 +4,4 @@
|
||||
Distribution=fedora
|
||||
|
||||
[Distribution]
|
||||
@Release=38
|
||||
@Release=39
|
||||
|
@ -1,5 +1,8 @@
|
||||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
|
||||
[Preset]
|
||||
Presets=system
|
||||
|
||||
[Output]
|
||||
OutputDirectory=mkosi.output
|
||||
BuildDirectory=mkosi.builddir
|
||||
@ -14,7 +17,6 @@ Environment=ASAN_OPTIONS=verify_asan_link_order=false
|
||||
[Host]
|
||||
@Incremental=yes
|
||||
@QemuMem=2G
|
||||
ExtraSearchPaths=build/
|
||||
# Make sure we don't trigger systemd-firstboot prompting for the root password.
|
||||
Credentials=passwd.plaintext-password.root=
|
||||
KernelCommandLineExtra=systemd.crash_shell
|
||||
|
8
mkosi.conf.d/10-tools.conf
Normal file
8
mkosi.conf.d/10-tools.conf
Normal file
@ -0,0 +1,8 @@
|
||||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
|
||||
[Match]
|
||||
PathExists=!build/
|
||||
SystemdVersion=<254
|
||||
|
||||
[Host]
|
||||
ToolsTree=default
|
@ -1,9 +1,5 @@
|
||||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
|
||||
[Match]
|
||||
Bootable=|auto
|
||||
Bootable=|yes
|
||||
|
||||
[Preset]
|
||||
Dependencies=base
|
||||
|
||||
|
@ -2,14 +2,12 @@
|
||||
|
||||
[Preset]
|
||||
Dependencies=base
|
||||
initrd
|
||||
|
||||
[Content]
|
||||
Autologin=yes
|
||||
BaseTrees=../../mkosi.output/base
|
||||
ExtraTrees=../../mkosi.output/base-systemd
|
||||
ExtraTrees=../../src:/usr/src/src
|
||||
Initrds=../../mkosi.output/initrd
|
||||
Packages=
|
||||
acl
|
||||
bash-completion
|
||||
|
11
mkosi.presets/system/mkosi.conf.d/05-initrd.conf
Normal file
11
mkosi.presets/system/mkosi.conf.d/05-initrd.conf
Normal file
@ -0,0 +1,11 @@
|
||||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
|
||||
[Match]
|
||||
Bootable=!no
|
||||
Format=disk
|
||||
|
||||
[Preset]
|
||||
Dependencies=initrd
|
||||
|
||||
[Content]
|
||||
Initrds=../../mkosi.output/initrd
|
Loading…
Reference in New Issue
Block a user