From eb61da6ab129394a100e03feeda0b734557f5253 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Sat, 3 Dec 2022 22:41:55 +0100 Subject: [PATCH] Revert "build-cockpit-toolbox: Work around too heavy tmt-provision-virtual dependencies" Dependencies got cleaned up a while ago. This reverts commit 18e95e0c178a3889a912724aa2a9e3b146756f6f. --- build-cockpit-toolbox | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/build-cockpit-toolbox b/build-cockpit-toolbox index 3b0ae86..0ff0f7e 100755 --- a/build-cockpit-toolbox +++ b/build-cockpit-toolbox @@ -22,31 +22,7 @@ sudo dnf install -y ansible man-db man-pages moreutils fd-find ripgrep gh \ /usr/bin/scanimage /usr/bin/pngquant /usr/bin/convert \ kpcli \ calibre qt5-qtwayland \ - chromium dbus-daemon flatpak-builder flatpak-spawn - -# HACK: tmt-provision-virtual has way too heavy dependencies: https://bugzilla.redhat.com/show_bug.cgi?id=2093717 -cat < /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 + chromium dbus-daemon tmt tmt-provision-virtual flatpak-builder flatpak-spawn # run podman in toolbox printf "flatpak-spawn --host podman \42\$@\42\n" | sudo tee /usr/local/bin/podman >/dev/null -- 2.39.5