From 1a39075eb53fbc2cf34cc485ae40bc0b74522d3e Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin@piware.de>
Date: Fri, 12 Jul 2019 07:59:28 +0200
Subject: [PATCH] =?utf8?q?build-devmock:=20make=20mock=20compatible=20with?=
 =?utf8?q?=20ostree's=20/home=20=E2=86=92=20/var/home=20structure?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Create a /var/home → /home symlink, so that an outside cwd of
/var/home/$user works in the mock.
---
 build-devmock | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build-devmock b/build-devmock
index 93daa84..2e50451 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,6 @@ 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
-- 
2.39.5