X-Git-Url: https://piware.de/gitweb/?a=blobdiff_plain;f=build-cockpit-toolbox;h=e24ac9aa0264f548bf0c5991291216f3ee3363e3;hb=ebbb6cfdd0e1981f4ffa102c315376fc0a98ab71;hp=3b0ae8613b66a6b934eb429348bc89d9473cf228;hpb=14151b87aafb3f821f2eb160695cb48597963af4;p=bin.git

diff --git a/build-cockpit-toolbox b/build-cockpit-toolbox
index 3b0ae86..e24ac9a 100755
--- a/build-cockpit-toolbox
+++ b/build-cockpit-toolbox
@@ -16,42 +16,16 @@ sudo hostname -F /etc/hostname
 # enable manpages
 sudo sed -i s/nodocs// /etc/dnf/dnf.conf
 
-sudo dnf install -y ansible man-db man-pages moreutils fd-find ripgrep gh \
+sudo dnf install -y ansible man-db man-pages moreutils fd-find ripgrep gh neovim \
     python3-boto python3-boto3 python3-openstacksdk libnotify \
-    pandoc texlive-ec texlive-pdfjam texlive-beamer \
-    /usr/bin/scanimage /usr/bin/pngquant /usr/bin/convert \
-    kpcli \
+    simple-scan /usr/bin/scanimage /usr/bin/pngquant /usr/bin/convert pdfmerge \
+    cargo rustfmt clippy \
     calibre qt5-qtwayland \
-    chromium dbus-daemon flatpak-builder flatpak-spawn
+    chromium dbus-daemon tmt tmt-provision-virtual flatpak-builder flatpak-spawn
 
-# HACK: tmt-provision-virtual has way too heavy dependencies: https://bugzilla.redhat.com/show_bug.cgi?id=2093717
-cat <<EOF > /tmp/spec
-Name: dummy-deps
-Summary: dummy dependencies
-Version: 999
-Release: 1%{?dist}
-# https://bugzilla.redhat.com/show_bug.cgi?id=2093717
-Provides: python3-libguestfs
-Provides: libguestfs-tools-c
-# also for tmt-provision-virtual
-Provides: libvirt
-License: BSD
-
-%description
-Dummy dependencies to avoid bloat.
-
-%files
-EOF
-rpmbuild --define "_topdir /tmp/rpmbuild-dummy" -bb /tmp/spec
-sudo rpm -i --verbose /tmp/rpmbuild-dummy/RPMS/x86_64/dummy-deps-999-1.fc*.x86_64.rpm
-rm -rf /tmp/rpmbuild-dummy /tmp/spec
-
-sudo dnf install -y --setopt=install_weak_deps=False tmt tmt-provision-virtual
-
-# run podman in toolbox
-printf "flatpak-spawn --host podman \42\$@\42\n" | sudo tee /usr/local/bin/podman >/dev/null
-sudo chmod a+x /usr/local/bin/podman
-
-# debugging cockpit crashes
-sudo dnf debuginfo-install -y glib2 glibc libssh gnutls
+# commands to forward to the host
+for cmd in podman toolbox nmcli eog evince; do
+    printf "flatpak-spawn --host $cmd \42\$@\42\n" | sudo tee /usr/local/bin/$cmd >/dev/null
+    sudo chmod a+x /usr/local/bin/$cmd
+done
 '