X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=build-devtoolbox;h=a07c6bb0bde55806000283105c9a431e01a07d3d;hp=39f05c7da272cb6025dff62b272f5d3f404f9fdd;hb=f3dbee55b747554e80f25dde91590ff08f480fdc;hpb=13675a529e1d2976ddd62cbe6184610749f8deeb

diff --git a/build-devtoolbox b/build-devtoolbox
index 39f05c7..a07c6bb 100755
--- a/build-devtoolbox
+++ b/build-devtoolbox
@@ -19,6 +19,12 @@ toolbox run -c "$NAME" sh -exc '
 echo "${ID}-${VERSION_ID}" | sudo tee /etc/hostname
 sudo hostname -F /etc/hostname
 
+# https://github.com/containers/toolbox/issues/552
+if [ "$VERSION_ID" = 33 ]; then
+    sudo rm -f /etc/yum.repos.d/*rawhide*
+    sudo dnf config-manager --set-enabled fedora --set-enabled updates
+fi
+
 sudo dnf update -y
 
 # this just refuses to rpm -i normally
@@ -26,23 +32,27 @@ 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 \
-    pandoc texlive-ec \
-    /usr/bin/scanimage /usr/bin/pngquant /usr/bin/convert /usr/bin/pdfjoin \
+    pandoc texlive-ec texlive-pdfjam \
+    /usr/bin/scanimage /usr/bin/pngquant /usr/bin/convert \
     calibre qt5-qtwayland keepassxc
 
 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