mkosi: Remove some packages from the image

Let's slim down the image size a bit. None of the removed packages
should be required.

diff --git a/mkosi/mkosi.conf b/mkosi/mkosi.conf
index 08019db11906aeb3688f681ed2ec3e26ff634014..a2f9784b40de5cdea375757ee45dfb639961bdfb 100644 (file)
--- a/mkosi/mkosi.conf
+++ b/mkosi/mkosi.conf
@@ -106,7 +106,6 @@ Packages=
         kexec-tools
         kmod
         less
-        llvm
         lsof
         lvm2
         mdadm
@@ -125,7 +124,6 @@ Packages=
         socat
         strace
         tar
-        tmux
         tree
         util-linux
         valgrind

diff --git a/mkosi/mkosi.conf.d/arch/mkosi.conf b/mkosi/mkosi.conf.d/arch/mkosi.conf
index f7d9e44c1aa13d4418be7283127ef6235cbb6130..9bea621fcaa609a8161a845f4e94804662b5536f 100644 (file)
--- a/mkosi/mkosi.conf.d/arch/mkosi.conf
+++ b/mkosi/mkosi.conf.d/arch/mkosi.conf
@@ -17,15 +17,12 @@ Packages=
         bind
         bpf
         btrfs-progs
-        compsize
         cryptsetup
         dbus-broker
         dbus-broker-units
         dhcp
         elfutils
         erofs-utils
-        f2fs-tools
-        git
         gnutls
         inetutils
         iproute
@@ -44,7 +41,6 @@ Packages=
         pkgconf
         polkit
         procps-ng
-        psmisc
         python-pexpect
         python-psutil
         qrencode
@@ -56,6 +52,5 @@ Packages=
         stress-ng
         tgt
         tpm2-tools
-        vim
         # kernel-bootcfg --add-uri= is just too useful
         virt-firmware

diff --git a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf
index b78706aeb909edaa5d98c8efba579bcaadc7066a..fbbc6a90bf91c73d79a25c53b61798b89c921548 100644 (file)
--- a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf
+++ b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf
@@ -30,7 +30,6 @@ Packages=
         elfutils-devel
         elfutils-libs
         erofs-utils
-        git-core
         glibc-langpack-de
         glibc-langpack-en
         gnutls-utils

diff --git a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf
index fe4eeb04fc21134e0da1e9c5a40b4326fff45ac7..f024eae204d0f9a8c90a20d3672fcab429f76486 100644 (file)
--- a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf
+++ b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf
@@ -41,9 +41,7 @@ Packages=
         dbus-user-session
         dmsetup
         erofs-utils
-        f2fs-tools
         fdisk
-        git-core
         gnutls-bin
         hostname
         iproute2
@@ -64,7 +62,6 @@ Packages=
         polkitd
         pkgconf
         procps
-        psmisc
         python3-pexpect
         python3-psutil
         # kernel-bootcfg --add-uri= is just too useful
@@ -77,4 +74,3 @@ Packages=
         tgt
         tpm2-tools
         tzdata
-        xxd

diff --git a/mkosi/mkosi.conf.d/fedora/mkosi.conf b/mkosi/mkosi.conf.d/fedora/mkosi.conf
index ef222dae504ec573d1132f39d3b6c21ed24acbbe..23e907f9185588653a860f0a25cc1531f71c7477 100644 (file)
--- a/mkosi/mkosi.conf.d/fedora/mkosi.conf
+++ b/mkosi/mkosi.conf.d/fedora/mkosi.conf
@@ -9,10 +9,8 @@ Release=rawhide
 [Content]
 Packages=
         btrfs-progs
-        compsize
         dhcp-server
         dnf5
-        f2fs-tools
         # Required for systemd-networkd-tests.py (netdevsim and sch_xxx modules)
         kernel-modules-extra
         kernel-modules-internal

diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf
index 6f41df5da5684c653f1274bc79e582ddcc76ec72..d01c6658c0ffdcbf5ab9b4f42366b50e314ffd31 100644 (file)
--- a/mkosi/mkosi.conf.d/opensuse/mkosi.conf
+++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf
@@ -40,9 +40,7 @@ Packages=
         dhcp-server
         docbook-xsl-stylesheets
         erofs-utils
-        f2fs-tools
         gawk
-        git-core
         glibc-locale-base
         gnutls
         grep
@@ -72,7 +70,6 @@ Packages=
         policycoreutils
         pkgconf
         procps4
-        psmisc
         python3-pefile
         python3-pexpect
         python3-psutil
@@ -91,7 +88,6 @@ Packages=
         tpm2.0-tools
         util-linux-systemd
         veritysetup
-        vim
         # kernel-bootcfg --add-uri= is just too useful
         virt-firmware
         xz

diff --git a/test/units/TEST-17-UDEV.device_is_processing.sh b/test/units/TEST-17-UDEV.device_is_processing.sh
index 34fa126d823b97cabf2aad986ab5d5b21d9e6b1e..2f658c350edd07c076641c862fcf35e2d7ba8ffd 100755 (executable)
--- a/test/units/TEST-17-UDEV.device_is_processing.sh
+++ b/test/units/TEST-17-UDEV.device_is_processing.sh
@@ -15,7 +15,7 @@ at_exit() {
     systemctl stop testsleep.service
     rm -f /run/udev/udev.conf.d/timeout.conf
     rm -f /run/udev/rules.d/99-testsuite.rules
-    killall --regexp '(|/usr/bin/)sleep'
+    pkill -f '(/usr/bin/)?sleep'
     udevadm control --reload
     ip link del "$IFNAME"
 }
@@ -60,7 +60,7 @@ done
 grep -q -F 'ID_PROCESSING=1' "/run/udev/data/n${IFINDEX}"
 
 # Forcibly kill sleep command invoked by the udev rule to finish processing the add event.
-killall --regexp '(|/usr/bin/)sleep'
+pkill -f '(/usr/bin/)?sleep'
 udevadm settle --timeout=30
 
 # Check if ID_PROCESSING flag is unset, and the device units are active.

diff --git a/test/units/TEST-17-UDEV.failed-event.sh b/test/units/TEST-17-UDEV.failed-event.sh
index 1dcef70a21095a07dbacf1635c54c184bf87ef1e..d7896c8c2d2535178886c2f976a8e114701d0fac 100755 (executable)
--- a/test/units/TEST-17-UDEV.failed-event.sh
+++ b/test/units/TEST-17-UDEV.failed-event.sh
@@ -83,7 +83,7 @@ run_test_killed() {
     for _ in {1..40}; do
         if [[ -z "$killed" ]]; then
             if [[ -e /tmp/test-udev-marker ]]; then
-                killall --signal ABRT --regexp udev-worker
+                pkill -ABRT udev-worker
                 killed=1
             fi
         elif grep -q 'UDEV_WORKER_FAILED=1' "$TMPDIR"/monitor.txt; then

diff --git a/test/units/TEST-70-TPM2.nvpcr.sh b/test/units/TEST-70-TPM2.nvpcr.sh
index 1539d056a4dea169b3c100d126bea96c072a3a2f..ce5bdfc651bab8eb82648250c38a5f1383035a5a 100755 (executable)
--- a/test/units/TEST-70-TPM2.nvpcr.sh
+++ b/test/units/TEST-70-TPM2.nvpcr.sh
@@ -38,8 +38,8 @@ test -f /run/systemd/nvpcr/test.anchor
 /usr/lib/systemd/systemd-pcrextend --nvpcr=test schrumpel
 # To calculate the current value we need the anchor measurement
 DIGEST_BASE="$(cat /run/systemd/nvpcr/test.anchor)"
-DIGEST_MEASURED="$(echo -n "schrumpel" | openssl dgst -sha256 -binary | xxd -p -c200)"
-DIGEST_EXPECTED="$(echo "$DIGEST_BASE$DIGEST_MEASURED" | xxd -r -p | openssl dgst -sha256 -binary | xxd -p -c200)"
+DIGEST_MEASURED="$(echo -n "schrumpel" | openssl dgst -sha256 -hex -r | cut -d' ' -f1)"
+DIGEST_EXPECTED="$(echo "$DIGEST_BASE$DIGEST_MEASURED" | tr '[:lower:]' '[:upper:]' | basenc --base16 -d | openssl dgst -sha256 -hex -r | cut -d' ' -f1)"
 DIGEST_ACTUAL="$(systemd-analyze nvpcrs test --json=pretty | jq -r '.[] | select(.name=="test") | .value')"
 test "$DIGEST_ACTUAL" = "$DIGEST_EXPECTED"
 
@@ -49,6 +49,6 @@ DIGEST_ACTUAL2="$(systemd-analyze nvpcrs test --json=pretty | jq -r '.[] | selec
 test "$DIGEST_ACTUAL2" != "$DIGEST_EXPECTED"
 
 # And calculate the new result
-DIGEST_MEASURED2="$(echo -n "schnurz" | openssl dgst -sha256 -binary | xxd -p -c200)"
-DIGEST_EXPECTED2="$(echo "$DIGEST_EXPECTED$DIGEST_MEASURED2" | xxd -r -p | openssl dgst -sha256 -binary | xxd -p -c200)"
+DIGEST_MEASURED2="$(echo -n "schnurz" | openssl dgst -sha256 -hex -r | cut -d' ' -f1)"
+DIGEST_EXPECTED2="$(echo "$DIGEST_EXPECTED$DIGEST_MEASURED2" | tr '[:lower:]' '[:upper:]' | basenc --base16 -d | openssl dgst -sha256 -hex -r | cut -d' ' -f1)"
 test "$DIGEST_ACTUAL2" = "$DIGEST_EXPECTED2"