X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=build-devtoolbox;h=004c5373e1d3e3da40c5f273fc694eafdc74bacd;hp=7b5a0050cbbf6d2d33f289fb23fedc0c91ed11a3;hb=b7eeef18f0bfc16443620ddb202d329438f2f2ac;hpb=b8a1d145aa608017038395f121be23b16654b210

diff --git a/build-devtoolbox b/build-devtoolbox
index 7b5a005..004c537 100755
--- a/build-devtoolbox
+++ b/build-devtoolbox
@@ -14,6 +14,7 @@ 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
@@ -27,19 +28,15 @@ sudo update-ca-trust
 # 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 \
     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 \
+    man-pages socat wget genisoimage vim-X11 \
     ansible standard-test-roles rsync strace diffstat \
-    pwgen glibc-langpack-en waiverdb-cli
+    pwgen glibc-langpack-en tig twine dbus-daemon
 
 sudo dnf debuginfo-install -y glib2 glibc libssh gnutls
 
@@ -53,7 +50,6 @@ cat <<EOF | sudo tee /etc/krb5.conf.d/0_file_ccache
     default_ccache_name = FILE:/tmp/krb5.ccache
 EOF
 
-# set up waiverdb
-printf "[waiverdb]\nauth_method=Kerberos\nresultsdb_api_url=https://resultsdb-api.engineering.redhat.com/api/v2.0\napi_url=https://waiverdb.engineering.redhat.com/api/v1.0\nkrb_principal=HTTP/waiverdb.engineering.redhat.com@REDHAT.COM\n" | sudo tee /etc/waiverdb/client.conf
-printf "[libdefaults]\n    dns_canonicalize_hostname = false\n" | sudo tee /etc/krb5.conf.d/waiverdb-canonicalize-hostname
+# vim-X11 does not ship vim binary
+sudo ln -s vimx /usr/bin/vim
 '