From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6982225001537601536 X-Received: by 2002:a05:600c:21d3:: with SMTP id x19mr28082815wmj.113.1625675947788; Wed, 07 Jul 2021 09:39:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c9d:: with SMTP id k29ls6676908wms.0.gmail; Wed, 07 Jul 2021 09:39:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzTwnF6gxGr0pzK+nri+fltXZiaDDhPADiEHqz97jKy35x9rlHhq+TQ6zBH5fA9DAtClML7 X-Received: by 2002:a05:600c:4fc1:: with SMTP id o1mr14092503wmq.158.1625675946959; Wed, 07 Jul 2021 09:39:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625675946; cv=none; d=google.com; s=arc-20160816; b=yCMZU2wyrKzwlKPEbVHMvYcxccn17iluqaD4o7rr1l4q4+yudNHyXcOGE/BD0j1azs q3We/5HQPDBGvUB9AnUIZ+/t2gu9cKXxRcS467FORK/HZzlMpZnjRtUCNsIRiYbqqYGO mgDTusH9qSaPoEYmvjNhDuKeh+QqsjHQG3RvJnExDgW8K7hfzS2EeYSID5XSymxtPG6D E5WF37oE+KqHtc7Ix9vC4MO905JGewLupd0895FpQbFmSEbDvKt9zdtKyJnISfeppDyZ xn9jauZULKJM/pUfvyPIwrD1T2w/oqCrg3oEnNmJM3HRwA/6xpRgVehMWH6y+kXB9Pyg dO5g== 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=SszemWuTagoJ57XsWVLefxBR1AFjNAE217mmRIsqaF0=; b=zVR+lTldlPWiuJBqjl5fg8rx0xom13h/ALKRIaX2dBt4xhZ3+n3xNvT8u1VikYGiVG GVdF91t5bq8rjDon8vOkej+f9A6cgxHIy1YGcenLTuwFc1ngv1BYxihNTZHe2Ntm2Xjj J9oXGDwW8T85LHJggrvnsfNsgEyi50OZx7gmZHdfcGk6PNUUgpvXbQSMGZ1fpVGsrm16 iKDF4CYTlCcXDTqv77O2Jf4ZvK71RympLugLGI4w0DGVsF/yoSK7OSWQyzmOEpqHo2e9 0DGGDyRNnumXU8gtILY/5bPKLryXaHjf3342/1eZ1ld5zfCenGVrXSOa/YUHmpv1rml3 e4mw== 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 Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id g22si363883wmh.0.2021.07.07.09.39.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 Jul 2021 09:39:06 -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; 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 Received: from localhost.localdomain (mm-191-69-214-37.mgts.dynamic.pppoe.byfly.by [37.214.69.191] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 167GcxMS003642 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 7 Jul 2021 18:39:06 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v1 4/5] image: Add reference counter Date: Wed, 7 Jul 2021 19:38:50 +0300 Message-Id: <20210707163851.204296-5-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210707163851.204296-1-amikan@ilbers.de> References: <20210707163851.204296-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: rsZsb0yQ+9DD Image generation can be also made in parallel, so we need to control the usage of image_do_mounts/image_undo_mounts. Signed-off-by: Anton Mikanovich --- meta/classes/image.bbclass | 39 ++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 12d1616..b2a828c 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -52,23 +52,54 @@ DEPENDS += "${IMAGE_INSTALL}" ISAR_RELEASE_CMD_DEFAULT = "git -C ${LAYERDIR_core} describe --tags --dirty --match 'v[0-9].[0-9]*'" ISAR_RELEASE_CMD ?= "${ISAR_RELEASE_CMD_DEFAULT}" +IMG_MOUNT_CNT = "${BUILDCHROOT_DIR}_image.mount" + image_do_mounts() { - sudo flock ${MOUNT_LOCKFILE} -c ' \ + sudo -s <<'EOSUDO' + ( flock 9 + set -e + + count="1" + if [ -f "${IMG_MOUNT_CNT}" ]; then + count=$(($(cat "${IMG_MOUNT_CNT}") + 1)) + fi + echo $count > "${IMG_MOUNT_CNT}" + if [ $count -gt 1 ]; then + exit 0 + fi + mkdir -p "${BUILDROOT_DEPLOY}" "${BUILDROOT_ROOTFS}" "${BUILDROOT_WORK}" mount --bind "${DEPLOY_DIR_IMAGE}" "${BUILDROOT_DEPLOY}" mount --bind "${IMAGE_ROOTFS}" "${BUILDROOT_ROOTFS}" mount --bind "${WORKDIR}" "${BUILDROOT_WORK}" - ' + + ) 9>'${MOUNT_LOCKFILE}' +EOSUDO buildchroot_do_mounts } image_undo_mounts() { buildchroot_undo_mounts - sudo flock ${MOUNT_LOCKFILE} -c ' \ + sudo -s <<'EOSUDO' + ( flock 9 + set -e + + count="0" + if [ -f "${IMG_MOUNT_CNT}" ]; then + count=$(($(cat "${IMG_MOUNT_CNT}") - 1)) + echo $count > "${IMG_MOUNT_CNT}" + fi + if [ $count -gt 0 ]; then + exit 0 + fi + rm -f "${IMG_MOUNT_CNT}" + umount "${BUILDROOT_DEPLOY}" umount "${BUILDROOT_ROOTFS}" umount "${BUILDROOT_WORK}" - ' + + ) 9>'${MOUNT_LOCKFILE}' +EOSUDO } ROOTFSDIR = "${IMAGE_ROOTFS}" -- 2.25.1