From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6997052726746021888 X-Received: by 2002:a2e:4612:: with SMTP id t18mr3006425lja.346.1629203915542; Tue, 17 Aug 2021 05:38:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4146:: with SMTP id c6ls1351695lfi.2.gmail; Tue, 17 Aug 2021 05:38:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyy2rYDgm4CEJ7lzKYQuJxqfN0LKQs7w4v62z0V+wYWBpkhghldRSlJJPVuaZQO3XYRvqgR X-Received: by 2002:a05:6512:2626:: with SMTP id bt38mr2269793lfb.181.1629203914630; Tue, 17 Aug 2021 05:38:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629203914; cv=none; d=google.com; s=arc-20160816; b=DYhfyG7t2DepUhUzYYG5xat4r8zeKL1QJgIbTDN4+hDXbxa6KyNUHfNdbDksCdiC9x bwqjy3z4bcC6BO6hOpadyNrMUbbVynqxz0MkJ8/hKIzxKeWmGwsHFjhTxKoV4c9rYAHm 2Ex/vYHqVC026+EbzqNVRl8U8vq6tRqnvsA7Iwde8Qu1T7PANtVm3tQ4soxfyCuDWf2B UGu7Br3mylYffrptTfKXc7a+bLACp/dyed3HkHT1NgkIijnuP0y+fIcKknkEd6Dko63Y sNSkyDTzNXJTP224SJ/s7aZq+gcbF/ltcTsFBQIXj81b2RLUICvs9TG15qwjD4d5yVAm DiPQ== 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=Y4U7Bg7zVdIr7x+RG4FGHuflGs8tZQXzir6/Gjyh6uQ=; b=e8MVVzSLorK68akatWnqBH9lpNu7TKFwVNr3flCqB/tmsIS4UAMrQ6V++WvE5rSf5f 5o3ndSwkEBWsp49bE7HpN6WkxivwrBydsTQeUkz6cwr+pY13jUbIZbSpiJA4yzT5RUEY orj3eUcJmt4P2hxbEaoeJZfvbjovFc8qMH9DkxsQZzII6FOTZJq7PJzdrWqC5nNGwChk JC67FDmxvQE9zPxyYzRvDSIeRXxzwwFKNIT9ScKdK3YPdzIYif4sFISxw37pWl/bI2A7 7Uw3mOvFMUA0DeIlt11ZgU9n+cTZKAG7VDCUJliAPzJOKXtyXlIufbfu1LvVLUSVX7Oz pI+A== 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 9si77826ljv.4.2021.08.17.05.38.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Aug 2021 05:38:34 -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-146-26-214-37.mgts.dynamic.pppoe.byfly.by [37.214.26.146] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 17HCcFsQ008270 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 17 Aug 2021 14:38:29 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v5 3/5] image: Add reference counter Date: Tue, 17 Aug 2021 15:38:06 +0300 Message-Id: <20210817123808.3563834-4-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210817123808.3563834-1-amikan@ilbers.de> References: <20210817123808.3563834-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: b95+a00yPKpW Image generation can be also executed 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