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

[Alexander Smirnov <asmirnov@ilbers.de>]

Hi,

On 11/14/2017 07:48 PM, Christian Storm wrote:
> 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.

Could you please provide more details regarding where it should be mounted?

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

${GITDIR} - will be expanded to absolute path of your build tree on the 
host. Why this private path is needed in buildchroot? This doesn't look 
correct for me if you need it for build.

Also git repository is already available in buildchroot:

1. If package is fetched via git repository - it's stored in ${GITDIR}.
2. Then task "do_unpack" clones this to ${WORKDIR}/git folder
3. During build task, the folder ${WORKDIR} is mounted to ${BUILDROOT}
4. So your git repo is in: /home/builder/${PN}/git folder inside chroot.

Probably some sample recipe would be helpful to describe what's going.

Alex

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