Re: [PATCH 1/9] base-apt: Add helper class

[Claudius Heine <claudius.heine.ext@siemens.com>]

Hi Maxim,

On 10/2/18 2:18 PM, Maxim Yu. Osipov wrote:
> 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>
> ---
>   meta/classes/base-apt-helper.bbclass | 53 ++++++++++++++++++++++++++++++++++++
>   1 file changed, 53 insertions(+)
>   create mode 100644 meta/classes/base-apt-helper.bbclass
> 
> diff --git a/meta/classes/base-apt-helper.bbclass b/meta/classes/base-apt-helper.bbclass
> new file mode 100644
> index 0000000..5e3fe36
> --- /dev/null
> +++ b/meta/classes/base-apt-helper.bbclass
> @@ -0,0 +1,53 @@
> +# 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
> +
> +    for package in $(find $search_dir -name '*.deb'); do

   find ... | while read package; do

or

   while read package; do ...; done <<< $(find ...)

is better performance wise since the loop is iterated as results come in.

> +        # 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.
> +        isar_package=$(find ${DEPLOY_DIR_APT}/${DISTRO} -name $package)

Don't you need a `${package##*/}` here to remove the leading path?

> +        if [ -n "$isar_package" ]; then
> +            # Check if MD5 sums are iendtical. This helps to avoid the case

identical

> +            # when packages is overriden from another repo.

overridden

> +            md1=$(md5sum $package)
> +            md2=$(md5sum $isar_package)

md5sum produces output with like this:

     $ md5sum conf/local.conf
     c543793c1df3b1f45a5555d92b6f3ee2  conf/local.conf

So you need to remove that before comparing. The same issues are in the 
following code as well.

Cheers,
Claudius

> +            if [ "$md1" = "$md2" ]; then
> +                continue
> +            fi
> +        fi
> +
> +        # Check if this package is already in base-apt
> +        isar_package=$(find ${BASE_APT_DIR}/${DISTRO_NAME} -name $package)
> +        if [ -n "$isar_package" ]; then
> +            md1=$(md5sum $package)
> +            md2=$(md5sum $isar_package)
> +            if [ "$md1" = "$md2" ]; then
> +                continue
> +            fi
> +
> +            # md5sum differs, so remove the package from base-apt
> +            name=$(basename $package | cut -d '_' -f 1)
> +            reprepro -b ${BASE_APT_DIR}/${DISTRO_NAME} \
> +                     --dbdir ${BASE_APT_DB}/${DISTRO_NAME} \
> +                     -C main -A ${DISTRO_ARCH} \
> +                     remove ${DISTRO_SUITE} \
> +                     $name
> +        fi
> +
> +        reprepro -b ${BASE_APT_DIR}/${DISTRO_NAME} \
> +                 --dbdir ${BASE_APT_DB}/${DISTRO_NAME} \
> +                 -C main \
> +                 includedeb ${DISTRO_SUITE} \
> +                 $package
> +    done
> +}
> 

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de