X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=build-devmock;h=410ac32c9f14ab5c9dd4f0465e036210d5e28f59;hp=54729fcb625a520e03e1de66c77b8615a7a1b2b8;hb=f376e407071606cf3ef0e281be654ea39a0380d0;hpb=0a9888d89f798824f40159cd7bd35d6d87265397

diff --git a/build-devmock b/build-devmock
index 54729fc..410ac32 100755
--- a/build-devmock
+++ b/build-devmock
@@ -2,17 +2,19 @@
 set -eux
 MOCK="mock -r ${OS:-default}"
 
-mock --clean
+$MOCK --clean
 
-# install cockpit's build deps
+# install cockpit's build deps and other development tools
 $MOCK -i $(sed -n '/^BuildRequires:/ {s/^.*: //; s/>=.*$//; s/%{.*}//; p}' ~/upstream/cockpit/tools/cockpit.spec) \
     npm fontconfig git valgrind chromium-headless \
     libvirt-daemon-kvm libvirt-client python3-libvirt \
     virt-viewer libguestfs-tools-c \
     expect python3-pycodestyle python3-pyflakes \
     fedpkg /usr/bin/oc /usr/bin/genisoimage \
-    man-pages socat wget genisoimage vim-enhanced
+    man-pages socat wget genisoimage vim-enhanced \
+    ansible standard-test-roles rsync
 
+# interactive shell sessions work as user martin, not builder
 $MOCK --unpriv --copyin /dev/stdin /builddir/.bashrc <<EOF
 export HOME=/home/martin
 export TERM=xterm
@@ -24,3 +26,16 @@ if [ -f /etc/bashrc ]; then
 fi
 . ~/.bashrc
 EOF
+
+# make mock compatible with ostree's /home → /var/home structure
+$MOCK --chroot -- ln -sf /home /var/home
+
+# install rhpkg
+$MOCK -i ~martin/Dokumente/Arbeit/RedHat/redhat-internal-cert-install-0.1-7.el7.csb.noarch.rpm
+$MOCK --chroot --cwd=/etc/yum.repos.d -- 'echo >> /etc/dnf/dnf.conf; curl --location https://download.devel.redhat.com/rel-eng/RCMTOOLS/rcm-tools-fedora.repo >> /etc/dnf/dnf.conf'
+$MOCK -i rhpkg
+
+# ssh looks at passwd, not $HOME
+$MOCK --chroot --unpriv -- rm -rf /builddir/.ssh
+$MOCK --chroot --unpriv -- ln -s /home/martin/.ssh /builddir/.ssh
+$MOCK --chroot --unpriv -- ln -s /home/martin/upstream /builddir/upstream