From patchwork Fri Jul 12 06:56:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3682 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 12 Jul 2024 08:57:07 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f192.google.com (mail-lj1-f192.google.com [209.85.208.192]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 46C6v5xp021216 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 12 Jul 2024 08:57:06 +0200 Received: by mail-lj1-f192.google.com with SMTP id 38308e7fff4ca-2ee855d0761sf3409491fa.1 for ; Thu, 11 Jul 2024 23:57:06 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720767420; cv=pass; d=google.com; s=arc-20160816; b=yJnFovHN/Df7yM1g5RDt1J6+dmxQ8qfWb0IZG1fmQMW5FJdQ6lGx18ootR3MJYhHRa eB88fPVPj87kcrGeEhnMyTJ+zIowOjxyqrVtkcmsQkFmvTzSPFhWO2GzWM7wKqEDWefp 8QxdU+/fJg+1ekgSt1NIsr3DzxIqwrXGNMniwDQTTpvIXpz7CCn57fSYZ11TNcO54PPg 4pitkjReUp9M9JDbCyl1inBkU/7UvYzuT6Y6SorciP0bxpzQoUK5J0UlQkPVCFMtzVQ4 0YQy+ydB6wuPZQkFfHByf62kQc3Xkct51XnZaDP1oJDZSVObbr/mpSIXUwUOoOQGUSQ4 y7Xw== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=eVVYvjPVLy5uHMmrynMPmaye2cH9FZLvsKlOzNYyUaY=; fh=e5CHZb5JesFT72SHmm+R2T2SNQdnX2ozFmbwYwOFyWI=; b=gP+5L8dMig2UIFXX/X1NyfN26zU+lFPmBomNMhwUp2pFZM0NR4bd/YeMp8L2rb3ZTJ zF3sucljKzADTVxjcJfmi1LypYrPEQ70FZR1RYkDhsHUhhwoAm+atQB5KVDf5xC+6WQg 3503Mhl/Dl8oJT1/2JNa650TAhBZdgaSIvtMeSOWxn+eVm7Yx8A10u7FvBp2JkVgzU/I HhlPPHAJbJM759zt32PurYjoxUgMQ4lqVtU5oIIiMdul5TSjWjdIjtBRumB651Z569PF wki1YYFxPSe/wJVvZf6gGAH1nDBiN1Wt4OHUkEQTvx3crhN8rpVfl5hio59y9GKABxVx BLHg==; darn=isar-build.org ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1720767420; x=1721372220; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=eVVYvjPVLy5uHMmrynMPmaye2cH9FZLvsKlOzNYyUaY=; b=DCgQlAzXQtRJfuIf7J8kgM/lkizBn3tmCaEvaAFbUSlHbI00O9zfolz6j6gDdMKQ8i p32OUSaoKSoYEL+vp7ph/clF4uldaOPb2chcRUhrX2zKuDI8fKqXHquDFH/0wVYHLYpx CCxp+OJeVuUKDOa9NYXeO1H5GEkZbuA5TRmd2RaUm6X4I+oZfGtarViyaqd6pT7+L6wo jXWVhPM7MDauPYZ+oV2Is7c/kSOw68EzONI7oe2egtBFS0mzNs8yaxvLq6+mFBNRV7FS zjZ9KF+nriqWSyodpYf32jga9ivE4M3uaXYPuTtrUaoOxbibZcXA+TuR7hi64nWWYbD1 c2ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720767420; x=1721372220; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=eVVYvjPVLy5uHMmrynMPmaye2cH9FZLvsKlOzNYyUaY=; b=d1etYb/07ebmFKUd1EALG2kyMcIANNJTQEbP2/4nGZyaEyvuSXNOqHNJX42EQboFa3 Ru6SExR9nmgWDIQ0y1I2tF29eWA1ERN441GrKzLJrPXSifVCUGUQUugpgh3ghE/8M55r jzJsDVzHs2krIW8e33/D8JkmwaCVvZuEvBhdlb4Goee+KOz2KTqqHwQjyj5Ztg6AShKC uVLGXfZ13cwIpanB9SC46z3Zzn/oXZaY2mnLx2vjgdKPm9LK//GZIn0g57geRBNh4JiW Q0qBJDCEmcrLs9Llb4PxncFIoqMg0QGt06db7H0JmAcxkZFVMRb5AK5TCbBuyTWkKHeX 64cA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWinnlgkd1Zr+2z3RofCVRZ0Ls/opAkdpGGk44Awo2KU/tTVP9C8QRZ5qJNjFan+UwMQurAYt7LfDx5T2D/BIt/sW+GkhA= X-Gm-Message-State: AOJu0YwLv09TiUT8MCyvgtF6IxSbwsKG9Z8cpiH3KYJpG6qvsCh14TV4 6ssAMiZSU5GqBrBJNBfUHH3kt2pV86dBnJIHk9OL5vjCIykWMuSQ X-Google-Smtp-Source: AGHT+IEl6A8eH1Iyf4PAEdfdqoaKl7teI7gBeaLR7qPlHd0B6IClc1mjeixpos32V7vadUusF6xTOA== X-Received: by 2002:a05:6512:1597:b0:52e:be49:9d35 with SMTP id 2adb3069b0e04-52ebe499f1fmr4802595e87.4.1720767419993; Thu, 11 Jul 2024 23:56:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:5118:b0:426:ab3f:fafd with SMTP id 5b1f17b1804b1-427989fd568ls7182205e9.0.-pod-prod-00-eu; Thu, 11 Jul 2024 23:56:58 -0700 (PDT) X-Received: by 2002:a05:600c:1c03:b0:426:711c:6591 with SMTP id 5b1f17b1804b1-4279d9f2809mr13140875e9.4.1720767418374; Thu, 11 Jul 2024 23:56:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720767418; cv=none; d=google.com; s=arc-20160816; b=JeASlgFqc+mSkLDnKhAJ3kydb+fqbVmziQqlt1RGdPb4m+OdmCSf5Ll7T6VNB717XV FBD/DfzPwfbFDHszvTKemT5gCk6dtwR62f7Bown2RsdGfs+g2N1ijxdy4uuVWhr/ncTE h68mnBrbNl0EAtn693kVjb+uhdyEpGjfAq9Of93LceiVBWTRbzs9GPxeJqGzwmJhz2mi k3o3Be7aKWlAEzP+VTPuNRXaLi6xo5t5l//95KzqK4iXWUGPr/pBqBiZxtiixBehqHed ZNGGRJeeWeuUtlebUANGNtXppbPWxhG+nfSiGS8PIVCmjp08vkW9VTYPnNvYoyEZNMdH /MFg== 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=ecaq+TRuFwW8vGl8mVvKgUH+v63f0OcQ5fOuoJ6DuKQ=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=Cvj9bKOwq3r03MEAB/c6H94OnG0VvvnnXal5of5CnpD3W6FPGZEg17fwKU3s7l/MCP fL+oTStcFqx/1U90DSp3pSt4PELNo35RY9lbE1rfa0MPbm4r0saoAOaG5km4zsDbHb66 ipvRTB0VH0KxcMySrEjnMqGTNdJDHjheF6xAS9jgRcamhjZ7yb875iSbyYLMR79Y2B9G /bTu9Wyd6/EXUCsVBrWzotI7gw4m0jB9oKR1xwxl63Z1tAq/mk0egqi/ZU3T+B1zmL/U tOrUD+A4Ovx2RrZOFXmofe4/VEPqofNQXr5ImpzMnwo4ban6Oot5q3rKqiLQevDKoQ8B ZnUw==; dara=google.com 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-426725595b4si3390265e9.0.2024.07.11.23.56.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Jul 2024 23:56:58 -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; Received: from user-B660.promwad.corp ([159.148.83.114]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 46C6urcM021176 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 12 Jul 2024 08:56:57 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 2/2] meta: Cover bash isar-apt usages by isar.lock Date: Fri, 12 Jul 2024 09:56:46 +0300 Message-Id: <20240712065646.2156320-3-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712065646.2156320-1-amikan@ilbers.de> References: <20240712065646.2156320-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS 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-Original-Sender: amikan@ilbers.de X-Original-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 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: =?utf-8?q?INBOX?= Cover isar-apt repo usages by ${REPO_ISAR_DIR}/isar.lock to prevent any conflicts or races. Introduce lockrun.py helper script to execute bash code covered by fcntl locks in bitbake compatible way. It means the same lock files as used in lockfiles task flag can be used with lockrun.py. Key -r is used for shared locking on read operations. Usage examples: ${SCRIPTSDIR}/lockrun.py -r -f "${REPO_ISAR_DIR}/isar.lock" -c "true" ${SCRIPTSDIR}/lockrun.py -r -f "${REPO_ISAR_DIR}/isar.lock" -s < --- meta/classes/deb-dl-dir.bbclass | 3 +- meta/classes/image-tools-extension.bbclass | 2 + scripts/lockrun.py | 44 ++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100755 scripts/lockrun.py diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index 2d8739dc..55e56c50 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -90,7 +90,8 @@ deb_dl_dir_export() { export owner=$(id -u):$(id -g) mkdir -p "${pc}" - isar_debs="\$(find '${REPO_ISAR_DIR}/${DISTRO}' -name '*.deb' -print)" + isar_debs="$(${SCRIPTSDIR}/lockrun.py -r -f '${REPO_ISAR_DIR}/isar.lock' -c \ + "find '${REPO_ISAR_DIR}/${DISTRO}' -name '*.deb' -print")" flock "${pc}".lock sudo -Es << 'EOSUDO' set -e diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index 46bdf78b..e8ace8f5 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -46,6 +46,7 @@ imager_run() { E="${@ isar_export_proxies(d)}" deb_dl_dir_import ${schroot_dir} ${distro} + ${SCRIPTSDIR}/lockrun.py -r -f "${REPO_ISAR_DIR}/isar.lock" -s <