Revert "build-devtoolbox: Fix broken Fedora 33 image"

[bin.git] / build-devtoolbox

diff --git a/build-devtoolbox b/build-devtoolbox
index 58fd3db6de1f3ee4bcc5af2fdee8db63875f12c6..ff11b23215d6e63e5374504e2f45f6416b6fa8fd 100755 (executable)
--- a/build-devtoolbox
+++ b/build-devtoolbox
@@ -19,12 +19,6 @@ 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
@@ -41,8 +35,8 @@ sudo dnf install -y make npm fontconfig git valgrind chromium \
     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
@@ -56,10 +50,13 @@ 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
-sudo umount /mnt  # HACK: rhts-test-env-5.0-2.fc32eng.noarch wants to fiddle with it
-sudo wget -O /etc/yum.repos.d/qa-tools.repo http://liver.brq.redhat.com/repo/qa-tools.repo
-sudo wget -O /etc/yum.repos.d/beaker-client.repo http://download.lab.bos.redhat.com/beakerrepos/beaker-client-Fedora.repo
-sudo dnf install -y qa-tools-workstation-1minutetip
+# HACK: not available for F33 yet
+if [ "$VERSION_ID" != 33 ]; then
+    sudo umount /mnt  # HACK: rhts-test-env-5.0-2.fc32eng.noarch wants to fiddle with it
+    sudo wget -O /etc/yum.repos.d/qa-tools.repo http://liver.brq.redhat.com/repo/qa-tools.repo
+    sudo wget -O /etc/yum.repos.d/beaker-client.repo http://download.lab.bos.redhat.com/beakerrepos/beaker-client-Fedora.repo
+    sudo dnf install -y qa-tools-workstation-1minutetip
+fi
 
 sudo dnf clean packages