From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6458972999552860160 X-Received: by 10.46.5.76 with SMTP id 73mr91787ljf.24.1503934352374; Mon, 28 Aug 2017 08:32:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.84.87 with SMTP id y23ls57113ljd.32.gmail; Mon, 28 Aug 2017 08:32:31 -0700 (PDT) X-Google-Smtp-Source: ADKCNb78ZapRQwpbOtqLaLSGbiAMm8f/Cf6Opor6At7G6wLSIjJMOTf9Dx7aO14yDk9zp/lzITeV X-Received: by 10.25.16.77 with SMTP id f74mr82880lfi.42.1503934351972; Mon, 28 Aug 2017 08:32:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503934351; cv=none; d=google.com; s=arc-20160816; b=z5hqGNSNcXfDw6eQK9iNqgWmDfX/UVM5VTsvh+r3//mar9WCsshCBmXXUbYQ/7JoJn gKkTscoBceymjRf503zhXj32X1itAzn95bp+INTu+9utg0+V8874OKORIAXsgQcpxmd0 cWKtKMMdueufwdKGUkvbU91T1NR+25OvX8v0eVxrLRP608ZtMKvgdi6a9WjJ52uVyy0r X/IlLyiHf5eujt4uSwGL4gFgHBKnKwikoFvGoRbA3pbRH3hEe+/RdlFMetwoVD1O+8Q5 Q2LoVDu0/wwjdqP+RBMBlRWalcPe7otIFy70WmG+YPTFpPLj80Tyk9wp9g3tqoMiVhiN uiRA== 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:arc-authentication-results; bh=lIfW+LDAU6Jty/LUFMUoiSdfCJrX0B9/OtH+x8qnWcs=; b=eF6CqiPtWe2Z8uIqCaTDDH8ptwVT4zoFt4MtMPZwmf/35du9H430XX9H9wkqQB++00 /lJHAd45KZ2vRq5wgP7/teJLu06CW3dyOLK7KANOpLYqbdmNTFRnc++bGaomc/qDfNhL deCt/mN2rvcZt0onHZ/CK7Iqcnbn2zztV7QofidzdbNFbkjhAHHz387wqR+oa1lCN0GF OY9KZp0CML2P51oWyNfABwQtZamBQNXSOozvnaeGHp0z8LNKSVWuhcSfEXHOlffeUZB+ 2n8fUJNwyA0Shc7HcpGEaWitHY29Wb4noySLQr1hcKF4uDxaSJCxz/xqLonI3yYk6ezB dwXQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id c83si58337wmd.6.2017.08.28.08.32.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Aug 2017 08:32:31 -0700 (PDT) Received-SPF: neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 192.35.17.28 is neither permitted nor denied by best guess record for domain of henning.schild@siemens.com) smtp.mailfrom=henning.schild@siemens.com Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id v7SFWUBh020299 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 28 Aug 2017 17:32:30 +0200 Received: from md1em3qc ([139.25.68.40]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id v7SFWUFx008161; Mon, 28 Aug 2017 17:32:30 +0200 Date: Mon, 28 Aug 2017 17:32:33 +0200 From: Henning Schild To: Alexander Smirnov Cc: , Frank Lenormand Subject: Re: [PATCH 5/6] classes/dpkg: Properly update packages in the cache Message-ID: <20170828173233.010d4b0b@md1em3qc> In-Reply-To: <20170827151339.12806-6-asmirnov@ilbers.de> References: <20170827151339.12806-1-asmirnov@ilbers.de> <20170827151339.12806-6-asmirnov@ilbers.de> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.31; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: HHV9uTOYJp3I This is another fixup of 1/6, fold it in. Henning Am Sun, 27 Aug 2017 18:13:38 +0300 schrieb Alexander Smirnov : > From: Frank Lenormand > > Before installing to cache, existing packages with the same name and > version have to be removed. > > Signed-off-by: Frank Lenormand > Signed-off-by: Alexander Smirnov > --- > meta/classes/dpkg.bbclass | 46 > +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 > insertions(+), 3 deletions(-) > > diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass > index 118ba2f..72ae79f 100644 > --- a/meta/classes/dpkg.bbclass > +++ b/meta/classes/dpkg.bbclass > @@ -84,12 +84,52 @@ do_install_to_cache() { > > "${DIR_CACHE}/conf/distributions" > fi > > + print_field_value() { > + awk "\$1 == \"${1}:\" { print \$2; }" > + } > + > + call_reprepro() { > + reprepro --waitforlock 3 -b "${DIR_CACHE}" --dbdir > "${DIR_DB}" \ > + -C main "$@" > + } > + > # Add binary and source packages to the deb cache > # If the cache doesn't exist yet, it will be created using the > # `distributions` file generated above. > - ls -1 "${BUILDROOT}"/*.deb "${BUILDROOT}"/*.dsc | while read -r > p; do > - reprepro --waitforlock 3 -b "${DIR_CACHE}" --dbdir > "${DIR_DB}" \ > - -C main "include${p##*.}" "${DEBDISTRONAME}" "${p}" > + ls -1 "${BUILDROOT}"/*.deb | while read -r p; do > + name_package=$(dpkg -f "${p}" | print_field_value "Package") > + version_package=$(dpkg -f "${p}" | print_field_value > "Version") + > + # Remove all packages with the same version that were added > to the > + # repository in previous builds > + call_reprepro \ > + -A "${DISTRO_ARCH}" \ > + removefilter "${DEBDISTRONAME}" \ > + "Package (== ${name_package}), \ > + Version (== ${version_package})" > + call_reprepro \ > + -A "${DISTRO_ARCH}" \ > + "include${p##*.}" \ > + "${DEBDISTRONAME}" \ > + "${p}" > + done > + > + ls -1 "${BUILDROOT}"/*.dsc | while read -r p; do > + name_package=$(cat "${p}" | print_field_value "Source") > + version_package=$(cat "${p}" | print_field_value "Version") > + > + # Remove all source packages with the same version that were > added to > + # the repository in previous builds > + call_reprepro \ > + -A "source" \ > + removefilter "${DEBDISTRONAME}" \ > + "Package (== ${name_package}), \ > + Version (== ${version_package})" > + call_reprepro \ > + -A "source" \ > + "include${p##*.}" \ > + "${DEBDISTRONAME}" \ > + "${p}" > done > } >