From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6659727571892043776 X-Received: by 2002:a5d:6b10:: with SMTP id v16mr5232836wrw.294.1555503263149; Wed, 17 Apr 2019 05:14:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:53cb:: with SMTP id a11ls4539955wrw.0.gmail; Wed, 17 Apr 2019 05:14:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqzsE4oZaGJuConCKGTlhiv1kZ/W5X4zVdUANzI/MlMNkzkxwLfWMoWmLjOIk1qyFzfoQ8Iw X-Received: by 2002:adf:e50d:: with SMTP id j13mr60025330wrm.165.1555503262705; Wed, 17 Apr 2019 05:14:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555503262; cv=none; d=google.com; s=arc-20160816; b=TokpJdKkkThKrtz2njeIzUUnyrhyDuWEhdQZ6QSSHX4fYiNR5Vm5AyiTxDaTCQf9py Y1+QwkC8FaeozbeL3uANbwNpkTAd15A0fZknSV1TeFixQY0rvtFzys7yBHa7WVoPJ//b 0wkaEc81USWFnVDiV8QEDpf5ReX8pVl9bZj26kAxmQpyU4umtxXyod5yg1ipJgn8dPIt otacoTdMqm31puZlIPooOHPNc+S7dWrlktUu1m3jvqs3XvNej3J20PNkyKIU83t7WYwW Sxn4cTKX4kquum7kbN7jGZ5I2HEDQilnq7V/B1m1O1+OL71ENcKE1kuUiYj9D+GCevIl sA4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:to:from:date; bh=t29O1YxfakakPHH/jNmEMt7L30AySpKuAXbwwY1TFck=; b=lEiUwQefoEXi0gboKQl01jicstUP8FmmdZA+Vny5oM6lDFel8I8jL/opZNuIUAKr6V Q9DsQMnk2weKtHPeRRrefJoDu2fVoXeAaSfhTbEAnnbudtmKyIKkPsViSbXFAeWGccEy xa7hvvgKSjgV4qSdrnyViM7f+cW0tO7SumOL5YF17D7CflXFKjPONokdhMCJZSyDgE/Z 53nleXlVx7uW9YhhYs8RR6qTwJ8yG0JOpqKozDDXwRryGDKjin6eM+pxHV4PFXDNG5gg RdibvYs59OcG+3EWQAZq6TVtOK8U1lDc9AnzbaSAY8ejAyS5HuGPz+g5PNx13lDqlgZS zsYw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 85.214.156.166 is neither permitted nor denied by best guess record for domain of ibr@radix50.net) smtp.mailfrom=ibr@radix50.net Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id k15si2929948wrq.1.2019.04.17.05.14.22 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Apr 2019 05:14:22 -0700 (PDT) Received-SPF: neutral (google.com: 85.214.156.166 is neither permitted nor denied by best guess record for domain of ibr@radix50.net) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 85.214.156.166 is neither permitted nor denied by best guess record for domain of ibr@radix50.net) smtp.mailfrom=ibr@radix50.net Received: from yssyq.m.ilbers.de (dslb-084-061-174-254.084.061.pools.vodafone-ip.de [84.61.174.254]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id x3HCEDhK005350 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 17 Apr 2019 14:14:20 +0200 Date: Wed, 17 Apr 2019 14:14:08 +0200 From: Baurzhan Ismagulov To: isar-users Subject: Re: [PATCHv3] dpkg-base: derive "Package" and "Architecture" from .deb in cleanup Message-ID: <20190417121408.GA21981@yssyq.m.ilbers.de> Mail-Followup-To: isar-users References: <20190221155634.20706-1-henning.schild@siemens.com> <20190328110328.GG1437@yssyq.m.ilbers.de> <20190328185056.61434442@md1za8fc.ad001.siemens.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="XOIedfhf+7KOe/yw" Content-Disposition: inline In-Reply-To: <20190328185056.61434442@md1za8fc.ad001.siemens.net> User-Agent: Mutt/1.10.1 (2018-07-13) 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: wXOKyek66tkf --XOIedfhf+7KOe/yw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Mar 28, 2019 at 06:50:56PM +0100, Henning Schild wrote: > A deployment of "all" will not deploy one .deb of arch "all" but it > will deploy n .debs of all the archs enabled in the repo. > So on deploy of "all" from arm into a "arm, arm64, x86" repo you will > get three copies. The next deploy from x86 will write all three again, > same for arm64. But they are all the same and just get written 3 times. Ok, I was able to reproduce the problem using the attached patch. In short, your patch looks good for me. We don't have a further problem of multiple identical files in isar-apt. Maxim will run the usual tests with your patch. Documenting the findings (please comment if anything is wrong): * I had to bitbake multiconfig:qemuamd64-stretch:isar-image-base, then bitbake multiconfig:qemuamd64-stretch:isar-image-base (thus the question about multiconfig -- or how can one trigger repo_clean manually?). The second one fails with various problems: ERROR: 'tmp/work/debian-stretch-amd64/abicheck-1.2-r0/abicheck-1.2/../abicheck_1.2-99+isar_all.deb' cannot be included as 'pool/main/a/abicheck/abicheck_1.2-99+isar_all.deb'. Already existing files can only be included again, if they are the same, but: md5 expected: 21747ce983869443d240a136c4b4e8a9, got: 742593776ebae9c55f7f5a7eef0758d2 This seems to be the cleanup problem you are addressing. * After building, the files are: tmp/work/debian-stretch-amd64/abicheck-1.2-r0/abicheck_1.2-99+isar_all.deb tmp/work/debian-stretch-i386/abicheck-1.2-r0/abicheck_1.2-99+isar_all.deb tmp/deploy/isar-apt/apt/debian-stretch/pool/main/a/abicheck/abicheck_1.2-99+isar_all.deb The files are built n times in tmp/work and added to isar-apt n times. The package is present in isar-apt only once (and not n times, as I interpreted from the problem description, so we don't have a problem of multiple abicheck_1.2-99+isar_all.deb files in isar-apt, only in binary-{amd64,i386,etc.}/Packages.*). reprepro fails adding the package with a different checksum. * Isar removes packages from isar-apt per-arch, to preserve previously built artifacts. But _all.debs must be removed from all Packages indexes. Your patch adds special handling for _all.debs, removing them from all binary-{amd64,i386,etc.}/Packages.*. * Also, example-raw, hello-isar, and enable-fsck fail with the following: DEBUG: Executing shell function do_install_builddeps ... dh_compress dh_compress: Cannot resolve (unreachable)/hello-isar-0.3-a18c14c/equivs.brSwev/debian/hello-isar-build-deps: No such file or directory debian/rules:20: recipe for target 'binary-indep' failed make: *** [binary-indep] Error 2 Error in the build process: exit status 2 dpkg: error: cannot access archive 'hello-isar-build-deps_0.3_amd64.deb': No such file or directory I haven't looked into that, have you encountered anything like that? With kind regards, Baurzhan. --XOIedfhf+7KOe/yw Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-Add-abicheck.patch" >>From 294039a7051a7649ad347d114e75d16f921dcf67 Mon Sep 17 00:00:00 2001 From: Baurzhan Ismagulov Date: Wed, 17 Apr 2019 11:44:06 +0200 Subject: [PATCH] Add abicheck --- meta-isar/conf/local.conf.sample | 5 ++++- meta-isar/recipes-app/abicheck/abicheck_1.2.bb | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 meta-isar/recipes-app/abicheck/abicheck_1.2.bb diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 86e2384..5b1d638 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -159,7 +159,10 @@ CONF_VERSION = "1" # # The default list of extra packages to be installed. -IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsck" +IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} \ + enable-fsck \ + abicheck \ +" # # Enable cross-compilation support diff --git a/meta-isar/recipes-app/abicheck/abicheck_1.2.bb b/meta-isar/recipes-app/abicheck/abicheck_1.2.bb new file mode 100644 index 0000000..af08a0c --- /dev/null +++ b/meta-isar/recipes-app/abicheck/abicheck_1.2.bb @@ -0,0 +1,22 @@ +# This software is a part of ISAR. +# Copyright (C) 2019 ilbers GmbH +# +# SPDX-License-Identifier: MIT + +inherit dpkg + +# this will fetch and unpack the sources from upstream debian +SRC_URI = "apt://${PN}=1.2-5" + +MAINTAINER = "isar-users " +CHANGELOG_V = "1.2-99+isar" + +do_prepare_build() { + deb_add_changelog +} + +dpkg_runbuild_prepend() { + if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then + export DEB_BUILD_OPTIONS="nocheck" + fi +} -- 2.11.0 --XOIedfhf+7KOe/yw--