From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 15 Jul 2022 00:30:01 +0000 (+0200)
Subject: mkosi: Install xxd in images
X-Git-Tag: v252-rc1~618^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6e6b6954c3b245894f50929190ac687eda9019b;p=thirdparty%2Fsystemd.git

mkosi: Install xxd in images

Came in handy while working on
https://github.com/systemd/systemd/pull/24024 so let's install it
in the image by default.
---

diff --git a/mkosi.default.d/arch/10-mkosi.arch b/mkosi.default.d/arch/10-mkosi.arch
index 55e8a206c81..822da035d80 100644
--- a/mkosi.default.d/arch/10-mkosi.arch
+++ b/mkosi.default.d/arch/10-mkosi.arch
@@ -63,6 +63,8 @@ Packages=
         # For testing systemd's zsh completion scripts
         # Run `autoload -Uz compinit; compinit` from a zsh shell in the booted image to enable completions.
         zsh
+        # xxd is provided by the vim package
+        vim
         # Required to run systemd-networkd-tests.py
         python
         iproute
diff --git a/mkosi.default.d/centos_epel/10-mkosi.centos_epel b/mkosi.default.d/centos_epel/10-mkosi.centos_epel
index cf6c74f01ce..42b3c116293 100644
--- a/mkosi.default.d/centos_epel/10-mkosi.centos_epel
+++ b/mkosi.default.d/centos_epel/10-mkosi.centos_epel
@@ -76,6 +76,8 @@ Packages=
         less
         netcat
         e2fsprogs
+        # xxd is provided by the vim-common package
+        vim-common
         # Required to run systemd-networkd-tests.py
         python3
         iproute
diff --git a/mkosi.default.d/debian/10-mkosi.debian b/mkosi.default.d/debian/10-mkosi.debian
index 7aa0194a605..44e8521d9a8 100644
--- a/mkosi.default.d/debian/10-mkosi.debian
+++ b/mkosi.default.d/debian/10-mkosi.debian
@@ -73,6 +73,7 @@ Packages=
         locales
         nano
         strace
+        xxd
         # Required to run systemd-networkd-tests.py
         python3
         iproute2
diff --git a/mkosi.default.d/fedora/10-mkosi.fedora b/mkosi.default.d/fedora/10-mkosi.fedora
index 88598164830..a6b58c75895 100644
--- a/mkosi.default.d/fedora/10-mkosi.fedora
+++ b/mkosi.default.d/fedora/10-mkosi.fedora
@@ -75,6 +75,8 @@ Packages=
         netcat
         e2fsprogs
         compsize
+        # xxd is provided by the vim-common package
+        vim-common
         # Required to run systemd-networkd-tests.py
         python
         iproute
diff --git a/mkosi.default.d/opensuse/10-mkosi.opensuse b/mkosi.default.d/opensuse/10-mkosi.opensuse
index a2d35378f79..53fe2f3c938 100644
--- a/mkosi.default.d/opensuse/10-mkosi.opensuse
+++ b/mkosi.default.d/opensuse/10-mkosi.opensuse
@@ -73,3 +73,5 @@ Packages=
         nano
         strace
         util-linux
+        # xxd is provided by the vim package
+        vim
diff --git a/mkosi.default.d/ubuntu/10-mkosi.ubuntu b/mkosi.default.d/ubuntu/10-mkosi.ubuntu
index 109bd468dc2..909703a60dc 100644
--- a/mkosi.default.d/ubuntu/10-mkosi.ubuntu
+++ b/mkosi.default.d/ubuntu/10-mkosi.ubuntu
@@ -71,6 +71,7 @@ Packages=
         locales
         nano
         strace
+        xxd
         # Required to run systemd-networkd-tests.py
         python3
         iproute2