From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6657829413861720064 X-Received: by 2002:a5d:4a87:: with SMTP id o7mr586964wrq.18.1551965003992; Thu, 07 Mar 2019 05:23:23 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:fc51:: with SMTP id e17ls1177957wrs.15.gmail; Thu, 07 Mar 2019 05:23:23 -0800 (PST) X-Google-Smtp-Source: APXvYqx2oecQrJlVkCyoYt6cN3J2n0QV1A7JWsFkbKh8F/Dm6NuHA03f3xVpQEYsBmNiSgs1rBCR X-Received: by 2002:adf:ce07:: with SMTP id p7mr599528wrn.24.1551965003584; Thu, 07 Mar 2019 05:23:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551965003; cv=none; d=google.com; s=arc-20160816; b=YiSPDiNhl4yBGjxdasptg3zH1j1yN/1rQsl5cmtDJesmg9WvSuR3a3gBOSGptsLO8P oZ0Dm+rDhnQiCloxDLFpYSEhQ0rtL8FexXOFZ9zU2ndSA0hDRj2L1SCqF7vV/6vIox0q OOPRUKryBrcYx0bYOk63k30TrcRlBhM9J3m6NwYEQU45cp2skseuAdJq1Z1oPkRf5kv6 z7cN5vsHFoey8YR4DEtxVkclh0FBHOHZRL30cJLiFCWhi6XvLeqvnlGIosWAU5qTMJRG P+0UP4WtbZEiy5nd3etAwBUKm3xwqR7WBe7zv6ZLzL4x3+WcuvxpwuIaZu8qQbuxw7JE cf5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:references:cc:to:from:subject; bh=PjOkfCm3+RsDMSR2kbrXxXjJM0oEXh24dN5dwykNL64=; b=zxftomhIuCNV6XLZla3yTRvO/Xw9lEGXGvNNKbRF+6H2wUEPdjPJ8xHgbj8OHzbM9j DjRNJ/7h3PL/VDxYBugFJBctWpTYDs1CYml6BuabQF0fnTyQd+xT0XdWPvAzuOIlJOfF It1uJpI2279FAlzSX8Y6xYlu3i/QERtbl+DOX+2A43v5EBC6P6HcvdnD8wkgkQrx0xM2 pgqa+6RA/uJLiQBrEwWtaI2IhYiHTveTaFcw0xdw7dzfBIv5y3nvI/qPNBfa48hNSOqG fxFI72jAeTmxsFTkBzzxLQ0WAwpZp858uctk/FVTg8CgB0CsnIVTtM12XfmYRQucvcVZ DZpg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id v189si177179wma.2.2019.03.07.05.23.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Mar 2019 05:23:23 -0800 (PST) Received-SPF: pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of claudius.heine.ext@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=claudius.heine.ext@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id x27DNLR1010064 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 7 Mar 2019 14:23:22 +0100 Received: from [139.25.69.232] (linux-ses-ext02.ppmd.siemens.net [139.25.69.232]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x27DNLCn032403; Thu, 7 Mar 2019 14:23:21 +0100 Subject: Re: [PATCH v2] meta: refactored flock usage From: Claudius Heine To: isar-users@googlegroups.com Cc: Claudius Heine References: <20190214121819.22037-1-claudius.heine.ext@siemens.com> <20190214160805.19980-1-claudius.heine.ext@siemens.com> Message-ID: <74c572da-56cf-6ead-8aef-8f94a89ee45e@siemens.com> Date: Thu, 7 Mar 2019 14:23:21 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <20190214160805.19980-1-claudius.heine.ext@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: sG9yzrZxhuVJ ping On 14/02/2019 17.08, [ext] claudius.heine.ext@siemens.com wrote: > From: Claudius Heine > > Currently much care has to be taken in order to correctly escape strings > inside flock commands. And there is also on instance where this was > incorrectly used (isar-bootstrap.inc). > > The usage of flock was changed to no longer require single or double > ticks. Instead commands are run inside a subshell. > > Signed-off-by: Claudius Heine > --- > meta/classes/buildchroot.bbclass | 6 ++++-- > meta/classes/wic-img.bbclass | 6 ++++-- > meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 10 +++++++--- > 3 files changed, 15 insertions(+), 7 deletions(-) > > diff --git a/meta/classes/buildchroot.bbclass b/meta/classes/buildchroot.bbclass > index 0d4ff4e..c017b25 100644 > --- a/meta/classes/buildchroot.bbclass > +++ b/meta/classes/buildchroot.bbclass > @@ -22,7 +22,8 @@ python __anonymous() { > MOUNT_LOCKFILE = "${BUILDCHROOT_DIR}/mount.lock" > > buildchroot_do_mounts() { > - sudo flock ${MOUNT_LOCKFILE} -c ' \ > + sudo -s <<'EOSUDO' > + ( flock 9 > set -e > if ! grep -q ${BUILDCHROOT_DIR}/isar-apt /proc/mounts; then > mount --bind ${REPO_ISAR_DIR}/${DISTRO} ${BUILDCHROOT_DIR}/isar-apt > @@ -36,5 +37,6 @@ buildchroot_do_mounts() { > > # Refresh /etc/resolv.conf at this chance > cp -L /etc/resolv.conf ${BUILDCHROOT_DIR}/etc > - ' > + ) 9>${MOUNT_LOCKFILE} > +EOSUDO > } > diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass > index 76602d8..5367a37 100644 > --- a/meta/classes/wic-img.bbclass > +++ b/meta/classes/wic-img.bbclass > @@ -87,14 +87,16 @@ do_build[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}" > > do_wic_image() { > buildchroot_do_mounts > - sudo flock ${MOUNT_LOCKFILE} -c ' \ > + sudo -s <<'EOSUDO' > + ( flock 9 > for dir in ${BBLAYERS} ${STAGING_DIR} ${ISARROOT}/scripts; do > mkdir -p ${BUILDCHROOT_DIR}/$dir > if ! mountpoint ${BUILDCHROOT_DIR}/$dir >/dev/null 2>&1; then > mount --bind --make-private $dir ${BUILDCHROOT_DIR}/$dir > fi > done > - ' > + ) 9>${MOUNT_LOCKFILE} > +EOSUDO > export FAKEROOTCMD=${FAKEROOTCMD} > export BUILDDIR=${BUILDDIR} > export MTOOLS_SKIP_CHECK=1 > diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > index 234d339..9c82184 100644 > --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > @@ -207,14 +207,16 @@ isar_bootstrap() { > esac > shift > done > - debootstrap_args="--verbose --variant=minbase --include='${DISTRO_BOOTSTRAP_BASE_PACKAGES}'" > + debootstrap_args="--verbose --variant=minbase --include=${DISTRO_BOOTSTRAP_BASE_PACKAGES}" > if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then > if [ -z "${BASE_REPO_KEY}" ] ; then > debootstrap_args="$debootstrap_args --no-check-gpg" > fi > fi > E="${@bb.utils.export_proxies(d)}" > - sudo -E flock "${ISAR_BOOTSTRAP_LOCK}" -c "\ > + export IS_HOST debootstrap_args E > + sudo -E -s <<'EOSUDO' > + ( flock 9 > set -e > if [ ! -e "${DEPLOY_ISAR_BOOTSTRAP}" ]; then > rm -rf "${ROOTFSDIR}" > @@ -295,7 +297,9 @@ isar_bootstrap() { > > # Finalize debootstrap by setting the link in deploy > ln -Tfsr "${ROOTFSDIR}" "${DEPLOY_ISAR_BOOTSTRAP}" > - fi" > + fi > + ) 9>'${ISAR_BOOTSTRAP_LOCK}' > +EOSUDO > } > > CLEANFUNCS = "clean_deploy" -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de