build-devmock: Fix ssh

[bin.git] / build-devmock

diff --git a/build-devmock b/build-devmock
index d288959d1f27f571dcca9d260359305c6292b499..fabee7a2ea82b614e55e1a45b9187d3fddf5bd93 100755 (executable)
--- a/build-devmock
+++ b/build-devmock
@@ -2,11 +2,33 @@
 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
+    fedpkg /usr/bin/oc /usr/bin/genisoimage \
+    man-pages socat wget genisoimage vim-enhanced
+
+# interactive shell sessions work as user martin, not builder
+$MOCK --unpriv --copyin /dev/stdin /builddir/.bashrc <<EOF
+export HOME=/home/martin
+export TERM=xterm
+cd
+
+# Source global definitions
+if [ -f /etc/bashrc ]; then
+       . /etc/bashrc
+fi
+. ~/.bashrc
+EOF
+
+# make mock compatible with ostree's /home → /var/home structure
+mock -r ${OS:-default} --chroot -- ln -sf /home /var/home
+
+# ssh looks at passwd, not $HOME
+mock -r ${OS:-default} --chroot --unpriv -- rm -rf /builddir/.ssh
+mock -r ${OS:-default} --chroot --unpriv -- ln -s /home/martin/.ssh /builddir/.ssh