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 55e8a206c8104e01e16b5843fbff8fdad4ad0e45..822da035d8025302dd2b576f4bc0fc5b859f67c9 100644 (file)
--- 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 cf6c74f01ce07653daf9e1bba1e5634eb97c638e..42b3c11629365dd6c3e5d850ade66e28a282da94 100644 (file)
--- 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 7aa0194a605353bda1d24d2c5196af1f2eecebd7..44e8521d9a8dfd450a2b51d5179190d1271af56a 100644 (file)
--- 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 885981648304000728fefb1d7a35646ec69baef1..a6b58c758953d9ad2a38fe57ece3fe0e37661801 100644 (file)
--- 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 a2d35378f7982ec529dfe511103999d713908a96..53fe2f3c9388e78ce5c1833f69b21a40cc8dceaf 100644 (file)
--- 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 109bd468dc2f9915d665ca707388e64b12e7a661..909703a60dc628db39de31f6fe35ed459b646156 100644 (file)
--- 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