From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6659727571892043776 X-Received: by 2002:a2e:9d09:: with SMTP id t9mr3327539lji.151.1558360118766; Mon, 20 May 2019 06:48:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:f70a:: with SMTP id z10ls334401lfe.6.gmail; Mon, 20 May 2019 06:48:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqwU/MIYFllvM0NcT2AdeJSgmBoZdmoORw9x94x3q1RD7WLKxNTav2KwZ/yDVPYZkc4OXiS9 X-Received: by 2002:a19:e20e:: with SMTP id z14mr14369537lfg.43.1558360118290; Mon, 20 May 2019 06:48:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558360118; cv=none; d=google.com; s=arc-20160816; b=Il2mv8acFhrsOe3amaA8pQSPkPrfTFgabwYPjaZtz+NBQYr6ELangHhqi2zZP6nft7 15i6WLs6X6mOR/uzk5hO8NHwd7SqDYx36KQBTzK4J8U7PdHsDal6+xo3Jf6Q/onUmRtg a7MKros4Z8IiQd8oytAIvTwIoFJFnXK1NX0BltwaUMKeIQCAX30sFk9wxqRFPs2kxv96 B9Ug9BvkadS5Zsn/qg1pTFrgGqbSXLw9Ss/Biaf83zQv6nGsjFcbe01446+IsspSiYzN z6z9n7QGbyCD43Ro0b4oGEaCEU3a/CrMOfqSbcN7BSuNCQGlPjGq3oaave9EHRVxdLLb Mndg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:organization:from:references:cc:to :subject; bh=ublpYMLDrVaYxitS83DOHQWm6X+1r8bTJTQjaEHQKbs=; b=KTrE1DxHzMorkyMwS3J0nwH3tKxtPL7z6HbLOOXTFdCO+sTqQqbRDcjVfkyoo2I+PN dQlQcThvqdZdXDp1wgp1uQGtRi66to5WCOTEPLWSH2JJC9piRTn+Lp8bplf6+vPC4sa1 3aQ4XifTrkqptuFHYhj+YdzRe21qBCTozwLZMSWsDp/iiI/XLqP6F23t8x9IiqzWYfWi Z2oiEJTHlEqqH+T5d7ebDZFUKZaZ/6AakEOUgFunxf8TZWbAXu5+bB4GQRRwwy7dKREa jRIDyKDY3jomxWTlMfEvSeYE98AR3dmryW0aIYVDPek+ZIcv0HCTTiufYgn6Kyn0PfYv GjPw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id p21si1774221ljj.1.2019.05.20.06.48.38 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 May 2019 06:48:38 -0700 (PDT) Received-SPF: pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of mosipov@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=mosipov@ilbers.de Received: from [192.168.1.3] (115.165-131-109.adsl-dyn.isp.belgacom.be [109.131.165.115] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id x4KDmZAs028327 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 20 May 2019 15:48:36 +0200 Subject: Re: [PATCHv3] dpkg-base: derive "Package" and "Architecture" from .deb in cleanup To: Henning Schild , isar-users Cc: Vladislav Jasek References: <20190221155634.20706-1-henning.schild@siemens.com> From: "Maxim Yu. Osipov" Organization: ilbers GmbH Message-ID: Date: Mon, 20 May 2019 15:48:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190221155634.20706-1-henning.schild@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: /PnzOvRWmnqe On 2/21/19 4:56 PM, 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 > was added to all the archs of the repo, and later cleaned only from one. > Now if that package changes because you are still working on the recipe, > adding the package again would cause checksum mismatches for all but the > current architecture. > Remove the package from all archs when arch is "all". Applied to the 'next'. Regards, Maxim. > Reported-by: Vladislav Jasek > Signed-off-by: Henning Schild > --- > meta/classes/dpkg-base.bbclass | 21 ++++++++++++++------- > 1 file changed, 14 insertions(+), 7 deletions(-) > > diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass > index 742b8ad..8fb7805 100644 > --- a/meta/classes/dpkg-base.bbclass > +++ b/meta/classes/dpkg-base.bbclass > @@ -98,13 +98,20 @@ 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} ) > + # removing "all" means no arch > + aarg="-A ${a}" > + [ "${a}" = "all" ] && aarg="" > + reprepro -b ${REPO_ISAR_DIR}/${DISTRO} \ > + --dbdir ${REPO_ISAR_DB_DIR}/${DISTRO} \ > + -C main ${aarg} \ > + remove ${DEBDISTRONAME} \ > + ${p} > + done > fi > } > > -- Maxim Osipov ilbers GmbH Maria-Merian-Str. 8 85521 Ottobrunn Germany +49 (151) 6517 6917 mosipov@ilbers.de http://ilbers.de/ Commercial register Munich, HRB 214197 General Manager: Baurzhan Ismagulov