From: Martin Pitt <martin@piware.de>
Date: Fri, 4 Sep 2020 05:50:07 +0000 (+0200)
Subject: build-devtoolbox: Skip rhpkg for Fedora 33
X-Git-Url: https://piware.de/gitweb/?a=commitdiff_plain;h=2519aec669d57a9e9d8947a74036eda6ed12e9a2;p=bin.git

build-devtoolbox: Skip rhpkg for Fedora 33

Repository does not exist yet, and F32 version does not work due to
Python 3.8 migration.
---

diff --git a/build-devtoolbox b/build-devtoolbox
index 7685fb3..58fd3db 100755
--- a/build-devtoolbox
+++ b/build-devtoolbox
@@ -32,14 +32,12 @@ sudo dnf install -y cpio
 rpm2cpio ~martin/Dokumente/Arbeit/RedHat/redhat-internal-cert-install-0.1-7.el7.csb.noarch.rpm | sudo cpio -id --directory=/ --verbose "./etc/pki/*"
 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 builddep -y cockpit
 sudo dnf install -y make npm fontconfig git valgrind chromium \
     libvirt-daemon-kvm libvirt-client python3-libvirt \
     virt-viewer virt-install libappstream-glib \
     expect python3-pycodestyle python3-pyflakes \
-    fedpkg rhpkg /usr/bin/oc /usr/bin/genisoimage /usr/bin/pip \
+    fedpkg /usr/bin/oc /usr/bin/genisoimage /usr/bin/pip \
     man-pages socat wget genisoimage vim-enhanced \
     ansible python3-boto python3-boto3 standard-test-roles rsync strace diffstat \
     pwgen glibc-langpack-en tig twine dbus-daemon \
@@ -49,6 +47,12 @@ sudo dnf install -y make npm fontconfig git valgrind chromium \
 
 sudo dnf debuginfo-install -y glib2 glibc libssh gnutls
 
+# HACK: rcmtools not available for F33 yet
+if [ "$VERSION_ID" != 33 ]; then
+    (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
+fi
+
 type gh >/dev/null 2>&1 || sudo dnf install -y $(curl -s https://api.github.com/repos/cli/cli/releases/latest | grep -o https:.*_linux_amd64.rpm)
 
 # 1minutetip