build-rhtoolbox: Simplify certificate install

[bin.git] / build-devtoolbox

diff --git a/build-devtoolbox b/build-devtoolbox
index ff11b23215d6e63e5374504e2f45f6416b6fa8fd..1bf711cf4f9aa24d66c3193881364c6ef78b68fb 100755 (executable)
--- a/build-devtoolbox
+++ b/build-devtoolbox
@@ -20,6 +20,7 @@ echo "${ID}-${VERSION_ID}" | sudo tee /etc/hostname
 sudo hostname -F /etc/hostname
 
 sudo dnf update -y
+sudo ln -sfn ../run/host/run/NetworkManager/resolv.conf /etc/resolv.conf
 
 # this just refuses to rpm -i normally
 sudo dnf install -y cpio
@@ -27,7 +28,7 @@ rpm2cpio ~martin/Dokumente/Arbeit/RedHat/redhat-internal-cert-install-0.1-7.el7.
 sudo update-ca-trust
 
 sudo dnf builddep -y cockpit
-sudo dnf install -y make npm fontconfig git valgrind chromium \
+sudo dnf install -y make npm sassc fontconfig git valgrind chromium \
     libvirt-daemon-kvm libvirt-client python3-libvirt \
     virt-viewer virt-install libappstream-glib \
     expect python3-pycodestyle python3-pyflakes \
@@ -41,23 +42,8 @@ sudo dnf install -y make npm fontconfig git valgrind chromium \
 
 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
-# 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
 
 # unbreak kerberos; https://github.com/debarshiray/toolbox/issues/235