From patchwork Fri Jul 12 06:56:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3681 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 12 Jul 2024 08:57:05 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f191.google.com (mail-lj1-f191.google.com [209.85.208.191]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 46C6v4n9021207 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 12 Jul 2024 08:57:05 +0200 Received: by mail-lj1-f191.google.com with SMTP id 38308e7fff4ca-2ee9260658csf14641791fa.0 for ; Thu, 11 Jul 2024 23:57:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720767419; cv=pass; d=google.com; s=arc-20160816; b=Gq2JD7inQbj6Evs3OLjEsrURZWXPv3sAGd68KmTS9Mrgm7jkFNFyjQWSZwU7yLhdET dP8JA1oa8MNeUgPizMW90hGlUm3u4Pk5e1DACu81nfn6py5jVyL0RumpxU9p1Sil/68s WH9IhqUtftSyCpcOAjQBICu70G8jQtoHTQqbKwQYw45hKdtBadjUc0cmKBZVmIpaXLha tVYHA6qo8M4aHAZyJGZRqzFZQC8+RH7aILxW/q65TD+wF0cMUqBb5WGatmN3GHa1oXNh PvYGDTIwPhcLL/E8Ro05j6WkWevEFgnLKyyP8fWBuvtuCEolfv00rtc3RNkX1adpv7EF J2ig== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=tklYT1oUuDtYkX/Y0ajUj67cDWAJqp7mpiiAFitwkt8=; fh=vCuFh4WySGrEUC2QdEAWDjFUvpnbh17Uh884akgyJ8Q=; b=JWyTw/Briqs23ABer5wlyNQiXSai6jxgPvGQMfsfFffqP+YoKykVjYOzPexxVyPLBe B5ie1zdncIuMNb3RQKNPuqfy/bxCc1X+F7i40B8tD7Q1T0A25tUgcQhlNtgOc2M72uUG bAgNKoStNS09HmSxNncPYWAlakdtimzoyRyu8vVYKXY9RW0unelnIh++L6JDZZDJCQKH kxhpt6m6D4FxW0h1RtG/JWPuH8mcQaxsQe9oh4H7FIzcDF1BKuyy3DTX4HuXa08Vs2cp g52BqpvCXjcXWftWNy+dF3F4GUbW1HLwh+4YkN2grnNwmgoD1Z4h2BnoqK4pgDKkGl2g vQAg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1720767419; x=1721372219; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=tklYT1oUuDtYkX/Y0ajUj67cDWAJqp7mpiiAFitwkt8=; b=xK373r7KTNcR8kjezF/IuI6M0tlKebRqtG2O8xhRlPbvMt/y4QCCyUEK2Yildx8Ep0 lSmhdQoxDgonncXVtX1dTsy6Qx6XWn3E1+c/vy7sKp3Aova4KgTYfR9z/vc9zrra6SaT 93SQIsZOXWyNX8oEqMK0Qg1nBoKgal5TmSqT05kFPV+I25EtXS8CAkTUB9pbzX0RuEN7 UxgmqbTb70ILmffiEMXV/vUCCKhdu3vtuB4zI4L9yTmOOg2dFXY+UbJGDGr6yIldWMw3 K6tT1HReufQzJvMWNMjx4651VELmoep8iVIi/ldbRdhKYl3NVBUtDm09i5VkVbVMuSQ0 HeCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720767419; x=1721372219; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=tklYT1oUuDtYkX/Y0ajUj67cDWAJqp7mpiiAFitwkt8=; b=E/YK2ot7FYUvpVWiYJi5+B0MjY6+IMMvQ6T357qm7zNRRaK5GkjpTdjJzk5kIxMfTZ F/IwVb5ndEUkoRuISqHPbDzPL/DkrEXDi++luBjlodMjNTYDCsGX2blOh7HaFdxn514k 2Rm893v1aIjyprbcDEbz/efzCnFqxQhX7jCcC0+dtgeUYxC98++8GAg5x4MokQLWPlRr g+/u9RuayPfDJMNU0f++CXa7go3O54LbUX8g6cPAHMT/FH7LIvVAaS89GYj+LMPby5l2 lujrfrm3yo+R8uAKNI4H+zYTQU0oy2UuvXLlX9jvYDUpwx8opLSOxaYOX/BBekKwJmPk aeLA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCX0vb+DrUAZs26/OKwl742Q0sNQhxxbcMhh5xAWLBkMCulDLD0CvXIEnXMkp6NAixBjOKsEMZUN/Lb6csu0asw1cscPfcQ= X-Gm-Message-State: AOJu0YxdD5LzeIQshDYiHhV8G6xZUU6PCCAcQCKGxPTWWhJ8MPMR/mUH DX6s7WTuMWx0XI9A+M38UbR9NnOCYhWum8oCV5dA1h/MGGtbBxDF X-Google-Smtp-Source: AGHT+IH8j3AuOH2Atl5gS0MKE4TcAjfY7gRzBiw1lRiWtLA/Mxe4L4ereBd7tTgGhzXuijggFh8EFg== X-Received: by 2002:a2e:9d13:0:b0:2ee:4ec2:8232 with SMTP id 38308e7fff4ca-2eeb30fd4d7mr73353921fa.25.1720767418939; Thu, 11 Jul 2024 23:56:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:960f:0:b0:2ec:545e:8bdc with SMTP id 38308e7fff4ca-2eec8e00548ls7053221fa.0.-pod-prod-01-eu; Thu, 11 Jul 2024 23:56:57 -0700 (PDT) X-Received: by 2002:a05:6512:401d:b0:52e:9fe0:bee4 with SMTP id 2adb3069b0e04-52eb9990e64mr7024312e87.9.1720767416913; Thu, 11 Jul 2024 23:56:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720767416; cv=none; d=google.com; s=arc-20160816; b=Row9tGOUmN5Anflqi+JdxTEp57ACVz9p0mOXELb3eUCgaCXvjEVbfba0ySbcfAQr1d Fyn1EpqziecEo038KEqSaadv15igX4HQsqFiGQE/FqPgeY+G8RafwiKmwQ6AtZuPrsRE clHCjU4Q04jKKN3fbxTq2TCunPDZ/73C6Zyz3T17xL4cVAyBB2hQ8HbJXrRmq/dhVs84 rRGx7HVwvwnEpWv2olgKEPqg6L5P29pE7a63Tb7IJvHRv22JZamMT2WEtNCOyy1miukN jhfFhYdH95+SjSs8o7+hp/OpW2MzX+ljl/2kugxBW18DxO1IlnpY3Dv8VBnfC7seC9mY Pp0A== 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:date:subject:cc:to:from; bh=K/BEpnSJlPNZVVxhAgIY/kR1khBX3QAWc1ktZ4r5YKQ=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=Bt2GT8uJ5IY0RZ5IrMzKQHRcs7NASjbcc4RlyO23mLvUt6NyrEFAHPOtP3evzKWLrP bJ7JqTgbGZG6MlElyDWosSKShXYUey9jXVBVYafJyz6tSHipq/BTBesF5ZaK5FeOS2vn CoyrCtnJpkuUDGI415jMiApASne1Hlebg3fOg/pDaIoBZ2h9c8dS0081bvzMfgjkq21g fNI4iW3mn8icBOApiSgrdfcJ7K1PKqKnKRr0lZtBywmO+0KSLtFNhNQwS0SaYn5Qtyyp ui3DCvKGCNAajD0GniycA17Tm3aliHYzCZbTl36v+5BnzIq7WEnsz7F95O8QHItqOUUm o5Ng==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-52eb8e77671si131983e87.9.2024.07.11.23.56.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Jul 2024 23:56:56 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.promwad.corp ([159.148.83.114]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 46C6urcL021176 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 12 Jul 2024 08:56:55 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 1/2] deb-dl-dir: Avoid multiple find run on export Date: Fri, 12 Jul 2024 09:56:45 +0300 Message-Id: <20240712065646.2156320-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712065646.2156320-1-amikan@ilbers.de> References: <20240712065646.2156320-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS 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-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= We are running find on isar-apt repo for every new deb in cache. This can be optimised by collecting isar-apt content once and compare deb name with this list later. It can be also usefull for the future isar-apt lock protection. Signed-off-by: Anton Mikanovich --- meta/classes/deb-dl-dir.bbclass | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index 8e0243fe..2d8739dc 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -89,6 +89,9 @@ deb_dl_dir_export() { export rootfs="${1}" export owner=$(id -u):$(id -g) mkdir -p "${pc}" + + isar_debs="\$(find '${REPO_ISAR_DIR}/${DISTRO}' -name '*.deb' -print)" + flock "${pc}".lock sudo -Es << 'EOSUDO' set -e printenv | grep -q BB_VERBOSE_LOGS && set -x @@ -98,9 +101,8 @@ deb_dl_dir_export() { while read p; do # skip files from a previous export [ -f "${pc}/${p##*/}" ] && continue - # can not reuse bitbake function here, this is basically - # "repo_contains_package" - package=$(find "${REPO_ISAR_DIR}"/"${DISTRO}" -name ${p##*/}) + # skip packages from isar-apt + package=$(echo "$isar_debs" | grep -F -m 1 "${p##*/}" | cat) if [ -n "$package" ]; then cmp --silent "$package" "$p" && continue fi