X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=build-devtoolbox;h=047b8344b9c888f73328f47b1d753954389ac720;hp=3bb60a8c7ce6e25973705786881db5238147a2cc;hb=7e476e5f7c7f4fefa8f4d93c6d3b5960ae3c40ea;hpb=d801488bcc51ec358933b9d5b4ec3cc811cf094b

diff --git a/build-devtoolbox b/build-devtoolbox
index 3bb60a8..047b834 100755
--- a/build-devtoolbox
+++ b/build-devtoolbox
@@ -14,21 +14,31 @@ yes | toolbox create $RELEASE -c $NAME
 
 # install cockpit's build deps and other development tools
 toolbox run -c "$NAME" sh -exc '
+if [ ! -e /etc/resolv.conf ]; then
+    sudo ln -sfn /run/host/monitor/resolv.conf /etc/resolv.conf
+fi
+
 # 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)
+# HACK: no rcm-tools for F31 yet
+sudo sed -i "s/\$releasever/30/" /etc/yum.repos.d/rcm-tools-fedora.repo
+
+# HACK: installing selinux-policy (through transitive builddep cockpit dep) breaks toolbox; https://bugzilla.redhat.com/show_bug.cgi?id=1768075
+sudo dnf install -y selinux-policy
+rpm -ql selinux-policy | sudo xargs rm -f || true
 
 sudo dnf builddep -y cockpit
-sudo dnf install -y make npm fontconfig git valgrind chromium-headless \
+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 \
     man-pages socat wget genisoimage vim-enhanced \
-    ansible standard-test-roles rsync strace \
+    ansible standard-test-roles rsync strace diffstat \
     pwgen glibc-langpack-en waiverdb-cli
 
 sudo dnf debuginfo-install -y glib2 glibc libssh gnutls