Re: [PATCH v2 01/10] base-apt: Add helper class

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

Am Thu, 11 Oct 2018 18:52:56 +0200
schrieb "Maxim Yu. Osipov" <mosipov@ilbers.de>:

> From: Alexander Smirnov <asmirnov@ilbers.de>
> 
> base-apt intended to store original upstream debs to re-use them
> later offline. This class helps to populate base-apt with the packages
> used during build.
> 
> Signed-off-by: Alexander Smirnov <asmirnov@ilbers.de>
> Reviewed-by: Claudius Heine <ch@denx.de>
> Signed-off-by: Maxim Yu. Osipov <mosipov@ilbers.de>
> ---
>  meta-isar/conf/layer.conf            |  4 +++
>  meta/classes/base-apt-helper.bbclass | 54
> ++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+)
>  create mode 100644 meta/classes/base-apt-helper.bbclass
> 
> diff --git a/meta-isar/conf/layer.conf b/meta-isar/conf/layer.conf
> index cd42f06..22b2ff2 100644
> --- a/meta-isar/conf/layer.conf
> +++ b/meta-isar/conf/layer.conf
> @@ -25,3 +25,7 @@ DEPLOY_DIR_APT ?= "${DEPLOY_DIR}/apt"
>  
>  # Path to the Isar databases used by `reprepro`
>  DEPLOY_DIR_DB ?= "${DEPLOY_DIR}/db"
> +
> +# Base apt repository paths
> +REPO_BASE_DIR ?= "${DEPLOY_DIR}/base-apt/apt"
> +REPO_BASE_DB_DIR ?= "${DEPLOY_DIR}/base-apt/db"
> diff --git a/meta/classes/base-apt-helper.bbclass
> b/meta/classes/base-apt-helper.bbclass new file mode 100644
> index 0000000..9c03a7e
> --- /dev/null
> +++ b/meta/classes/base-apt-helper.bbclass
> @@ -0,0 +1,54 @@
> +# This software is a part of ISAR.
> +# Copyright (C) 2018 ilbers GmbH
> +
> +DISTRO_NAME ?= "${@ d.getVar('DISTRO', True).split('-')[0]}"
> +DISTRO_SUITE ?= "${@ d.getVar('DISTRO', True).split('-')[1]}"
> +
> +populate_base_apt() {
> +    search_dir=$1
> +
> +    find $search_dir -name '*.deb' | while read package; do
> +        # NOTE: due to packages stored by reprepro are not modified,
> we can
> +        # use search by filename to check if package is already in
> repo. In
> +        # addition, m5sums could be compared to ensure, that package
> is the
> +        # same and should not be overwritten. This method is easier
> and more
> +        # robust than querying reprepro by name.
> +
> +        # Check if this package is taken from Isar-apt, if so -
> ingore it.
> +        base_name=${package##*/}
> +        isar_package=$(find ${DEPLOY_DIR_APT}/${DISTRO} -name
> $base_name)
> +        if [ -n "$isar_package" ]; then
> +            # Check if MD5 sums are identical. This helps to avoid
> the case
> +            # when packages is overridden from another repo.
> +            md1=$(md5sum $package | cut -d ' ' -f 1)
> +            md2=$(md5sum $isar_package | cut -d ' ' -f 1)
> +            if [ "$md1" = "$md2" ]; then
> +                continue
> +            fi

This block should maybe be a function we reuse ...

> +        fi
> +
> +        # Check if this package is already in base-apt
> +        isar_package=$(find ${REPO_BASE_DIR}/${DISTRO_NAME} -name
> $base_name)
> +        if [ -n "$isar_package" ]; then
> +            md1=$(md5sum $package | cut -d ' ' -f 1)
> +            md2=$(md5sum $isar_package | cut -d ' ' -f 1)
> +            if [ "$md1" = "$md2" ]; then
> +                continue
> +            fi

here.

Henning

> +            # md5sum differs, so remove the package from base-apt
> +            name=$($base_name | cut -d '_' -f 1)
> +            reprepro -b ${REPO_BASE_DIR}/${DISTRO_NAME} \
> +                     --dbdir ${REPO_BASE_DB_DIR}/${DISTRO_NAME} \
> +                     -C main -A ${DISTRO_ARCH} \
> +                     remove ${DISTRO_SUITE} \
> +                     $name
> +        fi
> +
> +        reprepro -b ${REPO_BASE_DIR}/${DISTRO_NAME} \
> +                 --dbdir ${REPO_BASE_DB_DIR}/${DISTRO_NAME} \
> +                 -C main \
> +                 includedeb ${DISTRO_SUITE} \
> +                 $package
> +    done
> +}