From patchwork Sun Nov 22 04:47:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 178 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp2282195oou; Sun, 22 Nov 2020 06:48:00 -0800 (PST) X-Received: by 2002:a17:906:4551:: with SMTP id s17mr22109676ejq.545.1606056480379; Sun, 22 Nov 2020 06:48:00 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606056480; cv=pass; d=google.com; s=arc-20160816; b=r5oHtTKcEYOKG/6tZGa85F0iAOPIXhy7Xf9VeRAHfg1r6d/yenUSJ3+DdMNTAqU+6z V6bH+Ssr/KFXQtqO7f2dRJLgGlS6Law+fDM4UlGLScVLTU6O/u4AGX9n2x7Nuh09wU4h EtmsMgWPfR1e0yVcNd0igYZzPL9w3FB94W6JvYg+NiR8poZ9O2VLUkjHVYNXzxgZarJS A4Wil1Hkt7Nzx6Pgz7P8YMBjUKtbzGjdK1etFrRbvp+c3tPP09diJxEAgRM8U7CGwlgg fCHIf1BP9rWPcbH4v8C2PY+oRyIfFj6TCCuToXPA5zorQbH7E//7It2ZqE31y4mloYzc ojZg== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-language:mime-version :user-agent:date:message-id:cc:to:subject:from:sender:dkim-signature; bh=lHYTvBP3HTu/OKMHlsbLGUZHjy3MyPwoA/UGpJpTGZc=; b=e/JbnD7SF0Ch12xDbG4Ev1CrnUfw0uLQRFtjFPiilLu5pxh2SfDpVo4PStDlREeUBo +1ugARrBUgv/3CAQ6GHXNKo5kxZEi7Kw+ZbGovXa5A455DOmcEoEyAsBX9ufZ1exuE/4 t7XFRo5QnPVTBYfJENyKIqVPZ8Qnz4bZkvrq74du3xVc/UMlw/rmkSL0kOxLx36WSduV 0+lrdDKN4uHNo6QgfiFaEnL8OGW8lGgM4x9FxP6BPp0Q/aFOdZpjnLYBZMx7gy4hwtpO pVUMuldfMG5AIAPh5xL0j2p0/1TIIsVnBqOEHR5+BK2OSeFcNGn5G8g4ZCsgC3fYzhIU us3g== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=mGYIyb3U; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbh7u5h6qkgqee5aiswi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBH7U5H6QKGQEE5AISWI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id h3sor1542626edl.20.2020.11.22.06.48.00 (Google Transport Security); Sun, 22 Nov 2020 06:48:00 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbh7u5h6qkgqee5aiswi@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=mGYIyb3U; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbh7u5h6qkgqee5aiswi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBH7U5H6QKGQEE5AISWI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1606056480; cv=pass; d=google.com; s=arc-20160816; b=DlV2zQV8sxxqeRJPnC63RdYFdS1+Oe51u25+XqvAH5xO1e1q+bxS9W86KaAReq3pUS H8TSVFXRf6CHsTUdq7i/eYKXt03yaDevTdN6nuRs9rMIyX/6uuQlbISJUqOS5Aa5wyZr 6f2tKvFvER+s7+tjvkUAI2QIq+aWUDb8CceV68P/t2L7TGn2q5hD37iXwny7A0Ba58h6 sQz/e53G6xbs3lZ7yCxq5Pg9VyAMkDDDrztRZCz/hRbtDDrA1utur9KIrHY9cBkbxA/z 9kA6dMqfeq151DXGSHogAqAWuvSAGbMJDd51v+AeAmJFuU2XRZKkQBJAa3T82JdWtjKp 6A6g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-language:mime-version :user-agent:date:message-id:cc:to:subject:from:sender:dkim-signature; bh=lHYTvBP3HTu/OKMHlsbLGUZHjy3MyPwoA/UGpJpTGZc=; b=P2514nO/lq6I3J96LFH1Z/aywJEyJICZ5hHRCWkJL+0RLU/mZFTra9hXYIOxcjeUGF jxFK3XDSjfvS9zQcO9vh49PtSvQSo4/jJcANeS0Z8w30pteSXF8yLwHWjf0uTmo+7Q26 +pj2YsCbV3zGlg6IlhsVfioqHvX9xEu+7dhfFuJJKPI9qD39/eGV4mLEag7JqN/68gXe oBcZncP5uOQito005umZHZTIFgwf+uKE6ZTHroNzkg3GosF3kFe79ajP9fE0IebR7H9Q KPug0PJNCQleI97wjaoh/g9GxplrJTTtHWIMkmTfMehySVRV3TTaWIjdo2ILejenji78 fdYA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:subject:to:cc:message-id:date:user-agent:mime-version :content-language:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=lHYTvBP3HTu/OKMHlsbLGUZHjy3MyPwoA/UGpJpTGZc=; b=mGYIyb3Uqksnkcs9Glbd0vSZA8SV1jMjppV0JY5bdBVr+mBXReYQjkJjso6mHCQa0J ajYEz8Trzq1KIpIPrxeEctjr4Ip2SdiJPn+TfqrCSEwzeTUigE/bA7SkndIEiwTNit2k 6kA3Fvlo6ulq6Sz1mkVRHXsjmknxtXx0qW0PIDN4EA2a8MMqgcjBOXx7bXwZN7ZXPEbd av5dED965XoL3508e2pCD+zpU6uKw7OtxwokKRXU5i9v9Hrhwlf4o/OepREmdX8dS8mF YfOxavrJcG5QRE74ptDKBekq/si3XNamqZWQPjmjxNyVtDft3GOBXRuKbl6bhn8uNqAQ o85Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:subject:to:cc:message-id:date :user-agent:mime-version:content-language:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=lHYTvBP3HTu/OKMHlsbLGUZHjy3MyPwoA/UGpJpTGZc=; b=Balw4Lg9Gji01r+sbR78maeFCRW8dsQeXulDUT2hz9dywHUn0HraskIm+zjy+z7KCO sGJ4IzMaIxygUYL+/izbI5cAuqXVmVU/IcQHvtMZS7FdAmeChB99AzvDyRagD7HyWiT2 Tq0wu98/KiPsM+B3fI3Blusr80O2GunFhjla75m9X1r/+1KuToQJeYbKZVl4WQAEzPSg Jn5X9nuDmy64fLM/mg3VDy19Ept25U0EAIs0wGUT6CWBeTOq8Mato/27T8uWIhEAR/PQ E/w0SctkJuTyn4lkJIK7e4cTfEJn+kpQah6EWyLHpomubOng1Y9dX5NeVuNjql/uMbdc fv7w== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533Zs61XM30v77gNvAyQI6fPEFJhmHzadFT+wfi22/vvpmKBAmma hQd4I7EbMpYAAhzAySeVEeQ= X-Google-Smtp-Source: ABdhPJxVAUk819BeNobEc61HdNpRDU9ZKYRL5aHG8+zZbNY+Y0G9hJmvcPlhTbZdkB9CUmee82rlXQ== X-Received: by 2002:aa7:c5c7:: with SMTP id h7mr19011497eds.143.1606056480118; Sun, 22 Nov 2020 06:48:00 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:b5b:: with SMTP id v27ls4962500ejg.7.gmail; Sun, 22 Nov 2020 06:47:59 -0800 (PST) X-Received: by 2002:a17:906:4e4b:: with SMTP id g11mr20251795ejw.244.1606056479117; Sun, 22 Nov 2020 06:47:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606056479; cv=none; d=google.com; s=arc-20160816; b=KcjQse6PSGtoqLhxXjb9dFRU0dYSGikO1SQ9w06L97XENZZLo5WpBcdR/UAnAg1Iqa 8197Iilym58YXufwOlPt0y1nm6Ox00X6GcctLZk62S5P++Sa4F82mdshIc70jJpuV/nY 0C0LlSUv4wPvd/4Usp08ywMmeftZza90Sq+vaQd1VvOnu8dxtRAEeS3SCDKF9Xlsz/8W VlhhQNojWMLiUKraOOtvjDpRr6KqmgBaBz2iMjODBXzuhLpYnbd2NzYxweWmxxtftTJT z0LqrQKMLO6+4kw8zXMndhy7P9HkrqkFV+UWCVnfSeoP9kf5iJaNf9APu1Zn7OIBfq96 RrQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:cc:to:subject:from; bh=S8bp2mXBO44Z0sLDv59rPA6HXHQWsQTSGcHbgqrseE0=; b=Bg1zjYB9YzpPPXq5On0+OJqjQMUheobWhxarFrE70kjTbGlw3gmhwoV2+JoS28UtGv t9bVHTJ4Ew+MDqe9ow9h2KRIbZjuatgf61+wSoQT5gDjLbGp1r++GgF+gW7GA3GXo3Bf spG4b2DXzYS5O7PZZ8gwUujYRpFzdw7jXtSoK4/iX0d240rSXndhCz8g0n9eSzR+Xf4D QEzogNzAj2JlR5y/qBKLw7G6Gr4mPHJsiSyEYfgO1zTbBkJavZK9jvdr85ho4LW7Ygai COrAhOCeRCyohkUp4lprrv/7svpmBWdNcYZBDEKQpxVKiVFdaJNnrJ3zBzz76DBH6c9t A44w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id ck1si238931ejb.0.2020.11.22.06.47.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Nov 2020 06:47:59 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 0AMElwJ2003205 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 22 Nov 2020 15:47:58 +0100 Received: from [167.87.38.29] ([167.87.38.29]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0AMElvDA011297; Sun, 22 Nov 2020 15:47:58 +0100 From: Jan Kiszka Subject: [PATCH] wic: Remove racy python3 link cleanup To: isar-users , vijai kumar Cc: Henning Schild Message-ID: <978016c0-7cc4-f45d-4408-86b7b124af9b@siemens.com> Date: Sun, 22 Nov 2020 15:47:57 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 Content-Language: en-US X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1684072280120492040?= X-GMAIL-MSGID: =?utf-8?q?1684072280120492040?= From: Jan Kiszka When two wic tasks run in parallel, one can pull the carpet under the other by removing python3-native. We could lock everything but it's simpler to just keep the links around. They won't do any harm as they are only part of the buildchroot. Signed-off-by: Jan Kiszka Reviewed-by: Vijai Kumar K --- meta/classes/wic-img.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass index 2275ebec..bbf5dd8a 100644 --- a/meta/classes/wic-img.bbclass +++ b/meta/classes/wic-img.bbclass @@ -164,17 +164,16 @@ EOSUDO # The python path is hard-coded as /usr/bin/python3-native/python3 in wic. Handle that. mkdir -p /usr/bin/python3-native/ if [ $(head -1 $(which bmaptool) | grep python3) ];then - ln -s /usr/bin/python3 /usr/bin/python3-native/python3 + ln -fs /usr/bin/python3 /usr/bin/python3-native/python3 else - ln -s /usr/bin/python2 /usr/bin/python3-native/python3 + ln -fs /usr/bin/python2 /usr/bin/python3-native/python3 fi export PATH="$BITBAKEDIR/bin:$PATH" "$SCRIPTSDIR"/wic create "$WKS_FULL_PATH" \ --vars "$STAGING_DIR/$MACHINE/imgdata/" \ -o "/$WICTMP/${IMAGE_FULLNAME}.wic/" \ --bmap \ - -e "$IMAGE_BASENAME" $@ - rm -rf /usr/bin/python3-native' \ + -e "$IMAGE_BASENAME" $@' \ my_script "${BITBAKEDIR}" "${SCRIPTSDIR}" "${WKS_FULL_PATH}" "${STAGING_DIR}" \ "${MACHINE}" "${WICTMP}" "${IMAGE_FULLNAME}" "${IMAGE_BASENAME}" \ ${WIC_CREATE_EXTRA_ARGS}