From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6659727571892043776 X-Received: by 2002:a50:aa70:: with SMTP id p45mr2495685edc.6.1550588905985; Tue, 19 Feb 2019 07:08:25 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:9257:: with SMTP id c23ls881200ejx.2.gmail; Tue, 19 Feb 2019 07:08:25 -0800 (PST) X-Google-Smtp-Source: AHgI3IZrC0JCnBnBt7EkwpcRaSh3fs+4HUCyGyt6f65roHwA9PRX4j685gh54/WNzkZCFzhnbKmi X-Received: by 2002:a17:906:9701:: with SMTP id k1mr2539969ejx.13.1550588905716; Tue, 19 Feb 2019 07:08:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550588905; cv=none; d=google.com; s=arc-20160816; b=I8Cex9gWIIS+l8dLSjl+oa6oYv9STlSoVufrF/fOn6yuunV1k0AYb7wMGugoPqkijj gdjjWrm6+AuoxWwjA0xRIww0x9g8LhcvoLYoL6nO1MG0KckhmdJZr/kNyeYvTbOPdZsD W9o4/Z7GTrKVdDhTbRukle8e9g64GpD1C9xgaa78KVQcFLwGraxvbbyYYRvmoGKc/M7u DHs0UN4r372C3wCT6QRl/S7zQn4RR5KIYLkWs+5EuxOysjrkiai4NJeq7A2BI69/mrrU mgwMIs5ZZ3bj+du7uosIjy4uPCZnhkNrvCPNAtht7fE2PQHT9s/sRR3554CdiBR0XMAW oVXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=10WM/xbXOA67MXQcTdbNvviav/ceJIeVtDlnshGYcnc=; b=WSi41HO8e33D6BcDWqwNZwtMAnBMDD8i524AE08fZUQM+zsUIdC8Sh8qCEPQGlvLlC xPWD7/x57svPi/f2TwAt3cSyGz6dp5+vUkTiFcmMP3BQIm1HpYzgEfaVC0kWdcD+Hf4I A41qB+qjqbw8ax65wwkKIiaS2gUEejQjuTf6s0vFvvYJcpEyTRBpCOBoqVsNqiBAbjNH gFKHFwuTtPmJYz69Llcqr3agLl++dj/u+vMImYnpy4kzUfNjiGAtXrOnFzz0Ro0/DKWV 9DXmBT3860kRg0TTCwM/RAs/EIO+DtcOA2btzoPZ5jgSlZ+FVU5wT85Y8ufUUhBYiV8S JnEQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id a12si818192edn.5.2019.02.19.07.08.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Feb 2019 07:08:25 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x1JF8P5b027393 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 19 Feb 2019 16:08:25 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.68.200]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x1JF8MAq001412; Tue, 19 Feb 2019 16:08:22 +0100 Date: Tue, 19 Feb 2019 16:08:21 +0100 From: Henning Schild To: isar-users Cc: Vladislav Jasek Subject: Re: [PATCHv2] dpkg-base: derive "Package" and "Architecture" from .deb in cleanup Message-ID: <20190219160821.3a0be9a2@md1za8fc.ad001.siemens.net> In-Reply-To: <20190219150520.6440-1-henning.schild@siemens.com> References: <20190219150520.6440-1-henning.schild@siemens.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: EVlIchuWRNl8 Changes to v1 are whitespace/indent corrections, otherwise it is the same. I guess we should have our own hello example and its lib have an "all" and an "any" example, "any" will become interesting for cross. And if we already had an "all" package before, we would have found that issue earlier. Henning On Tue, 19 Feb 2019 16:05:20 +0100 Henning Schild wrote: > From: Henning Schild > > 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 > Signed-off-by: Henning Schild > --- > 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 > } >