From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 17 Dec 2023 20:01:35 +0000 (+0100)
Subject: Install archlinux-keyring and makepkg in default debian/ubuntu image
X-Git-Tag: v20~55^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8867f4b64906a8cfa9284e2683dff678cf648806;p=thirdparty%2Fmkosi.git

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 e3927c878..e9a3b14ad 100644
--- 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
index 000000000..a2fbc694b
--- /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