X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=build-devtoolbox;h=58fd3db6de1f3ee4bcc5af2fdee8db63875f12c6;hp=f762596b1c87c2ee09da2fff318152c9014a73ba;hb=2519aec669d57a9e9d8947a74036eda6ed12e9a2;hpb=40af8412e7cee68b82047c5eb28b11f06b7fb32c

diff --git a/build-devtoolbox b/build-devtoolbox
index f762596..58fd3db 100755
--- a/build-devtoolbox
+++ b/build-devtoolbox
@@ -14,38 +14,45 @@ yes | toolbox create $RELEASE -c $NAME
 
 # install cockpit's build deps and other development tools
 toolbox run -c "$NAME" sh -exc '
-# https://bugzilla.redhat.com/show_bug.cgi?id=1785244
-if [ ! -e /etc/resolv.conf ]; then
-    sudo ln -sfn /run/host/monitor/resolv.conf /etc/resolv.conf
-fi
-
 # useful hostname
 . /etc/os-release
 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
 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 waiverdb-cli \
+    pwgen glibc-langpack-en tig twine dbus-daemon \
     pandoc texlive-ec \
     /usr/bin/scanimage /usr/bin/pngquant /usr/bin/convert /usr/bin/pdfjoin \
-    calibre qt5-qtwayland
+    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