From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6657829413861720064 X-Received: by 2002:a1c:ef19:: with SMTP id n25mr189499wmh.20.1552386046552; Tue, 12 Mar 2019 03:20:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:e142:: with SMTP id y63ls285472wmg.7.canary-gmail; Tue, 12 Mar 2019 03:20:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqxtpc6cuI9bPF/oSrghZfJHLeFFsgSmRgrDPz+G43TIqH//rBfad2WwYO4PN53l26yLCxXr X-Received: by 2002:a1c:c00c:: with SMTP id q12mr196363wmf.5.1552386045933; Tue, 12 Mar 2019 03:20:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552386045; cv=none; d=google.com; s=arc-20160816; b=fZ6FTD3wj6ONlsvcROh44BOLXGDK4FCTP3n+KoaT+v8xEW+KkQjzC1Eu3WXqxPSoW1 3rGbks7qmBCuGb165aopQVsRWcM4EsQD/WnO/Zx02mmt6xFEy8cu2+vGEPXpkqaIT5tr +ODk0BsYexoANq0JCuO4Z5TFA/Zx6OnbAnKwvbLxwuBeNyUQ3EtxLEYZzMTGYKXIXo64 G2g3ykjZccotpOWDAAeDvPdueJCJRHpeMiFwdnkLqIezOSoq05Vm6tTZQAutp9j0O492 z4T4KzAsPm2+ltqsWK6cm9qgoTiIp4XRWcfLXlTwWb8ZMm3jWuodv26RQrlCKTkVOO0G Mn0A== 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:from:references:to:subject; bh=jPiRLaJBOBNRususNqhYigwHm7M18ZNgR7FCrSj1dSY=; b=v29QGrEn1eoCFz3oS4BjoUQdtlffMGBGN+3JvMEGWbpoa31jfXVx1emIy+1Dv324fN jTNA57OVGXpwgMlOsU9QWfNBx+kHAGgqYiz2SHODBOFiO+VzJDWuL5K/ZIn2ipXfusua vtxqNZDQ6SZPOcgTQtsQBy4gSqYB82OAlKIqXOJFBL2pufep/vn0rvw7NmTfVo/M2TjJ VoDnh9/3VokxK8osZvB77KSRCAZ9McHdKpa3+ydqJWWaW0jlrE/+aywkvt6ncmguR/4M lyWDUKi3WiDlEfMYpkwkNcJXdFts1O80dLTONXoXcigzOUsjnDb7s3Zlg5j4YTnkRpac 1tTw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id b130si70227wmc.0.2019.03.12.03.20.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Mar 2019 03:20:45 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id x2CAKiPN004866 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 12 Mar 2019 11:20:45 +0100 Received: from [167.87.15.243] ([167.87.15.243]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x2CAKgI5030250; Tue, 12 Mar 2019 11:20:42 +0100 Subject: Re: [PATCH v2] meta: refactored flock usage To: Claudius Heine , "[ext] claudius.heine.ext@siemens.com" , isar-users@googlegroups.com References: <20190214121819.22037-1-claudius.heine.ext@siemens.com> <20190214160805.19980-1-claudius.heine.ext@siemens.com> <2b7ea7d6-5c27-2b86-e05a-37d21f58358f@siemens.com> <155215849283.17890.16013197651850956589@ardipi> From: Jan Kiszka Message-ID: <27326b09-17cf-de2d-a9fd-73b48198398f@siemens.com> Date: Tue, 12 Mar 2019 11:20:42 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 In-Reply-To: <155215849283.17890.16013197651850956589@ardipi> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: BuH5rQvfzf57 On 09.03.19 20:08, Claudius Heine wrote: > Hi Jan, > > Quoting Jan Kiszka (2019-03-08 18:49:48) >> On 14.02.19 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}" >> >> Are you sure that the removal of '' is correct here as well? What binds that >> package list to --include=? > > Well the package list should be ',' seperated otherwise debootstrap > would not accept it. With my change it would look at "'locales'" (with > ') and would not find that package, since it does not exist. Having > those ' there is pretty misleading and wrong. But the package list may contain spaces as well, no? Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux