[PATCH] dpkg-base: mount git source folder into buildchroot

[Christian Storm <christian.storm@siemens.com>]

When building a Debian source package with source/format "3.0 (git)",
the git binary is used to bundle the source. For being able to do so,
<build>/tmp/downloads/git/<git_repo> needs to be mounted into the
buildchroot as .git/objects/info/alternates refers to it.

Signed-off-by: Christian Storm <christian.storm@siemens.com>
---
 meta/classes/dpkg-base.bbclass                   | 5 ++++-
 meta/recipes-devtools/buildchroot/buildchroot.bb | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 35af6d5..3235ebf 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -20,14 +20,17 @@ dpkg_runbuild() {
 # Wrap the function dpkg_runbuild with the bind mount for buildroot
 do_build() {
     mkdir -p ${BUILDROOT}
-    sudo mount --bind ${WORKDIR} ${BUILDROOT}
     _do_build_cleanup() {
         ret=$?
         sudo umount ${BUILDROOT} 2>/dev/null || true
         sudo rmdir ${BUILDROOT} 2>/dev/null || true
+        sudo umount ${BUILDCHROOT_DIR}/${GITDIR} 2>/dev/null || true
+        sudo rmdir ${BUILDCHROOT_DIR}/${GITDIR} 2>/dev/null || true
         (exit $ret) || bb_exit_handler
     }
     trap '_do_build_cleanup' EXIT
+    sudo mount --bind ${WORKDIR} ${BUILDROOT}
+    sudo mount --bind ${GITDIR} ${BUILDCHROOT_DIR}/${GITDIR}
     dpkg_runbuild
     _do_build_cleanup
 }
diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb
index 6a94733..8652cf1 100644
--- a/meta/recipes-devtools/buildchroot/buildchroot.bb
+++ b/meta/recipes-devtools/buildchroot/buildchroot.bb
@@ -32,6 +32,7 @@ WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}"
 do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
 do_build[dirs] = "${WORKDIR}/hooks_multistrap"
 
+do_build[dirs] = "${BUILDCHROOT_DIR}/${GITDIR}"
 do_build() {
     chmod +x "${WORKDIR}/setup.sh"
     chmod +x "${WORKDIR}/configscript.sh"
-- 
2.15.0