From f5d400fff0df75781a515f4cda1c5b23e2d62391 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 20 Apr 2023 10:03:55 +0200 Subject: [PATCH] build-cockpit-toolbox: Install centpkg For CentOS stream it needs the rhel-packager dependencies, so install that in install-rhel-tools. This gets rid of the james/centpkg COPR. --- build-cockpit-toolbox | 3 ++- install-rhel-tools | 6 +----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build-cockpit-toolbox b/build-cockpit-toolbox index c22b540..ebe96d0 100755 --- a/build-cockpit-toolbox +++ b/build-cockpit-toolbox @@ -21,7 +21,8 @@ sudo dnf install -y ansible man-db man-pages moreutils fd-find ripgrep gh git-de simple-scan /usr/bin/scanimage /usr/bin/pngquant /usr/bin/convert pdfmerge \ cargo rustfmt clippy \ calibre qt5-qtwayland \ - chromium dbus-daemon tmt tmt-provision-virtual flatpak-builder flatpak-spawn + chromium dbus-daemon tmt tmt-provision-virtual flatpak-builder flatpak-spawn \ + centpkg # commands to forward to the host for cmd in podman toolbox nmcli eog evince; do diff --git a/install-rhel-tools b/install-rhel-tools index 4fcea98..47b26f3 100755 --- a/install-rhel-tools +++ b/install-rhel-tools @@ -8,11 +8,7 @@ sudo curl -o /etc/pki/ca-trust/source/anchors/2022-RH-IT-Root-CA.crt https://cer sudo update-ca-trust (cd /etc/yum.repos.d; sudo curl -O --location https://download.devel.redhat.com/rel-eng/RCMTOOLS/rcm-tools-fedora.repo) -sudo dnf install -y rhpkg - -# CentOS stream -sudo dnf copr enable -y james/centpkg -sudo dnf install -y centpkg streamkoji +sudo dnf install -y rhel-packager # coverity sudo dnf copr enable -y copr.devel.redhat.com/kdudka/covscan -- 2.39.2