Re: [PATCHv4 22/26] meta: deb-dl-dir: do not cache debs from isar-apt

[Jan Kiszka <jan.kiszka@siemens.com>]

On 31.01.20 15:29, [ext] Henning Schild wrote:
> From: Henning Schild <henning.schild@siemens.com>
> 
> Packages from isar-apt are not downloaded from the outside and should
> not be cached.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>   meta/classes/deb-dl-dir.bbclass | 14 ++++++++++----
>   1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass
> index ab4b1f09..f9699603 100644
> --- a/meta/classes/deb-dl-dir.bbclass
> +++ b/meta/classes/deb-dl-dir.bbclass
> @@ -3,8 +3,10 @@
>   #
>   # SPDX-License-Identifier: MIT
>   
> +inherit repository
> +
>   deb_dl_dir_import() {
> -    export pc="${DEBDIR}/${DISTRO}"
> +    export pc="${DEBDIR}/${DISTRO}/"
>       export rootfs="${1}"
>       [ ! -d "${pc}" ] && return 0
>       flock -s "${pc}".lock -c ' \
> @@ -14,12 +16,16 @@ deb_dl_dir_import() {
>   }
>   
>   deb_dl_dir_export() {
> -    export pc="${DEBDIR}/${DISTRO}"
> +    export pc="${DEBDIR}/${DISTRO}/"
>       export rootfs="${1}"
>       mkdir -p "${pc}"
>       flock "${pc}".lock -c ' \
> -        sudo find "${rootfs}"/var/cache/apt/archives/ -type f -iname '*\.deb' \
> -            -exec cp -f '{}' "${pc}" \;
> +        find "${rootfs}"/var/cache/apt/archives/ -type f -iname '*\.deb' |\
> +        while read p; do
> +             repo_contains_package "${REPO_ISAR_DIR}"/"${DISTRO}" "${p}" && \

repo_contains_package may not be found inside the flock shell context, 
as Bao Cheng noticed out. He suggests the pattern

(flock 8
  ...
) 8>${LOCKFILE}

Bao Check, maybe you can describe how you noticed.

Jan

> +                 continue
> +             sudo cp -f "${p}" "${pc}"
> +        done
>           sudo chown -R $(id -u):$(id -g) "${pc}"
>       '
>   }
> 

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux