X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=build-devtoolbox;h=07dc22184ab3237c4e6f4f85dcf37ba2cb9912fb;hp=de82ed0a68884c60a056d1816695a7ba9e3a0d32;hb=d802c8aecc3efb8dbd1a9158a0cc77e61013c6c9;hpb=daff02a49e7b1c099d9f105f4f30a68195cfffa2

diff --git a/build-devtoolbox b/build-devtoolbox
index de82ed0..07dc221 100755
--- a/build-devtoolbox
+++ b/build-devtoolbox
@@ -14,47 +14,41 @@ 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
 
+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
 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
-
 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-X11 \
-    ansible standard-test-roles rsync strace diffstat \
-    pwgen glibc-langpack-en tig twine dbus-daemon
+    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 \
+    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
 
-sudo dnf clean packages
+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)
 
-sudo pip install awscli
+sudo dnf clean packages
 
 # unbreak kerberos; https://github.com/debarshiray/toolbox/issues/235
 cat <<EOF | sudo tee /etc/krb5.conf.d/0_file_ccache
 [libdefaults]
     default_ccache_name = FILE:/tmp/krb5.ccache
 EOF
-
-# vim-X11 does not ship vim binary
-sudo ln -s vimx /usr/bin/vim
 '