shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-26 08:55:40 +03:00
Code

mkosi: Fix sections for settings

Browse Source 
Upstream we moved settings around a bit to different sections, let's
adapt to those changes in the systemd repo.
This commit is contained in:
Daan De Meyer 2024-10-04 14:22:35 +02:00
parent 7d9464ceac
commit 963157ca78
13 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mkosi.conf
View File

@ -26,16 +26,18 @@ PassEnvironment=
[Output]
RepartDirectories=mkosi.repart
OutputDirectory=build/mkosi.output
[Build]
BuildDirectory=build/mkosi.builddir
CacheDirectory=build/mkosi.cache
BuildSourcesEphemeral=yes
Incremental=yes
# TODO: Remove when TEST-70-TPM doesn't fail in an image with signed PCRs anymore.
[Validation]
SignExpectedPcr=no
[Content]
BuildSourcesEphemeral=yes
ExtraTrees=
mkosi.crt:/usr/lib/verity.d/mkosi.crt # sysext verification key
mkosi.leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions
@ -141,11 +143,9 @@ Credentials=
tty.serial.hvc0.login.noauth=yes
tty.console.agetty.autologin=root
tty.console.login.noauth=yes
Incremental=yes
RuntimeBuildSources=yes
RuntimeScratch=no
QemuSmp=2
QemuSwtpm=yes
QemuVsock=yes
QemuKvm=yes
ToolsTreePackages=virtiofsd

3
mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf
View File

@ -3,9 +3,6 @@
# libselinux does not work in the slightest with /usr-only images so don't install the packages if we're
# building a /usr-only image.
[Match]
Profile=!particle
[Content]
Packages=
selinux-policy

3
mkosi.conf.d/10-centos/mkosi.conf
View File

@ -6,7 +6,7 @@ Distribution=centos
[Distribution]
Release=10
[Content]
[Build]
Environment=
# CentOS doesn't support btrfs so we have to use something else. We'd prefer to use XFS here but it
# fails to mount on duplicate filesystem UUIDs which happens when running tests in parallel so we use
@ -16,5 +16,6 @@ Environment=
# mkfs.ext4 enabled it by default, so we disable it explicitly.
SYSTEMD_REPART_MKFS_OPTIONS_EXT4="-O ^orphan_file"
[Content]
Packages=
kernel-modules # For squashfs

6
mkosi.conf.d/20-sanitizers.conf
View File

@ -4,13 +4,15 @@
Environment=SANITIZERS
Environment=!SANITIZERS=
[Content]
[Build]
# Set verify_asan_link_order=0 to prevent ASAN warnings when building the image and make sure the real ASAN
# options are set when booting the image.
# Set intercept_tls_get_addr=0 to work around leak sanitizer segmentation fault in test-dlopen-so on CentOS
# Stream 9.
# TODO: Drop intercept_tls_get_addr=0 when we remove CentOS Stream 9 builds.
Environment=ASAN_OPTIONS=verify_asan_link_order=0:intercept_tls_get_addr=0
[Content]
KernelCommandLine=
ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:disable_coredump=0:use_madv_dontdump=1
systemd.setenv=ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:disable_coredump=0:use_madv_dontdump=1
@ -19,5 +21,5 @@ KernelCommandLine=
LSAN_OPTIONS=suppressions=/usr/lib/systemd/leak-sanitizer-suppressions
systemd.setenv=LSAN_OPTIONS=suppressions=/usr/lib/systemd/leak-sanitizer-suppressions
[Config]
[Include]
Include=%D/mkosi.sanitizers

3
mkosi.images/build/mkosi.conf.d/arch/mkosi.conf
View File

@ -3,13 +3,14 @@
[Match]
Distribution=arch
[Content]
[Build]
Environment=
GIT_URL=https://gitlab.archlinux.org/archlinux/packaging/packages/systemd.git
GIT_BRANCH=main
GIT_COMMIT=d5a2dc54dad2bcfefa1032cc95823f1acedfcb4c
PKG_SUBDIR=arch
[Content]
Packages=
base
base-devel

3
mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf
View File

@ -4,13 +4,14 @@
Distribution=|centos
Distribution=|fedora
[Content]
[Build]
Environment=
GIT_URL=https://src.fedoraproject.org/rpms/systemd.git
GIT_BRANCH=rawhide
GIT_COMMIT=a67221c3f0d0b81b9b5b3230a71d09044342f1a4
PKG_SUBDIR=fedora
[Content]
Packages=
compiler-rt
git-core

3
mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf
View File

@ -4,7 +4,7 @@
Distribution=|debian
Distribution=|ubuntu
[Content]
[Build]
Environment=
GIT_URL=https://salsa.debian.org/systemd-team/systemd.git
GIT_SUBDIR=debian
@ -12,6 +12,7 @@ Environment=
GIT_COMMIT=51389fefcabae6d1e28153fed84a5e69a9147b19
PKG_SUBDIR=debian
[Content]
Packages=
apt
erofs-utils

3
mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf
View File

@ -3,13 +3,14 @@
[Match]
Distribution=opensuse
[Content]
[Build]
Environment=
GIT_URL=https://src.opensuse.org/pool/systemd
GIT_BRANCH=factory
GIT_COMMIT=612bc16021b28ab99002fa1069f1ec97124397a25c7a207d013213b5cfb86055
PKG_SUBDIR=opensuse
[Content]
Packages=
diffutils
erofs-utils

2
mkosi.images/exitrd/mkosi.conf
View File

@ -13,5 +13,5 @@ MakeInitrd=yes
Packages=
bash
[Config]
[Include]
Include=%D/mkosi.sanitizers

2
mkosi.images/initrd/mkosi.conf
View File

@ -1,6 +1,6 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
[Config]
[Include]
Include=
mkosi-initrd
%D/mkosi.sanitizers

4
mkosi.images/minimal-0/mkosi.conf
View File

@ -7,7 +7,9 @@ Dependencies=minimal-base
Format=portable
SplitArtifacts=yes
[Build]
Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs
[Content]
BaseTrees=%O/minimal-base
Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs
Bootable=no

4
mkosi.images/minimal-1/mkosi.conf
View File

@ -7,7 +7,9 @@ Dependencies=minimal-base
Format=portable
SplitArtifacts=yes
[Build]
Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs
[Content]
BaseTrees=%O/minimal-base
Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs
Bootable=no

2
mkosi.images/minimal-base/mkosi.conf
View File

@ -15,5 +15,5 @@ Packages=
grep
util-linux
[Config]
[Include]
Include=%D/mkosi.sanitizers