X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=build-devmock;h=fabee7a2ea82b614e55e1a45b9187d3fddf5bd93;hp=93daa84c72486b44cfb417be0c3d7482be1b0484;hb=4e1337a1ef541ef1060b3042ce3bcf0058ed45b8;hpb=2fb93af8d008b9350b162827ffaed90ed3e6ba81

diff --git a/build-devmock b/build-devmock
index 93daa84..fabee7a 100755
--- a/build-devmock
+++ b/build-devmock
@@ -4,7 +4,7 @@ MOCK="mock -r ${OS:-default}"
 
 $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 \
@@ -13,6 +13,7 @@ $MOCK -i $(sed -n '/^BuildRequires:/ {s/^.*: //; s/>=.*$//; s/%{.*}//; p}' ~/ups
     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
@@ -24,3 +25,10 @@ if [ -f /etc/bashrc ]; then
 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