Re: [PATCH 04/17] base-apt: add deb-src packages as well

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

There is a small section in the user-manual claiming that this does not
work, it needs to be removed in the next version of this commit.

Henning

On Mon, 28 Oct 2019 18:01:19 +0100
Henning Schild <henning.schild@siemens.com> wrote:

> From: Henning Schild <henning.schild@siemens.com>
> 
> So far the deb-src packages downloaded via "apt://" where not cached.
> This commit fixes that and includes those packages into the cache.
> 14230
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  meta/classes/base-apt-helper.bbclass       |  7 +++++++
>  meta/classes/image-cache-extension.bbclass |  4 ++++
>  meta/classes/repository.bbclass            | 14 ++++++++++++++
>  3 files changed, 25 insertions(+)
> 
> diff --git a/meta/classes/base-apt-helper.bbclass
> b/meta/classes/base-apt-helper.bbclass index 567eaea..3013edf 100644
> --- a/meta/classes/base-apt-helper.bbclass
> +++ b/meta/classes/base-apt-helper.bbclass
> @@ -52,4 +52,11 @@ populate_base_apt() {
>              "${BASE_DISTRO_CODENAME}" \
>              "${package}"
>      done
> +
> +    find $search_dir -name '*.dsc' | while read package; do
> +        repo_add_srcpackage "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \
> +            "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" \
> +            "${BASE_DISTRO_CODENAME}" \
> +            "${package}"
> +    done
>  }
> diff --git a/meta/classes/image-cache-extension.bbclass
> b/meta/classes/image-cache-extension.bbclass index 30db549..f8b9ba3
> 100644 --- a/meta/classes/image-cache-extension.bbclass
> +++ b/meta/classes/image-cache-extension.bbclass
> @@ -32,5 +32,9 @@ do_cache_base_repo() {
>      if [ -d ${BUILDCHROOT_TARGET_DIR}/var/cache/apt ]; then
>          populate_base_apt ${BUILDCHROOT_TARGET_DIR}/var/cache/apt
>      fi
> +
> +    if [ -d "${DEBSRCDIR}"/"${DISTRO}" ]; then
> +        populate_base_apt "${DEBSRCDIR}"/"${DISTRO}"
> +    fi
>  }
>  addtask cache_base_repo after do_rootfs do_install_imager_deps
> diff --git a/meta/classes/repository.bbclass
> b/meta/classes/repository.bbclass index afd3aed..22d1f93 100644
> --- a/meta/classes/repository.bbclass
> +++ b/meta/classes/repository.bbclass
> @@ -30,6 +30,20 @@ EOF
>      fi
>  }
>  
> +repo_add_srcpackage() {
> +    dir="$1"
> +    dbdir="$2"
> +    codename="$3"
> +    shift; shift; shift
> +
> +    if [ -n "${GNUPGHOME}" ]; then
> +        export GNUPGHOME="${GNUPGHOME}"
> +    fi
> +    reprepro -b "${dir}" --dbdir "${dbdir}" -C main -P source \
> +        includedsc "${codename}" \
> +        "$@"
> +}
> +
>  repo_add_packages() {
>      dir="$1"
>      dbdir="$2"