Install archlinux-keyring and makepkg in default debian/ubuntu image

Also run pacman-key --init and pacman-key --populate in a prepare
script.

diff --git a/mkosi.conf.d/20-debian-ubuntu.conf b/mkosi.conf.d/20-debian-ubuntu.conf
index e3927c87893bccd703fd5e827e0883c76cce1c1f..e9a3b14ad84e2f1631a52a98157eaf6652214a25 100644 (file)
--- a/mkosi.conf.d/20-debian-ubuntu.conf
+++ b/mkosi.conf.d/20-debian-ubuntu.conf
@@ -8,6 +8,7 @@ Distribution=|ubuntu
 Packages=
         amd64-microcode
         apt
+        archlinux-keyring
         bash
         btrfs-progs
         bubblewrap
@@ -24,6 +25,7 @@ Packages=
         grub-pc
         intel-microcode
         libtss2-dev
+        makepkg
         mtools
         openssh-client
         openssh-server

diff --git a/mkosi.prepare.chroot b/mkosi.prepare.chroot
new file mode 100755 (executable)
index 0000000..a2fbc69
--- /dev/null
+++ b/mkosi.prepare.chroot
@@ -0,0 +1,7 @@
+#!/bin/sh
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+if [ "$1" = "final" ] && command -v pacman-key; then
+    pacman-key --init
+    pacman-key --populate
+fi