Re: [PATCH 1/3] image: fix do_populate package-name assumption

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

These patches are currently being build by CI, you know which branch
and how to find it. Just as a sidenote, from now on all of the patches
i post will have gone through CI or are currently running.

Henning

Am Fri, 8 Dec 2017 19:30:02 +0100
schrieb Henning Schild <henning.schild@siemens.com>:

> do_populate assumes that every item in IMAGE_INSTALL will produce
> .deb-files with the name ${PN}_*.deb. But that assumption might not
> be correct for every recipe.
> One example could be a kernel-recipe where you get "linux-image",
> "linux-headers", "linux-firmware-image". Another example could be a
> recipe that just fetches a few .debs from somewhere and never even
> creates a ${PN}_*.deb.
> Instead of looping over IMAGE_INSTALL and calling reprepro multiple
> times, just call it once on all the .debs we find in DEPLOY_DIR_DEB.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  meta/classes/image.bbclass | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index 2c2bafc..b37358e 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -71,13 +71,11 @@ do_populate[stamp-extra-info] =
> "${DISTRO}-${MACHINE}" # Populate Isar apt repository by newly built
> packages do_populate() {
>      if [ -n "${IMAGE_INSTALL}" ]; then
> -        for p in ${IMAGE_INSTALL}; do
> -            call_reprepro -b ${DEPLOY_DIR_APT}/${DISTRO} \
> -                          --dbdir ${DEPLOY_DIR_DB}/${DISTRO} \
> -                          -C main \
> -                          includedeb ${DEBDISTRONAME} \
> -                          ${DEPLOY_DIR_DEB}/${p}_*.deb
> -        done
> +        call_reprepro -b ${DEPLOY_DIR_APT}/${DISTRO} \
> +                      --dbdir ${DEPLOY_DIR_DB}/${DISTRO} \
> +                      -C main \
> +                      includedeb ${DEBDISTRONAME} \
> +                      ${DEPLOY_DIR_DEB}/*.deb
>      fi
>  }
>