From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7000667037168041984 X-Received: by 2002:adf:ec81:: with SMTP id z1mr2697344wrn.181.1629969812430; Thu, 26 Aug 2021 02:23:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c2b2:: with SMTP id c18ls2423341wmk.2.gmail; Thu, 26 Aug 2021 02:23:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZJzlkCaaQbu7XjL5At/MrD1lgxoRITgRsFOPJkOVCLBXFUYkdfG2TS8kZ+KeOrLxGbJih X-Received: by 2002:a7b:c246:: with SMTP id b6mr13131441wmj.37.1629969811350; Thu, 26 Aug 2021 02:23:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629969811; cv=none; d=google.com; s=arc-20160816; b=P/icaMZv0hT1Tv7aV6pfg54aT66gxmeOUojMmX7Js8irHPK8Gb8l+zNSe7I5s8df84 GNg5OoAk4tJPbj4g4ZNknpsL+8c9dsZDAzpz5IO2AAJKuu84MFPTNG+I6rMj1ek8LmeM okZzyXad+nvujTQWO2gEYt6EiJ0tYX20jx2P23IsIwCUWCn7O8W80kzILmwBPOBzQh7c nEMhPz8uDntlJOHujm6ct/Nz0eZuzPBmcTqw7NJiFcJIWC5VNuCHuNvK71jLIksTRiJg qImHN/y0A65CIID9+ixORZKsOlc37+Mp0w1k0YMjFKgvnZhcojng5uf99f6AGwjUbLGZ FMEw== 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=IcXm/04PyeFU7VY0br/DEc/aDPvJx2P9iYSaGbokjzg=; b=tnyEkmA9V4n8vfhwCmdAFLsaymYEJiD/etkAIJp9MYgZ5TcAbnZsJpmQNYc7Wc4LhJ AvBdzIFR6c90jSdxZgenh9q0kkphRP4963qElXWN5CQzkYH8lKCeRWSbBXAYBbW0KCXB 6WrWxKgA9TnQdzqA9DryGKIH/HS/ZQfUOAQKNbItkGRiZUfcY6ItV5UviRmj630GauLj lVyJJEOFvrXNdD6z8ZaKvpx7jKcxuL6C09qzLzboD+8DSJGnwRMcL0bv5Ewkwq1UJ0wW /EIzaw6oUmweN7ISa6xp29OOnU4zVDekxBLICAMyOrmyGzggxrgRC5bR4CaOU97Z27qZ uhWQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@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 a1si150740wrp.1.2021.08.26.02.23.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Aug 2021 02:23:31 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@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 jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 17Q9NUpt026330 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 26 Aug 2021 11:23:30 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.32.3]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 17Q9NT72029232; Thu, 26 Aug 2021 11:23:30 +0200 From: Jan Kiszka To: isar-users Cc: Henning Schild Subject: [PATCH 2/2] dpkg: Use noexec to disable unneeded apt tasks Date: Thu, 26 Aug 2021 11:23:29 +0200 Message-Id: <5fb8cf47c9d277c4df18ad2dc6e06a9cfa756bb1.1629969809.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: KYtVao42+wOj From: Jan Kiszka This avoids needless waiting for isar.lock in do_apt_fetch. Unfortunately, using an even simpler inline python function for setting task[noexec] does not work, even when setting expand to false for SRC_APT. So move this to the anonymous python function as well. Signed-off-by: Jan Kiszka --- meta/classes/dpkg-base.bbclass | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 1cac68b..1f2bebf 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -76,8 +76,6 @@ SRC_APT ?= "" # filter out all "apt://" URIs out of SRC_URI and stick them into SRC_APT python() { src_uri = (d.getVar('SRC_URI') or "").split() - if len(src_uri) == 0: - return prefix = "apt://" new_src_uri = [] @@ -90,6 +88,11 @@ python() { d.setVar('SRC_URI', ' '.join(new_src_uri)) d.prependVar('SRC_APT', ' '.join(src_apt)) + + if d.getVar('SRC_APT').strip() == '': + d.setVarFlag('do_apt_fetch', 'noexec', '1') + d.setVarFlag('do_apt_unpack', 'noexec', '1') + d.setVarFlag('do_cleanall_apt', 'noexec', '1') } fetch_apt() { @@ -105,10 +108,6 @@ fetch_apt() { } python do_apt_fetch() { - src_apt = d.getVar("SRC_APT", True) - if not src_apt: - return 0 - dpkg_do_mounts(d) try: isar_export_proxies(d) @@ -139,10 +138,6 @@ unpack_apt() { python do_apt_unpack() { import shutil - src_apt = d.getVar("SRC_APT", True) - if not src_apt: - return 0 - srcsubdir = d.getVar('S', True) if os.path.exists(srcsubdir): shutil.rmtree(srcsubdir) @@ -160,9 +155,6 @@ addtask apt_unpack after do_apt_fetch before do_patch addtask cleanall_apt before do_cleanall do_cleanall_apt[nostamp] = "1" do_cleanall_apt() { - if [ -z "${@d.getVar("SRC_APT", True).strip()}" ]; then - return 0 - fi for uri in "${SRC_APT}"; do rm -rf "${DEBSRCDIR}"/"${DISTRO}"/"$uri" done -- 2.31.1