public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Henning Schild <henning.schild@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Cc: Vladislav Jasek <vladislav.jasek@siemens.com>
Subject: Re: [PATCHv2] dpkg-base: derive "Package" and "Architecture" from .deb in cleanup
Date: Thu, 21 Feb 2019 16:04:00 +0100	[thread overview]
Message-ID: <20190221160400.6a3285ac@md1za8fc.ad001.siemens.net> (raw)
In-Reply-To: <20190219150520.6440-1-henning.schild@siemens.com>

Please do not merge. I did not actually test this with an actuall "all"
package and just got some feedback that i need to parse/understand.

Henning

Am Tue, 19 Feb 2019 16:05:20 +0100
schrieb Henning Schild <henning.schild@siemens.com>:

> From: Henning Schild <henning.schild@siemens.com>
> 
> Instead of using "sed" pattern magic ask the .debs their name and
> architecture and remove exactly that. Especially the hardcoded
> Architecture caused problems for packages of architecture "all". If
> your recipe created such a package it could never be cleaned because
> it simply was not in the arch we expected it in. And now in a rebuild
> we can not add an updated version of the "all" deb.
> 
> Reported-by: Vladislav Jasek <vladislav.jasek@siemens.com>
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  meta/classes/dpkg-base.bbclass | 18 +++++++++++-------
>  1 file changed, 11 insertions(+), 7 deletions(-)
> 
> diff --git a/meta/classes/dpkg-base.bbclass
> b/meta/classes/dpkg-base.bbclass index 742b8ad..0f70f1d 100644
> --- a/meta/classes/dpkg-base.bbclass
> +++ b/meta/classes/dpkg-base.bbclass
> @@ -98,13 +98,17 @@ do_build() {
>  CLEANFUNCS += "repo_clean"
>  
>  repo_clean() {
> -    PACKAGES=$(cd ${S}/..; ls *.deb | sed 's/\([^_]*\).*/\1/')
> -    if [ -n "${PACKAGES}" ]; then
> -        reprepro -b ${REPO_ISAR_DIR}/${DISTRO} \
> -                 --dbdir ${REPO_ISAR_DB_DIR}/${DISTRO} \
> -                 -C main -A ${DISTRO_ARCH} \
> -                 remove ${DEBDISTRONAME} \
> -                 ${PACKAGES}
> +    DEBS=$( ls ${S}/../*.deb )
> +    if [ -n "${DEBS}" ]; then
> +        for d in ${DEBS}; do
> +            p=$( dpkg-deb --show --showformat '${Package}' ${d} )
> +            a=$( dpkg-deb --show --showformat '${Architecture}'
> ${d} )
> +            reprepro -b ${REPO_ISAR_DIR}/${DISTRO} \
> +                     --dbdir ${REPO_ISAR_DB_DIR}/${DISTRO} \
> +                     -C main -A ${a} \
> +                     remove ${DEBDISTRONAME} \
> +                     ${p}
> +        done
>      fi
>  }
>  


      parent reply	other threads:[~2019-02-21 15:04 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-19 15:05 Henning Schild
2019-02-19 15:08 ` Henning Schild
2019-02-21 15:04 ` Henning Schild [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190221160400.6a3285ac@md1za8fc.ad001.siemens.net \
    --to=henning.schild@siemens.com \
    --cc=isar-users@googlegroups.com \
    --cc=vladislav.jasek@siemens.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox