From ae4f44a94e39890ca6600d7eafe2b4ddc972e49b Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 6 Dec 2020 11:42:45 +0000
Subject: [PATCH 1/2] mkosi: Add gdb to final images

Let's add a debugger to the mkosi images so we can debug coredumps
from inside mkosi qemu VMs (and hopefully in the future from
mkosi systemd-nspawn containers as well).
---
 .mkosi/mkosi.arch     | 1 +
 .mkosi/mkosi.debian   | 2 ++
 .mkosi/mkosi.fedora   | 1 +
 .mkosi/mkosi.opensuse | 1 +
 .mkosi/mkosi.ubuntu   | 2 ++
 5 files changed, 7 insertions(+)

diff --git a/.mkosi/mkosi.arch b/.mkosi/mkosi.arch
index b99cf8bc9b..ebed8dcbbe 100644
--- a/.mkosi/mkosi.arch
+++ b/.mkosi/mkosi.arch
@@ -54,6 +54,7 @@ BuildPackages=
         zstd
 
 Packages=
+        gdb
         libidn2
         qrencode
 
diff --git a/.mkosi/mkosi.debian b/.mkosi/mkosi.debian
index da6a30a711..9e59446774 100644
--- a/.mkosi/mkosi.debian
+++ b/.mkosi/mkosi.debian
@@ -62,6 +62,8 @@ BuildPackages=
         zstd
 
 Packages=
+        gdb
+        libidn2-0
         libqrencode4
         locales
         libidn2-0
diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora
index f9750b994a..a01a6d0190 100644
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@@ -72,6 +72,7 @@ BuildPackages=
         zstd
 
 Packages=
+        gdb
         # libfido2 + libzstd can be dropped once the Fedora RPM gets a dependency on them
         libfido2
         libzstd
diff --git a/.mkosi/mkosi.opensuse b/.mkosi/mkosi.opensuse
index 96dbedead4..b9f0e92f4b 100644
--- a/.mkosi/mkosi.opensuse
+++ b/.mkosi/mkosi.opensuse
@@ -62,6 +62,7 @@ BuildPackages=
         timezone
 
 Packages=
+        gdb
         # brought in via meson->python3
         libp11-kit0
         # --bootable=no
diff --git a/.mkosi/mkosi.ubuntu b/.mkosi/mkosi.ubuntu
index 08d0c49d90..43218cb403 100644
--- a/.mkosi/mkosi.ubuntu
+++ b/.mkosi/mkosi.ubuntu
@@ -66,6 +66,8 @@ BuildPackages=
         zstd
 
 Packages=
+        gdb
+        libidn2-0
         libqrencode4
         locales
         libidn2-0

From c6ab308767c7e53ac0da5bd7943047882dc7c4b8 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 9 Dec 2020 17:28:51 +0000
Subject: [PATCH 2/2] mkosi: Add strace to final images

Useful for debugging purposes.
---
 .mkosi/mkosi.arch     | 1 +
 .mkosi/mkosi.debian   | 2 +-
 .mkosi/mkosi.fedora   | 1 +
 .mkosi/mkosi.opensuse | 1 +
 .mkosi/mkosi.ubuntu   | 2 +-
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.mkosi/mkosi.arch b/.mkosi/mkosi.arch
index ebed8dcbbe..81ce68ccd9 100644
--- a/.mkosi/mkosi.arch
+++ b/.mkosi/mkosi.arch
@@ -57,6 +57,7 @@ Packages=
         gdb
         libidn2
         qrencode
+        strace
 
 [Host]
 QemuHeadless=yes
diff --git a/.mkosi/mkosi.debian b/.mkosi/mkosi.debian
index 9e59446774..0f47bb5ad1 100644
--- a/.mkosi/mkosi.debian
+++ b/.mkosi/mkosi.debian
@@ -66,7 +66,7 @@ Packages=
         libidn2-0
         libqrencode4
         locales
-        libidn2-0
+        strace
 
 [Host]
 QemuHeadless=yes
diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora
index a01a6d0190..e113fd92a8 100644
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@@ -78,6 +78,7 @@ Packages=
         libzstd
         # procps-ng provides a set of useful utilies (ps, free, etc)
         procps-ng
+        strace
 
 BuildDirectory=mkosi.builddir
 Cache=mkosi.cache
diff --git a/.mkosi/mkosi.opensuse b/.mkosi/mkosi.opensuse
index b9f0e92f4b..0dcd0c436d 100644
--- a/.mkosi/mkosi.opensuse
+++ b/.mkosi/mkosi.opensuse
@@ -76,6 +76,7 @@ Packages=
         libqrencode4
         libseccomp2
         pam
+        strace
         util-linux
 
 [Host]
diff --git a/.mkosi/mkosi.ubuntu b/.mkosi/mkosi.ubuntu
index 43218cb403..47a2b9c3f8 100644
--- a/.mkosi/mkosi.ubuntu
+++ b/.mkosi/mkosi.ubuntu
@@ -70,7 +70,7 @@ Packages=
         libidn2-0
         libqrencode4
         locales
-        libidn2-0
+        strace
 
 [Host]
 QemuHeadless=yes