From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6522139533803257856 X-Received: by 10.25.213.201 with SMTP id m192mr203992lfg.43.1518553945287; Tue, 13 Feb 2018 12:32:25 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.46.65.133 with SMTP id d5ls1595100ljf.11.gmail; Tue, 13 Feb 2018 12:32:24 -0800 (PST) X-Google-Smtp-Source: AH8x225d2wzas0R3ipWyWbrYdxZF2/s6Ia9eWoRtxcah4rvU2/zXnLPGr5AxTRgqj9MhEKMjr75+ X-Received: by 10.46.17.72 with SMTP id f69mr187810lje.41.1518553944808; Tue, 13 Feb 2018 12:32:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518553944; cv=none; d=google.com; s=arc-20160816; b=Q3mVQE/mHKknBJk7aVqn1G8YVj/GW5+A0UfX+G93mD6XFTGMF3Wn9HCFIzkrchAOlT RN+IfcU9vEGmdPsoOzuB0EjmoavaiMnyKqlJOAihs9MYHxNT/hAgVnz4IaHqgQB3ngJo jeCd0YZRrryv77M9XPkQsvdSvOmWIcpkXH416v6JnuxbDnCiTc8P8XHfAXQcA8y0vzCe iDDOtgoqaly+Ou0gE87TwTyaqT9wb+K4zvaJjxTqMG1Qly1WD0ZPgrUggvN7FgPcMPqh 5yRmUkcl63TQe/DWJen0DYW7L36n690mb0wB6qFNo9p0tTwpa3P0CHNXAXUUTufOcNst qt5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=3L5+WoOLmcOY29yoXUqE9laZRsvFmrS+DMLPWMYio4s=; b=S0A0NAzdjFaqNb9IWCRgj/Da/Qf3HvD/FlGYxy/iK9eYSo4YRjh2gIwlOZRcOHVEqN hpBLZjcRiQM9hStm12smx3p1DqzQo3eQSOYsPTPA2uJM9Dxn7Sb2qkGG9VKzj1KFvnhF dGmdUx2GbKMaUixXg9q5w/O2QYy0Mb8oGuzropBHdr1Y6KKW+wvGg+kZKqNfcSkBa158 G98gNn03pjcXxrPhYZ+n/xGUUVsF/HXdLFk9HPq+LQvqjdeIKeTEdE13d2FLN5Wo3vgg uXWYoP0HRYKtMAgtvThObzAJVUZRMNjrKcI2uLl8h5z5S0LAOMxJlmZw8L1x1DCKFPjs +EZA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id 25si667821ljt.1.2018.02.13.12.32.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Feb 2018 12:32:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from localhost.localdomain ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w1DKW9Bg007518 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Feb 2018 21:32:15 +0100 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH] [RFC] buildchroot: Fix do_setup_mounts Date: Tue, 13 Feb 2018 23:32:02 +0300 Message-Id: <20180213203202.4161-1-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.5 X-TUID: tm2zmUu5YmzV Fix this function to work correctly for re-running builds. Signed-off-by: Alexander Smirnov --- meta/recipes-devtools/buildchroot/buildchroot.bb | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb index 570c0ad..d25b549 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -74,20 +74,16 @@ do_build() { do_cleanup_mounts } -# Invalidate stamp for do_setup_mounts before each build start. -# This will guarantee that this function will be executed once -# per build. -python __anonymous() { - stamp = d.getVar("STAMP") + ".do_setup_mounts." + d.getVarFlag("do_setup_mounts", 'stamp-extra-info') - os.remove(stamp) if os.path.exists(stamp) else None -} - -do_setup_mounts[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" +do_setup_mounts[nostamp] = "1" +do_setup_mounts[lockfiles] = "${WORKDIR}/isar.lock" do_setup_mounts() { - sudo mount --bind ${DEPLOY_DIR_APT}/${DISTRO} ${BUILDCHROOT_DIR}/isar-apt - sudo mount -t devtmpfs -o mode=0755,nosuid devtmpfs ${BUILDCHROOT_DIR}/dev - sudo mount -t proc none ${BUILDCHROOT_DIR}/proc + grep -q ${BUILDCHROOT_DIR}/isar-apt /proc/mounts || \ + sudo mount --bind ${DEPLOY_DIR_APT}/${DISTRO} ${BUILDCHROOT_DIR}/isar-apt + grep -q ${BUILDCHROOT_DIR}/dev /proc/mounts || \ + sudo mount -t devtmpfs -o mode=0755,nosuid devtmpfs ${BUILDCHROOT_DIR}/dev + grep -q ${BUILDCHROOT_DIR}/proc /proc/mounts || \ + sudo mount -t proc none ${BUILDCHROOT_DIR}/proc } addtask setup_mounts after do_build -- 2.1.4