From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003123014041600 X-Received: by 2002:a05:6402:1771:: with SMTP id da17mr3880482edb.68.1580226210591; Tue, 28 Jan 2020 07:43:30 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:385:: with SMTP id ss5ls4925787ejb.7.gmail; Tue, 28 Jan 2020 07:43:29 -0800 (PST) X-Google-Smtp-Source: APXvYqzB9cH+Ft8F7I/zAnGuJjrWu6hKqteE2SZgwZ7JWnlpLP1C0ygA6mI2EFzvcTjac2db031x X-Received: by 2002:a17:907:20a8:: with SMTP id pw8mr3733498ejb.248.1580226209753; Tue, 28 Jan 2020 07:43:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580226209; cv=none; d=google.com; s=arc-20160816; b=tcYa8Avb53f2xcwNLEJAmp+lGgL9DHvCMFnIiQs1fEpL0UDrAl1rVme0lAwTSmyHLu rW+9N5SUXqkCZrhZyAIMyqd4KR3Fx7bNbaL54iqKCFaXokpZGDRUfNHYZb7r0Upf3jco Cg868uJfjH2HNfbJviYsGb8+NEE9VoLqShGRkXdyHmb4q/EtXs1skPabZmXMLLlNs28L 9ldgW8spjUa/jVfNwGOL2sbA++Uhk+8Oq0SI5BNfyYuvb+a/x9xGP+Fd2ZKrQUnC9jEv +bgdG3nFKR6hGn7CnJwPRjLdCKUaSiOdfgEnpQVvD85gMPObJMgo34D+NzHtcsEOnlca fEIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=gA4/vmwDHJ+MgrR/km5dPzwUUx4ipquOdEAnveEZ6BI=; b=b7QNvR7eMUQAbJS9SYL+243tkUK0pl21VP1pVJtiSjw+1Wh50wRKukHD5lx/V9GaGs TOrNF6onubJyBbFDXZVc/lfkyjFlLt6oKlCrBbsVlhZ/2t0V89cWV8c03oohYRRuEems sJKG7XLoD1Thj6QMoyqD5iuWBqJ0TFbFNn5q1KP982dXphXiQwbz4+7U0AkwkxMPq063 2VY6vXj36pGs1rUkEkjceirRKYriFsU4KwsBY+unHhGE+HdZe3yZUFoiR8XwDkMgWTFF gAb1PCcAneV+XMa1LrkMHf5iughaLw/D+D23YK4dWvEZrIYZGRfg5/kduqdViE5NqMsF eqZw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=GOGf7hMs; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::441 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com. [2a00:1450:4864:20::441]) by gmr-mx.google.com with ESMTPS id z20si530013ejx.1.2020.01.28.07.43.29 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 28 Jan 2020 07:43:29 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::441 as permitted sender) client-ip=2a00:1450:4864:20::441; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=GOGf7hMs; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::441 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wr1-x441.google.com with SMTP id b6so16590227wrq.0 for ; Tue, 28 Jan 2020 07:43:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gA4/vmwDHJ+MgrR/km5dPzwUUx4ipquOdEAnveEZ6BI=; b=GOGf7hMsGw1VRZH4gd7Qdcqv5LoQLXdTS23bB6eLdYCJEX361gMozK0iZxYU7o4meq +iSt45hnsgvzz6xRMbgf9Uxcc/79LzdUHcgCJOg3w4ATu5EBQ+Z0WMVBeUe+GEelZTlv 1BHZGIGyE9tcRgUbvo/upLSHQh6IFdMXljXPbLZoxw46CjJTiBs4U85IQUGIoe0cpaLK aEYvgDObiHh4WPdDTzVVwFK802Q8bOpIEZWI3DWgwTeLX1wNY7fdkd5pR9j4fxk240IE 8kNbwyky+WV/axo44wQe1F8F+hkVhW3uMkScTITEGTKoKPxcXwzhnx41xDMB4j1fwx+B yXUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gA4/vmwDHJ+MgrR/km5dPzwUUx4ipquOdEAnveEZ6BI=; b=EKVMrA3daopVYJEvWdRRhTXkNRuzYXEqAlARiNG7OhBVi/9wiVQr3+MogMrzgMSbqp scxgOrqKq5aL1N3PKCGRL5zOV11xsMdFyxd4F9fLh+uSR6XKbN4Ji3P3e983x7GZ0pDX kXuQKWQk9ch78FAh5J7wsPos19zJjPwrx1D0NAZSylaFqchCrY2PGhC0XFeQWNsDD3wL 4TItHF0kGY6pTkQVZOhSb77WQfq9ZxPdSg/XrO2yjV/EGdxrRno3/RfNnF6P1CXt0JTt xheV0ZlAbo26qD7vlf+c6BVMWOvgF++AYsBDXn5KLDkOcXVNO/nkS9WzOSXodm/6A5Sx d0zw== X-Gm-Message-State: APjAAAWay4WjdkNCJDHqzYiYp8byLc1k8hlWt2eeSQMC9Qic1p0OsXLD NSIAqgOF/iijt6jjtKV7+/0UFwhPAyo= X-Received: by 2002:adf:ea4f:: with SMTP id j15mr29512403wrn.356.1580226209274; Tue, 28 Jan 2020 07:43:29 -0800 (PST) Return-Path: Received: from oxygen.mgc.mentorg.com (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id u8sm3601200wmm.15.2020.01.28.07.43.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2020 07:43:28 -0800 (PST) From: Vijai Kumar K To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v3 22/26] meta: deb-dl-dir: do not cache debs from isar-apt Date: Tue, 28 Jan 2020 21:12:09 +0530 Message-Id: <20200128154213.22353-23-vijaikumar.kanagarajan@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200128154213.22353-1-vijaikumar.kanagarajan@gmail.com> References: <20200128154312.337e61f6@md1za8fc.ad001.siemens.net> <20200128154213.22353-1-vijaikumar.kanagarajan@gmail.com> X-TUID: aCtUaA6qjReK 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 ab4b1f0..f969960 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}" && \ + continue + sudo cp -f "${p}" "${pc}" + done sudo chown -R $(id -u):$(id -g) "${pc}" ' } -- 2.17.1