Re: [PATCH] buildchroot: mount base-apt when using repo caching

["Maxim Yu. Osipov" <mosipov@isar-build.org>]

On 6/3/19 2:51 PM, Cedric Hombourger wrote:
> Debian package builds start with the installation of dependencies. In our case,
> they get installed into the buildchroot from either upstream package feeds or
> from the local package cache (aka base-apt) when ISAR_USE_CACHED_REPO is set.
> For the latter to work, /base-apt obviously needs to be bind mounted in the
> buildchroot. This was simply missing.

Applied to the 'next'.

Regards,
Maxim.

> Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>
> ---
>   meta/classes/buildchroot.bbclass | 8 ++++++++
>   1 file changed, 8 insertions(+)
> 
> diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass
> index ea1538a..b7a8ea5 100644
> --- a/meta/classes/buildchroot.bbclass
> +++ b/meta/classes/buildchroot.bbclass
> @@ -38,6 +38,14 @@ buildchroot_do_mounts() {
>               mount --rbind /sys '${BUILDCHROOT_DIR}/sys'
>           mount --make-rslave '${BUILDCHROOT_DIR}/sys'
>   
> +        # Mount base-apt if 'ISAR_USE_CACHED_BASE_REPO' is set
> +        if [ "${@repr(bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')))}" = 'True' ]
> +        then
> +            mkdir -p '${BUILDCHROOT_DIR}/base-apt'
> +            mountpoint -q '${BUILDCHROOT_DIR}/base-apt' || \
> +                mount --bind '${REPO_BASE_DIR}' '${BUILDCHROOT_DIR}/base-apt'
> +        fi
> +
>           # Refresh /etc/resolv.conf at this chance
>           cp -L /etc/resolv.conf '${BUILDCHROOT_DIR}/etc'
>           ) 9>'${MOUNT_LOCKFILE}'
>