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

[Henning Schild <henning.schild@siemens.com>]

Am Tue, 14 Nov 2017 17:48:44 +0100
schrieb "[ext] 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 | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes/dpkg-base.bbclass
> b/meta/classes/dpkg-base.bbclass index 35af6d5..a98e690 100644
> --- a/meta/classes/dpkg-base.bbclass
> +++ b/meta/classes/dpkg-base.bbclass
> @@ -20,14 +20,18 @@ dpkg_runbuild() {
>  # Wrap the function dpkg_runbuild with the bind mount for buildroot
>  do_build() {
>      mkdir -p ${BUILDROOT}
> -    sudo mount --bind ${WORKDIR} ${BUILDROOT}
> +    [ ! -d ${BUILDCHROOT_DIR}/${GITDIR} ] && sudo install -d -m 755
> ${BUILDCHROOT_DIR}/${GITDIR} 

This "mkdir" should probably be done in buildchroot:do_build, maybe
with [dirs]. The current implementation has a race and the mkdir could
also be done without condition, since install would not fail anyways.

> _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

The rmdir is not really needed, maybe [dirs] will handle it.

Henning

>          (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
>  }