mkosi: More package updates

- Install individual asan libraries instead of gcc
- Drop duplicate qrencode package from arch config
- Install dbus-user-session which provides default-dbus-session-bus
- Explicitly install dbus-broker on Arch Linux

diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf
index 2c08e0eee5bb38f9361333d09e7f506f5668bdd1..303af4acb1b345166bbb02bc7f89f809fc1ab1b9 100644 (file)
--- a/mkosi.images/system/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf
@@ -14,7 +14,6 @@ Packages=
         dosfstools
         e2fsprogs
         findutils
-        gcc # Sanitizer libraries
         gdb
         grep
         gzip

diff --git a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
index 4f4966650c3788739c3eafca1a61608e540e3f11..131f7d8e68e61b752203b6b723e28c06ae970131 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf
@@ -18,7 +18,8 @@ Packages=
         btrfs-progs
         compsize
         cryptsetup
-        dbus
+        dbus-broker
+        dbus-broker-units
         dhcp
         f2fs-tools
         git
@@ -31,7 +32,6 @@ Packages=
         openssl
         pacman
         polkit
-        qrencode
         quota-tools
         sbsigntools
         shadow

diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
index e83c3fd621ee8eb032a3f56daa01048e5e3faa39..e2be181fe2bffbef96a56b42c47dea3541bb10f5 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
@@ -26,13 +26,15 @@ Environment=
                           udev"
 
 Packages=
+        ^libasan[0-9]+$
         ^libtss2-esys-[0-9.]+-0$
         ^libtss2-mu-[0-9.]+-0$
+        ^libubsan[0-9]+$
         apt
         btrfs-progs
         cryptsetup-bin
         dbus-broker
-        default-dbus-session-bus
+        dbus-user-session
         dmsetup
         f2fs-tools
         fdisk

diff --git a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
index 9d2c24c144b51e0700baa949c8b9076fcb67fbc3..2b14a6db0afbbe43bcde2e4e9f5d1ab8e2ab58e5 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf
@@ -37,6 +37,8 @@ Packages=
         grep
         gzip
         kernel-kvmsmall
+        libasan8
+        libubsan1
         openssh-clients
         openssh-server
         pam