From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6588749641152462848 X-Received: by 2002:aa7:d29a:: with SMTP id w26-v6mr3320215edq.9.1534062820866; Sun, 12 Aug 2018 01:33:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:fb0c:: with SMTP id d12-v6ls5845895edq.5.gmail; Sun, 12 Aug 2018 01:33:40 -0700 (PDT) X-Google-Smtp-Source: AA+uWPxR+FHCGYsy6jBeSzx2ytcekD6JOZjtvxsviEdB4mZZVFjRjInIZxv3YH3jTBtzlfO5qi4z X-Received: by 2002:aa7:d998:: with SMTP id u24-v6mr3323480eds.5.1534062820245; Sun, 12 Aug 2018 01:33:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534062820; cv=none; d=google.com; s=arc-20160816; b=d77o0zdN2Nof3zmvOZyWop7GhXjdUbsaUkEzZYwcIZzWdGooNY4OfMtFB5hoFZjtMx jQxrlnq4KQDu+3oVEbeGqrVfrfAoTs//ywsK02rNKUnxk+lmsekN3LMetxLbCGVUY/hI X0hNrI9mqJ0eKBtt23eGk9HTHzSsW/OkXJ79a13A5QwZz+kfZqcYPhDHP4rYPkcLAQMa 6bYLxJ6wTfbXjo0BfJMp88vgkXL96Q8RUZ0D1KgD4ItRuK3tXSc6bHZVMnFkk9OW50NW n4xg1KqyRhuRBU8Xmqp+dGSD3lZ74BYSfsBKH4i+pR71ZMntYlVJ7Lu6ATnmHrj5oPk5 RUsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from:arc-authentication-results; bh=GDIGTqk1oWWe35KxbYlYgUCwN8e245JNni0UM1+h4KY=; b=zTfRqVjGUoOh4qLxVW+jhtPAduzYh0oS+3FRPLTRBm7+YzhMLLJkt7dnG2b1h6Uycm R0PLhG85XIY1brEmlrBUFS0qCGJmLSy91AoWdWzBwOA3kKJytwJqqRwzlcmm01qHYSVR Iv0fZxVZV7JiIj9Jx7QNosubNCdsvsRbwlp3XJkAp2UJgeZ2Xhh4fYQHXR2dbJEdeCrI 8w5AbERViSG2c7X9+v6pGg+7WK7RPRRDEKHxdMYfMVXkrN8IlDwMgRnCOCV11clSHjjd atIDb4xLQMzi26DrLuy5J+G9+gnl9U5DDGbIw9kJJ8O8smcQD+ctbVvYbfKoUS6aIYoO AM0w== 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 d1-v6si351260edp.3.2018.08.12.01.33.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Aug 2018 01:33:40 -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 mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w7C8XdCA019546 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sun, 12 Aug 2018 10:33:39 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.3.53]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id w7C8Xcu6016811 for ; Sun, 12 Aug 2018 10:33:39 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 3/3] dpkg-base: Reformat flock-protected commands Date: Sun, 12 Aug 2018 10:33:38 +0200 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: EFB9RuadGV0Z From: Jan Kiszka We do not need that ugly line-continuations here. Signed-off-by: Jan Kiszka --- meta/classes/dpkg-base.bbclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 9b42c42..a41df2c 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -64,11 +64,11 @@ do_build() { sudo flock ${MOUNT_LOCKFILE} -c ' \ set -e - if ! grep -q ${BUILDCHROOT_DIR}/isar-apt /proc/mounts; then \ - mount --bind ${DEPLOY_DIR_APT}/${DISTRO} ${BUILDCHROOT_DIR}/isar-apt; \ - mount --bind ${DL_DIR} ${BUILDCHROOT_DIR}/downloads; \ - mount -t devtmpfs -o mode=0755,nosuid devtmpfs ${BUILDCHROOT_DIR}/dev; \ - mount -t proc none ${BUILDCHROOT_DIR}/proc; \ + if ! grep -q ${BUILDCHROOT_DIR}/isar-apt /proc/mounts; then + mount --bind ${DEPLOY_DIR_APT}/${DISTRO} ${BUILDCHROOT_DIR}/isar-apt + mount --bind ${DL_DIR} ${BUILDCHROOT_DIR}/downloads + mount -t devtmpfs -o mode=0755,nosuid devtmpfs ${BUILDCHROOT_DIR}/dev + mount -t proc none ${BUILDCHROOT_DIR}/proc fi' dpkg_runbuild -- 2.16.4