diff options
author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2022-07-15 02:26:52 +0200 |
---|---|---|
committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2022-07-18 16:54:56 +0200 |
commit | 69d638e67e5bfc5fedcae4072f144a4f7d798c9a (patch) | |
tree | 7609b870b6116e04516fb3bb2901d9f64e65434c /mkosi.default.d | |
parent | 111ff5d5115cb2f49aba59da5dbdf96a28d0974d (diff) | |
download | systemd-69d638e67e5bfc5fedcae4072f144a4f7d798c9a.tar.gz |
mkosi: Changes to allow booting with sanitizers in mkosi
- Extra memory because ASAN needs it
- The environment variables to make the sanitizers more useful
- LD_PRELOAD because the ASAN DSO needs to be the first in the list
- The sanitizer library packages
- Disable syscall filters because they interfere with ASAN
- Disable systemd-hwdb-update because it's super slow when systemd-hwdb
is built with sanitizers
- Take the value for meson's b_sanitize option from the SANITIZERS
environment variable
Diffstat (limited to 'mkosi.default.d')
-rw-r--r-- | mkosi.default.d/10-systemd.conf | 3 | ||||
-rw-r--r-- | mkosi.default.d/centos_epel/10-mkosi.centos_epel | 2 | ||||
-rw-r--r-- | mkosi.default.d/debian/10-mkosi.debian | 2 | ||||
-rw-r--r-- | mkosi.default.d/fedora/10-mkosi.fedora | 3 | ||||
-rw-r--r-- | mkosi.default.d/opensuse/10-mkosi.opensuse | 2 | ||||
-rw-r--r-- | mkosi.default.d/ubuntu/10-mkosi.ubuntu | 2 |
6 files changed, 14 insertions, 0 deletions
diff --git a/mkosi.default.d/10-systemd.conf b/mkosi.default.d/10-systemd.conf index 08a03f489b..24b85ddd0b 100644 --- a/mkosi.default.d/10-systemd.conf +++ b/mkosi.default.d/10-systemd.conf @@ -6,6 +6,8 @@ Format=gpt_btrfs Bootable=yes HostonlyInitrd=yes +# Prevent ASAN warnings when building the image +Environment=ASAN_OPTIONS=verify_asan_link_order=false [Packages] BuildDirectory=mkosi.builddir @@ -16,6 +18,7 @@ SourceFileTransferFinal=copy-git-others [Host] QemuHeadless=yes NetworkVeth=yes +QemuMem=2G [Validation] Password= diff --git a/mkosi.default.d/centos_epel/10-mkosi.centos_epel b/mkosi.default.d/centos_epel/10-mkosi.centos_epel index 42b3c11629..086fcdb555 100644 --- a/mkosi.default.d/centos_epel/10-mkosi.centos_epel +++ b/mkosi.default.d/centos_epel/10-mkosi.centos_epel @@ -78,6 +78,8 @@ Packages= e2fsprogs # xxd is provided by the vim-common package vim-common + libasan + libubsan # Required to run systemd-networkd-tests.py python3 iproute diff --git a/mkosi.default.d/debian/10-mkosi.debian b/mkosi.default.d/debian/10-mkosi.debian index 44e8521d9a..9b77b5b832 100644 --- a/mkosi.default.d/debian/10-mkosi.debian +++ b/mkosi.default.d/debian/10-mkosi.debian @@ -74,6 +74,8 @@ Packages= nano strace xxd + # Provides libasan/libubsan + gcc # Required to run systemd-networkd-tests.py python3 iproute2 diff --git a/mkosi.default.d/fedora/10-mkosi.fedora b/mkosi.default.d/fedora/10-mkosi.fedora index a6b58c7589..0314a2faab 100644 --- a/mkosi.default.d/fedora/10-mkosi.fedora +++ b/mkosi.default.d/fedora/10-mkosi.fedora @@ -77,6 +77,9 @@ Packages= compsize # xxd is provided by the vim-common package vim-common + # Sanitizers + libasan + libubsan # Required to run systemd-networkd-tests.py python iproute diff --git a/mkosi.default.d/opensuse/10-mkosi.opensuse b/mkosi.default.d/opensuse/10-mkosi.opensuse index 53fe2f3c93..b1ca381759 100644 --- a/mkosi.default.d/opensuse/10-mkosi.opensuse +++ b/mkosi.default.d/opensuse/10-mkosi.opensuse @@ -75,3 +75,5 @@ Packages= util-linux # xxd is provided by the vim package vim + # Provides libasan/libubsan + gcc diff --git a/mkosi.default.d/ubuntu/10-mkosi.ubuntu b/mkosi.default.d/ubuntu/10-mkosi.ubuntu index 0a54547f87..dfb0ec0fd5 100644 --- a/mkosi.default.d/ubuntu/10-mkosi.ubuntu +++ b/mkosi.default.d/ubuntu/10-mkosi.ubuntu @@ -72,6 +72,8 @@ Packages= nano strace xxd + # Provides libasan/libubsan + gcc # Required to run systemd-networkd-tests.py python3 iproute2 |