From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a17:906:229b:: with SMTP id p27mr22631373eja.21.1580754424325; Mon, 03 Feb 2020 10:27:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:405c:: with SMTP id ns20ls3960878ejb.3.gmail; Mon, 03 Feb 2020 10:27:03 -0800 (PST) X-Google-Smtp-Source: APXvYqw7MAGIJNF6AzCWY+es2k4nXazcA8z6HbyoEkPEfLqvpdAa0dvKMx7D5fjTtUxCB9q71SHW X-Received: by 2002:a17:906:538c:: with SMTP id g12mr22154493ejo.348.1580754423547; Mon, 03 Feb 2020 10:27:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580754423; cv=none; d=google.com; s=arc-20160816; b=Cyn5KssjA7Wddo3KwPqbXoiPKHajcnIRumhCVC+rnLINoNR2AoWK42duOAW4B/EPZj U/9/Ri3mU8gAPtsqeFn8CD/eLEnv/iUxtB8S/8hpdwmH3svpgP1yls1BOL2F9CSdxOwv ksm6P6rqIX5fIpYvove3rbSUkswjiK414nHh5AjksMAMgKv/HU7iJkQLRj8e+2r3Ju5R 72OPke6y/3AIgxinDBTV1ZWRrJq2AoMvdWiWMWVVgWVuxZ2SFFqOhScBeOqXPK5sXSy1 2he4SpS5wm6GzZJ+MjWDF/8hh+J7vgAKANp4tTJk4pkMMgSZLgZ07ybemE2jIsFU1wIn c74w== 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=eUinDIAG+ZnTrI1VVE2Y38wnbIy9K9p0V9TOa+Cbftw=; b=IhP8Q5sE1eI4BzChMzZgV3gK3qANfn1pDmOICeHAfmG0UULzhqVEunl0Lohac0IBfA Lszv2/umBX9fgWKT7e7Ii005H/V6/4NjqcB2DypaiYkuU+rPn0zAjouxLXQW8TW1vd8A wF2PU4o7W2Mhplh3rmcchwjuqBpwoZf1Z9xPRBBIyhSJhsJX+w4+IooIeFZRcrIEUDEU wa6Oy092JsKsAD33I+z4yAhA7wTkALy2L0hLslbVrFYlwOWXWnt+Bl21HeAzd80DsjkD 18sCQSnyrXIYAbe8evMTVOUzqun85GFVf6clEzR8RJ3AAwIHWncMicTrBKeqB7O0HJjm TkBA== 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id z20si762667ejx.1.2020.02.03.10.27.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Feb 2020 10:27:03 -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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 013IR21h006398 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 3 Feb 2020 19:27:02 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.193]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 013IR20f026834; Mon, 3 Feb 2020 19:27:02 +0100 Date: Mon, 3 Feb 2020 19:27:01 +0100 From: Henning Schild To: Jan Kiszka Cc: , "Su, Bao Cheng (RC-CN DI FA R&D SW)" , Vijai Kumar K Subject: Re: [PATCHv4 22/26] meta: deb-dl-dir: do not cache debs from isar-apt Message-ID: <20200203192701.2700782a@md1za8fc.ad001.siemens.net> In-Reply-To: <16977d1f-fb4d-481b-9c55-53ed064df333@siemens.com> References: <20200131143000.14873-1-henning.schild@siemens.com> <20200131143000.14873-23-henning.schild@siemens.com> <16977d1f-fb4d-481b-9c55-53ed064df333@siemens.com> X-Mailer: Claws Mail 3.17.4 (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: QEmV+VII58rv Am Mon, 3 Feb 2020 18:20:11 +0100 schrieb Jan Kiszka : > On 31.01.20 15:29, [ext] Henning Schild wrote: > > From: Henning Schild > > > > Packages from isar-apt are not downloaded from the outside and > > should not be cached. > > > > Signed-off-by: Henning Schild > > --- > > meta/classes/deb-dl-dir.bbclass | 14 ++++++++++---- > > 1 file changed, 10 insertions(+), 4 deletions(-) > > > > diff --git a/meta/classes/deb-dl-dir.bbclass > > b/meta/classes/deb-dl-dir.bbclass index ab4b1f09..f9699603 100644 > > --- a/meta/classes/deb-dl-dir.bbclass > > +++ b/meta/classes/deb-dl-dir.bbclass > > @@ -3,8 +3,10 @@ > > # > > # SPDX-License-Identifier: MIT > > > > +inherit repository > > + > > deb_dl_dir_import() { > > - export pc="${DEBDIR}/${DISTRO}" > > + export pc="${DEBDIR}/${DISTRO}/" > > export rootfs="${1}" > > [ ! -d "${pc}" ] && return 0 > > flock -s "${pc}".lock -c ' \ > > @@ -14,12 +16,16 @@ deb_dl_dir_import() { > > } > > > > deb_dl_dir_export() { > > - export pc="${DEBDIR}/${DISTRO}" > > + export pc="${DEBDIR}/${DISTRO}/" > > export rootfs="${1}" > > mkdir -p "${pc}" > > flock "${pc}".lock -c ' \ > > - sudo find "${rootfs}"/var/cache/apt/archives/ -type f > > -iname '*\.deb' \ > > - -exec cp -f '{}' "${pc}" \; > > + find "${rootfs}"/var/cache/apt/archives/ -type f -iname > > '*\.deb' |\ > > + while read p; do > > + repo_contains_package "${REPO_ISAR_DIR}"/"${DISTRO}" > > "${p}" && \ > > repo_contains_package may not be found inside the flock shell > context, as Bao Cheng noticed out. He suggests the pattern That is possible indeed. I remember that i struggled re-using the function since i did not want to code it twice. But to be honest i do not understand the problem with the given description. Bao Cheng please go into more detail. Maybe the filtering indeed does not work, i will try that on a simple test now. And it might be a good idea to make sure that code gets a "set -e". Henning > (flock 8 > ... > ) 8>${LOCKFILE} > > Bao Check, maybe you can describe how you noticed. > > Jan > > > + continue > > + sudo cp -f "${p}" "${pc}" > > + done > > sudo chown -R $(id -u):$(id -g) "${pc}" > > ' > > } > > >