From 50ad7cf93490be69db1e4dab6c1e4ae37aa73118 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 3 Apr 2024 20:48:05 +0200
Subject: [PATCH] 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
---
 mkosi.images/system/mkosi.conf                               | 1 -
 mkosi.images/system/mkosi.conf.d/10-arch/mkosi.conf          | 4 ++--
 mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf | 4 +++-
 mkosi.images/system/mkosi.conf.d/10-opensuse/mkosi.conf      | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf
index 2c08e0eee5b..303af4acb1b 100644
--- 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 4f4966650c3..131f7d8e68e 100644
--- 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 e83c3fd621e..e2be181fe2b 100644
--- 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 9d2c24c144b..2b14a6db0af 100644
--- 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
-- 
2.47.3