build-devtoolbox: Fix resolv.conf link

[bin.git] / build-devtoolbox

diff --git a/build-devtoolbox b/build-devtoolbox
index 3bb60a8c7ce6e25973705786881db5238147a2cc..07dc22184ab3237c4e6f4f85dcf37ba2cb9912fb 100755 (executable)
--- a/build-devtoolbox
+++ b/build-devtoolbox
@@ -14,25 +14,36 @@ yes | toolbox create $RELEASE -c $NAME
 
 # install cockpit's build deps and other development tools
 toolbox run -c "$NAME" sh -exc '
+# 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)
-
 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 \
+    fedpkg /usr/bin/oc /usr/bin/genisoimage /usr/bin/pip \
     man-pages socat wget genisoimage vim-enhanced \
-    ansible standard-test-roles rsync strace \
-    pwgen glibc-langpack-en waiverdb-cli
+    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
 
+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 dnf clean packages
 
 # unbreak kerberos; https://github.com/debarshiray/toolbox/issues/235
@@ -40,8 +51,4 @@ cat <<EOF | sudo tee /etc/krb5.conf.d/0_file_ccache
 [libdefaults]
     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
 '