From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6750962531146137600 X-Received: by 2002:a7b:c395:: with SMTP id s21mr7378277wmj.102.1571830951274; Wed, 23 Oct 2019 04:42:31 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:efce:: with SMTP id i14ls835274wrp.10.gmail; Wed, 23 Oct 2019 04:42:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqx1Xx9yt9R8WvfySI8fF5iSLoKtbXv0kCBGXFvFltzjVZJF+DKJYb5zqBVk/8M/732iBxna X-Received: by 2002:adf:ffc5:: with SMTP id x5mr5277621wrs.93.1571830950725; Wed, 23 Oct 2019 04:42:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571830950; cv=none; d=google.com; s=arc-20160816; b=Ga5xvvWwAThcZuAiy1ztPv345Ea1nUwnPHq6SAw/dRfPNz7SHLSAn9LilQiOF/rIRY HYoX7b0511Ddib1YBSx09CAY+v0gPbYvpdnR26zcJLlixOurmbsYl5AMSstZf37djINO xCdZJmhLP5vJvF/Rr8NMtCAoCZGkk2lgSpFu9I08E+TUdOwbM4/h5c1dK7nibr8uUwzS xW9BFjVZx/3SR8yRMon4xhp4X5jJm5qq5B7f01KlFNPFNQ5gJnY1+tOyoUfvbm4LjES4 mYopLZYyLm9/zh5s8KuoUiT55+lVkaJPdlPktI8DqnDUnK8f0PAF4sC35vHu4AWC9ENX 1PfQ== 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=w9ybOPj7ahJOKH2lfQ0ioDabkwoXAr6t1iT0lKjdz8w=; b=ppweInLaZOvuSl/hkKOauifb0tT1A9Idq/B6pdkwBKIuJVnqKX7LH/YA+3ORDx/0ab /4jvq3ymq3mTW5QWEwX+yJXmeBKoKCIiYLnmEHtDKRP6f9quyZk0M6nENwlHjTcpyh/c ClbytYZxF09iXLrkM5sZU8v+sy6ZN+SVN5QovBXH1jUcEADh9Iq7aM4N0pTQgj7RXV9F mV8dxEsZROrbGmvhhfVTpaEZTJvYlVT1pGG+4m1HInWjdJOmc0pW3LRYwsKytqQLSc68 KFE3m40+L59QRsPSEYSPVi1TQniBiExXuSVdCN1PqXil3LB6MnJNoYhwU83Dgy56WE2Y 74uQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id c12si993390wrn.2.2019.10.23.04.42.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Oct 2019 04:42:30 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id x9NBgUI5002285 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 23 Oct 2019 13:42:30 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.8]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x9NBgUEG024249; Wed, 23 Oct 2019 13:42:30 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCHv2 4/9] rootfs: rename ROOTFS_INSTALL_COMMAND lock to "isar-apt-lock" Date: Wed, 23 Oct 2019 13:42:22 +0200 Message-Id: <20191023114227.31308-5-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191023114227.31308-1-henning.schild@siemens.com> References: <20191023114227.31308-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: indIiabcKJej From: Henning Schild The new name should make clear what gets (un)-locked here. No functional change. Signed-off-by: Henning Schild --- meta/classes/rootfs.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index ffc988e..f49f3cc 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -94,7 +94,7 @@ EOSUDO ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_update" rootfs_install_pkgs_update[weight] = "5" -rootfs_install_pkgs_update[isar-lock] = "acquire-before" +rootfs_install_pkgs_update[isar-apt-lock] = "acquire-before" rootfs_install_pkgs_update() { sudo -E chroot '${ROOTFSDIR}' /usr/bin/apt-get update \ -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ @@ -110,7 +110,7 @@ rootfs_install_resolvconf() { ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_download" rootfs_install_pkgs_download[weight] = "600" -rootfs_install_pkgs_download[isar-lock] = "release-after" +rootfs_install_pkgs_download[isar-apt-lock] = "release-after" rootfs_install_pkgs_download() { sudo -E chroot '${ROOTFSDIR}' \ /usr/bin/apt-get ${ROOTFS_APT_ARGS} --download-only ${ROOTFS_PACKAGES} @@ -157,13 +157,13 @@ python do_rootfs_install() { for cmd in cmds: progress_reporter.next_stage() - if (d.getVarFlag(cmd, 'isar-lock') or "") == "acquire-before": + if (d.getVarFlag(cmd, 'isar-apt-lock') or "") == "acquire-before": lock = bb.utils.lockfile(d.getVar("REPO_ISAR_DIR") + "/isar.lock", shared=True) bb.build.exec_func(cmd, d) - if (d.getVarFlag(cmd, 'isar-lock') or "") == "release-after": + if (d.getVarFlag(cmd, 'isar-apt-lock') or "") == "release-after": bb.utils.unlockfile(lock) progress_reporter.finish() } -- 2.23.0