From patchwork Tue Sep 13 14:26:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12793 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30CAAC6FA89 for ; Tue, 13 Sep 2022 14:27:10 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mx.groups.io with SMTP id smtpd.web08.5355.1663079222046425186 for ; Tue, 13 Sep 2022 07:27:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=cxe+85es; spf=softfail (domain: sakoman.com, ip: 209.85.215.179, mailfrom: steve@sakoman.com) Received: by mail-pg1-f179.google.com with SMTP id t65so11494855pgt.2 for ; Tue, 13 Sep 2022 07:27:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date; bh=j+u4sAjOX9PEBqwDBHmdM5EDZd8BjQNL8LsN/zLAZxM=; b=cxe+85esF7KKAioCdgZKhWMDS0iarakC8/3XT0RmH8LDDu3sJMbv/LOzae4QxXx0BY M+FnA0MhA492hQlyYHndp7/dKPvmalQv/+5NXqQwBxXT7unYPxTEtOWsny8IkOg/KEjE Vyi5W77BG+WqeeZuh1cBu+EQNJnTZngjsf+178/KUc1vpDlqM9NOB9BhAYsNLplXke+Y SruiAedQZQoIXKR0wq4Bob/CdyiuaUhgVnNGlpH21hOEkUctKUQGYzExZKrwCXo69Seh MjtJEHwdkjyZE3kwsiE2bXLMkJ4Y1tNkl9bUOg+m4tnqcLHwGrhRTLhzGTAX3w2t1qR4 UPgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=j+u4sAjOX9PEBqwDBHmdM5EDZd8BjQNL8LsN/zLAZxM=; b=Yr+1y20oBdqc6JVE7JcQZ7oxi78ZhbrK6pqQOsSXrhSsXwKYHf0q+LLTEhhYDinn2g 79Dt0zJowK3cnnOzQkO1T2xUDhWuDkhswgFvTLI+aHDSN1bUxWu1AWXofpT4zwsGlHBH kc/XqZNdiRDnR9ICfqOrjfJsySQ9Sp12dx/E9ig2zJ+b9khUJnxzWqmSOoo3maWqq+ni 6NCvVCt0vadBTxmLKZ7mipnIISGdhH/ITer0fKlx5aVT2LgS/mVMxTeaZtXZqWgWpG// r0JJyHB9fPkyvX8dYdy2L+awT8KRVDlpRqmhyQR0dkenb8MfaiI1pfAjIYYNquVjseUT 302A== X-Gm-Message-State: ACgBeo01Wgki/ol/tw0uGUuyzEmRpLko3kA2R0Zx5ujDGkZllFJi6JsK 3guwkcGjtDeggH8sXsw/8ZAzdgvqNpdAcOrl X-Google-Smtp-Source: AA6agR7iKsp/ZhgZBhl2MLHkX1TlLrvwypZZdRrQ5wp2CsXmxnnG30mmDqaXtcsA3wcB0CKZt/pBvQ== X-Received: by 2002:a63:d94a:0:b0:412:6986:326e with SMTP id e10-20020a63d94a000000b004126986326emr28465498pgj.56.1663079221018; Tue, 13 Sep 2022 07:27:01 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f196-20020a6238cd000000b00540de61c967sm7840286pfa.201.2022.09.13.07.26.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 07:27:00 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 01/14] runqueue: Fix unihash cache mismatch issues Date: Tue, 13 Sep 2022 04:26:31 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 Sep 2022 14:27:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13962 From: Richard Purdie Very occasionally we see errors in eSDK testing on the autobuilder where the task hashes in the eSDK don't match what was just built. I was able to inspect one of these build directories and noticed that the bb_unihashes.dat file in the eSDK was zero sized. Whilst inspecting the code to understand the cause, I noticed that updated hashes are not saved out in subsequent updates of the values in the rehash process. Add a missing sync call to ensure this happens. Signed-off-by: Richard Purdie (cherry picked from commit 7912dabbcf444a3c3d971cca4a944a8b931e301b) Signed-off-by: Steve Sakoman --- lib/bb/runqueue.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 7eea72e6..111dc0ee 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -2381,6 +2381,9 @@ class RunQueueExecute: self.rqdata.runtaskentries[hashtid].unihash = unihash bb.parse.siggen.set_unihash(hashtid, unihash) toprocess.add(hashtid) + if torehash: + # Need to save after set_unihash above + bb.parse.siggen.save_unitaskhashes() # Work out all tasks which depend upon these total = set() From patchwork Tue Sep 13 14:26:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12792 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3815CC6FA8A for ; Tue, 13 Sep 2022 14:27:10 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web08.5352.1663079218165494293 for ; Tue, 13 Sep 2022 07:27:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=6om15ikn; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id c2so12007596plo.3 for ; Tue, 13 Sep 2022 07:27:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date; bh=CSnjAqQr4tSeG4hTXr4Ix8paO9n4qOx7CWvCqrDHrXM=; b=6om15iknz1XHhGIOxY5dI/PfniGwcd1Wmyi4M1pwK8g1VI/aUabG+SJKWvbhoigT42 WfDvjO190jPLN4btAAo/cqBVNwjYN/s4PTT3cUvyDEaDz1HiMA5K7lcdDz7NZOMxYaBQ ngHsCtHjR5eeXw7xKC1mdJUfidv+YSFMKB3p2mmqnLU1kDbd5LCVC//08wq05Z55d8Bt ai3sZYv2CK+bbMvLQGDW3nt2Tkb0ZXpicsU4/7Np2tdgg5DOhXKkDMsCGBbl1MM1DADD FVgj5Ki86KwdZI6ABd/3XC8Y0qqp26KB8rpxqTDzsYtLThmSiQf0dH1I+YuUh45EaiSv cMRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=CSnjAqQr4tSeG4hTXr4Ix8paO9n4qOx7CWvCqrDHrXM=; b=xMakZsefZHtNSzcOWnU2ktTtNJ/Hrh5VTtvmvZYVUd7NHEStGwDwaNmXjZLTx/AK30 xlWM4ER+uuWRd5padhR4KtoRTFOFf3QkFUU0qUYDjkNdAae8OX701quJi7QTmcpJvu9a +151cF853OjYgCLnyfknmV01w2b7fDs90CpPBhLjMUDdk1Z9F7xUsmlk5LrwLZK6RASq Jwpq+N+7rpbm7KH6LSsmJocLbmKneULkkQS3PyJibXfumdJe0Fn5QRefp7omtELb21Er 3yfDIKJ2nPnZC+Rw7Dj3UVAYTMNGfyG0FsiyNRcAnYSD9Hzx5RriaeIylZGXg7r26FkN 8l3w== X-Gm-Message-State: ACgBeo1iZb7X2OXWvpk+oJ69lYyOjgydfmWyHeUSYq3/vb77AlLw5YGu mWeghFPOT6hNEPnrmqNam7rYWPn4+mJ1aIjn X-Google-Smtp-Source: AA6agR61wbT8PPmUJ+BniL4bl96leFaSAr/vH/U8Vw7t3INw68F9Xv9TSKqHXZittouHZf9g5gZABA== X-Received: by 2002:a17:902:f64f:b0:172:a790:320a with SMTP id m15-20020a170902f64f00b00172a790320amr31867771plg.149.1663079224457; Tue, 13 Sep 2022 07:27:04 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f196-20020a6238cd000000b00540de61c967sm7840286pfa.201.2022.09.13.07.27.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 07:27:03 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 02/14] cooker: Drop sre_constants usage Date: Tue, 13 Sep 2022 04:26:32 -1000 Message-Id: <03e1622c2e73eaefd15b762971dd23acfdef5e62.1663078873.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 Sep 2022 14:27:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13963 From: Richard Purdie As reported by Martin Jansa : bitbake/lib/bb/cooker.py:16: DeprecationWarning: module 'sre_constants' is deprecated import sre_constants it's deprecated since 3.11 with: https://github.com/python/cpython/issues/91308 The correct replacement for our usage is re.error so use that instead. Signed-off-by: Richard Purdie (cherry picked from commit 3c0cd401472ffee06d5a93bdba566cb033851fcf) Signed-off-by: Steve Sakoman --- lib/bb/cooker.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 6da9291f..2adf4d29 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -13,7 +13,6 @@ import sys, os, glob, os.path, re, time import itertools import logging import multiprocessing -import sre_constants import threading from io import StringIO, UnsupportedOperation from contextlib import closing @@ -1907,7 +1906,7 @@ class CookerCollectFiles(object): try: re.compile(mask) bbmasks.append(mask) - except sre_constants.error: + except re.error: collectlog.critical("BBMASK contains an invalid regular expression, ignoring: %s" % mask) # Then validate the combined regular expressions. This should never @@ -1915,7 +1914,7 @@ class CookerCollectFiles(object): bbmask = "|".join(bbmasks) try: bbmask_compiled = re.compile(bbmask) - except sre_constants.error: + except re.error: collectlog.critical("BBMASK is not a valid regular expression, ignoring: %s" % bbmask) bbmask = None From patchwork Tue Sep 13 14:26:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12794 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38194C6FA8D for ; Tue, 13 Sep 2022 14:27:10 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web10.5454.1663079228309533411 for ; Tue, 13 Sep 2022 07:27:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=wcH1r7QM; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id iw17so12035898plb.0 for ; Tue, 13 Sep 2022 07:27:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date; bh=wTqbrbFqKaVkZDTJExhPxjsa4511DYnC8E/9s7JLyx0=; b=wcH1r7QMmwIKWRPAHnb7Ah2Pzypj91HsJbpiJXIb/0WedSQ4AGX2+A/M75QpzXoBJO 7jtBmgsTWa49O22RfoRV+qCYclG66+Ey4T6AOLlA1NN4uYodyHydv+I7NSuDqofuDh1U +Q6WKGrKHl3jmnz0YdzYkORetFDTTsKFTzcYc19dQWANx34HkeHz5w6fD51ZBIsA7ZzK bKO/6gYIJZKQFOm9EnbThprVupbLj/C3gLbTn5LVt9VpG/KsRVykwhyz3C0IMoz0tOp2 5t54u3eOxb/y3klodWPpcsBlEx3Lafx79YxL6pI2T5704BgbuZxtsaBhWPPDRYpvFYvE CuDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=wTqbrbFqKaVkZDTJExhPxjsa4511DYnC8E/9s7JLyx0=; b=R0hzvNuPiH55lFnWyNzEV7n6ry4EzUYQKUxUF8PmIHcHJJ5kRScgCFC12B3fUtPHaN jrZt2GfVRagtWfXqt5P19+9QaT34tJJGIlnnz7Pf0rja/JZTLnMPWuYz7OZscJgb0QqC lU8FTkyvV75mSQtj0cnjOJW7Ltv2U6jEzu30mNeNJq1dOKw49XvU++ZxVXZKLbhklRzp HoGzAiweZ0+3CN2tc/bdn6AKITdLtP99RXLfIiJqmzV/cwNl4kOt8PUxlfhRngufvPOV K2aAgjsXL1ERwYPuwFFWdZfnH6VZVQi1zSZowBb6E6mENZa/ZWAxHjIJZtdy3VZPBJxs NlPA== X-Gm-Message-State: ACgBeo3bHj0yVHlzvhVX3ACewbLJaxrGuUEyJXS6SJNvgBH2NIhrTg8E Txcbvr5MoTXjdN+hLeGvcHKYBzvMApaDON0n X-Google-Smtp-Source: AA6agR6/iteuwJercBAHpHDikjbAo+wcoEyD42Uhq4m6expMMiKH03rVIYENGJPl+LqxaNX6G97ygw== X-Received: by 2002:a17:90b:1c8e:b0:1f7:5250:7b44 with SMTP id oo14-20020a17090b1c8e00b001f752507b44mr4306354pjb.212.1663079227289; Tue, 13 Sep 2022 07:27:07 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f196-20020a6238cd000000b00540de61c967sm7840286pfa.201.2022.09.13.07.27.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 07:27:06 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 03/14] event.py: ignore exceptions from stdout and sterr operations in atexit Date: Tue, 13 Sep 2022 04:26:33 -1000 Message-Id: <0cfb6c219333b6ad8a9a21185c6c506209c3cce8.1663078873.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 Sep 2022 14:27:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13964 From: Mikko Rapeli When atexit functions run, stdout and stderr operations may fail, e.g. when output is piped to less but has been exited by the user. This removes error print from output of "bitbake -e sqlite3 | less" if user presses "q" before bitbake has finished processing: [Errno 32] Broken pipeError in atexit._run_exitfuncs: Traceback (most recent call last): File "/home/builder/src/poky/bitbake/lib/bb/event.py", line 135, in print_ui_queue sys.stdout.flush() Signed-off-by: Mikko Rapeli Signed-off-by: Richard Purdie (cherry picked from commit 35167536c163eb6b7653cbcaad9f65b834d3e2f8) Signed-off-by: Steve Sakoman --- lib/bb/event.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/bb/event.py b/lib/bb/event.py index df020551..97668601 100644 --- a/lib/bb/event.py +++ b/lib/bb/event.py @@ -132,8 +132,14 @@ def print_ui_queue(): if not _uiready: from bb.msg import BBLogFormatter # Flush any existing buffered content - sys.stdout.flush() - sys.stderr.flush() + try: + sys.stdout.flush() + except: + pass + try: + sys.stderr.flush() + except: + pass stdout = logging.StreamHandler(sys.stdout) stderr = logging.StreamHandler(sys.stderr) formatter = BBLogFormatter("%(levelname)s: %(message)s") From patchwork Tue Sep 13 14:26:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12797 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 339F4C6FA82 for ; Tue, 13 Sep 2022 14:27:20 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web11.5257.1663079231112855644 for ; Tue, 13 Sep 2022 07:27:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=IvwqiRKx; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id q3so11484015pjg.3 for ; Tue, 13 Sep 2022 07:27:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date; bh=A8ec0QVMnyBmVjf/L9T6ekHB8tq3Eo4Bc86WJ7hh7Nk=; b=IvwqiRKxVUmgg9BL81WuG5DjuHmnlz8Wy0qm9tfToAeV9JlN9BxFj5ge/rFXsTtKwT u8S1Ts6Dj+In/pk5YhkEJHsYTJWbgSfkNjCp0Gz3ZOqvlt47f7c1ug/LzMnGP+Ec9CTM DLF+Wo9COMF4WA+jof4gz7xahKaPeaJImAV10VoxLPGxUCF6Z+72CagPCGAtPGLGxa/0 rLC9HyjB4dt9Lvnf2GbcmWyMwKTQiN9QI6K0vjC6JaEBo5Zncb9AFCJVAwnCNLfTp7SC nhiTlOms/YHRgwt2NOCZXyYbXa9HDPSoQ1loRAiB6KdeDE5vTiWS5RAjnY3slqW2VT4d TX+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=A8ec0QVMnyBmVjf/L9T6ekHB8tq3Eo4Bc86WJ7hh7Nk=; b=hYOYq7o1SJ7/D2BMqfZn+HWkZefmXdpwWEnl90Hr9V+SPPm9cU52vT7uFAwUCpn2Uh YEjRdQG8ZTQZn+a2vL62r81HTH5FY3jmztoWal8k4Nl17rIrHY9XcrwM3wSYTARKaNjm bu9rhIdEo1A0D+SLh230tKXyLMux5Rt2bjTzzTerQ+SaSOMn73b6iJczEHa6Pammg5zd XeSGiZXHksDiD6iCdOsxbK5V9tX2hJQNSjlK56cY0P6iInvIYT/EBE9EHY2yER9RJ3gA RlYNh7SYN1ibfW5WRhwfwR+YjKwLUO8+yf/4ffqc+VRPcCDsd9DdQKv0mrkP/E5vNm4h A9IQ== X-Gm-Message-State: ACgBeo0suOYlEnIqe74/MQwQy8ImuABKRHomuxT90X1yguq2jbH9TkQJ l1gDain7lRhZKt5Peyfkf3lUl8GChFWSS++/ X-Google-Smtp-Source: AA6agR6t0sTEMTMadSu+romeq9y4vxMi5wow6RRqgPQNh/Hpy2RFzLnKqNXqtYihsDp6qEXQlS+yzw== X-Received: by 2002:a17:90b:1b10:b0:200:934b:741f with SMTP id nu16-20020a17090b1b1000b00200934b741fmr4362361pjb.212.1663079229908; Tue, 13 Sep 2022 07:27:09 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f196-20020a6238cd000000b00540de61c967sm7840286pfa.201.2022.09.13.07.27.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 07:27:09 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 04/14] ConfHandler: Remove lingering close Date: Tue, 13 Sep 2022 04:26:34 -1000 Message-Id: <67f46734f5e8c095548ce7aa854e7ea8e8e3a004.1663078873.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 Sep 2022 14:27:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13965 From: Ola x Nilsson The f.close() statement should have been removed in 459ad524756a3f9b50feeedf31e33502dceae8d5. Signed-off-by: Ola x Nilsson Signed-off-by: Alexandre Belloni Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 9fc1bab6b7e3c0fca3ddec4bc8c7763d2aff8bab) Signed-off-by: Steve Sakoman --- lib/bb/parse/parse_py/ConfHandler.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/bb/parse/parse_py/ConfHandler.py b/lib/bb/parse/parse_py/ConfHandler.py index b895d5b5..810b6011 100644 --- a/lib/bb/parse/parse_py/ConfHandler.py +++ b/lib/bb/parse/parse_py/ConfHandler.py @@ -147,8 +147,6 @@ def handle(fn, data, include): if oldfile: data.setVar('FILE', oldfile) - f.close() - for f in confFilters: f(fn, data) From patchwork Tue Sep 13 14:26:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12798 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F1C2C6FA8B for ; Tue, 13 Sep 2022 14:27:20 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web08.5358.1663079233557791317 for ; Tue, 13 Sep 2022 07:27:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=qPChgcGR; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id d12so11989320plr.6 for ; Tue, 13 Sep 2022 07:27:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date; bh=6U0Uc1Yn5PeWX+SOZ0pogOyiVwBHi7XslDZY8U3gnY0=; b=qPChgcGRpAPnVYpyfWBif3dYQHRdMn4s1jnEKV04Qo2VUHiJtRmEOJtNTaNO7pbOkY vsFzhzMsbBkoJ80L8rMH9FshFtW0GD9v+c0Ug4UUrqsEnqV59fYvjdGuX0ri5aXe+65D jyQ5/tSXNtmcv32sWrH5yNCeTqzAgQQlqKZdfa0bnRFS8t5YY4nJtu9iOJUHJRkJj2pT dvpv0j9jXjEUfxJBVzT5OUUn0xugkZeUjDznHNBPwhySdnNI5E277DIU7qig1wnnoh4M FRkbafv2ODNFyZBu6vrpF9Vv2i+5vKoMwewcqB/229Yph3fgnpQ1kIeqMIHYk5Rilasc nX3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=6U0Uc1Yn5PeWX+SOZ0pogOyiVwBHi7XslDZY8U3gnY0=; b=3KIDvcAEi8cGb2dHFQgvI/lYXlCFVa26HA2gX4gyiKjAEDZsyMzWme7CZvDztFmfSC NCHdPM6MiIF7+10rVLpuRgnA0+mxsy0QA4FiLbfb+yQOnwVdPXmdpypSfEXAwULARDk7 aGDUT+j/xFh/kmBAJ0FyPPPjSZX6EdOkTBFIZ/JzKuZ/o/8+2Deqgv5Lw8W8nhA49WB1 /Mogn4UqIvLGuJ46ozivOx2/ahYz2AnGxb1w2e8tmp7nkZsNGUB5qkrpbtG31EZPwnzQ v3w+VDoE15qUsmLSayvhhgBUPPpU4sal8Jd5VkKvzclHaMSadk7zWJor66rP7HnrEZoh 97nw== X-Gm-Message-State: ACgBeo01DQbUF8q4pi6VfrM2ANhk2O/zBjUVFOGkP63KM+7Q7pyhTSot WRVVoVH9S0KiE/YhiH/rT2p6sUtog41jYBDq X-Google-Smtp-Source: AA6agR7k2wWKuaGLt8rtkrKsNN0PhBEtmxSxTLaw4ZnwQiwR95xJmI/6QYq+YdsBdpBWkjB1nu+Nng== X-Received: by 2002:a17:903:32cc:b0:178:41c1:2e41 with SMTP id i12-20020a17090332cc00b0017841c12e41mr5573383plr.126.1663079232511; Tue, 13 Sep 2022 07:27:12 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f196-20020a6238cd000000b00540de61c967sm7840286pfa.201.2022.09.13.07.27.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 07:27:11 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 05/14] bitbake-user-manual: Correct description of the ??= operator Date: Tue, 13 Sep 2022 04:26:35 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 Sep 2022 14:27:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13966 From: Jacob Kroon Stating that the assignment is done at the end of parsing is misleading. The weak default value is the value which a variable will expand to if no value has been assigned to it using any of the assignment operators. Signed-off-by: Jacob Kroon Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 8189f58d0449d16f162b6e8d98c4e5edc6bff875) Signed-off-by: Steve Sakoman --- .../bitbake-user-manual-metadata.rst | 55 +++++++++++++------ 1 file changed, 39 insertions(+), 16 deletions(-) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst b/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst index af4b1358..33782161 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst +++ b/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst @@ -195,22 +195,45 @@ value. However, if ``A`` is not set, the variable is set to "aval". Setting a weak default value (??=) ---------------------------------- -It is possible to use a "weaker" assignment than in the previous section -by using the "??=" operator. This assignment behaves identical to "?=" -except that the assignment is made at the end of the parsing process -rather than immediately. Consequently, when multiple "??=" assignments -exist, the last one is used. Also, any "=" or "?=" assignment will -override the value set with "??=". Here is an example:: - - A ??= "somevalue" - A ??= "someothervalue" - -If ``A`` is set before the above statements are -parsed, the variable retains its value. If ``A`` is not set, the -variable is set to "someothervalue". - -Again, this assignment is a "lazy" or "weak" assignment because it does -not occur until the end of the parsing process. +The weak default value of a variable is the value which that variable +will expand to if no value has been assigned to it via any of the other +assignment operators. The "??=" operator takes effect immediately, replacing +any previously defined weak default value. Here is an example:: + + W ??= "x" + A := "${W}" # Immediate variable expansion + W ??= "y" + B := "${W}" # Immediate variable expansion + W ??= "z" + C = "${W}" + W ?= "i" + +After parsing we will have:: + + A = "x" + B = "y" + C = "i" + W = "i" + +Appending and prepending non-override style will not substitute the weak +default value, which means that after parsing:: + + W ??= "x" + W += "y" + +we will have:: + + W = " y" + +On the other hand, override-style appends/prepends/removes are applied after +any active weak default value has been substituted:: + + W ??= "x" + W:append = "y" + +After parsing we will have:: + + W = "xy" Immediate variable expansion (:=) --------------------------------- From patchwork Tue Sep 13 14:26:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12795 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37577C6FA8D for ; Tue, 13 Sep 2022 14:27:20 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web08.5352.1663079218165494293 for ; Tue, 13 Sep 2022 07:27:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ySVUY3vi; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id c2so12008059plo.3 for ; Tue, 13 Sep 2022 07:27:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date; bh=iVEo5Us/UvqE3fmPj9izE9wO1PybLxx93D7enT+A78Y=; b=ySVUY3viM4p9nqUTlCTBZdOtxfAPt9K0k+v/h6JIgBzYv7V+XZyztpdEN3zHZKhTNh hXgoCVRzFdvMgLZb9tY6pkzI7BvMZXo8nRYr+aiiSge8F413hs1y9LsKa3UxSRNx7qKz CYw7z7hqT/WEj1/axGPhFr/1k/2h3KBt3oDkaYvhkEplbSPGQrgfj+mkX/cjrLArgM8N 7YlTatrVOq4UqrMSnACi6h4DKk4MLjkfqatMeLOybGtXYliuEYxyMtcdHchpcRojEOhW 1rxhkRFRlIvZWPyGFk1bbCycORWHpyLLiZP9Tv439bJQZqwxemhxpV+0wbR+MWiOQBiq Vakw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=iVEo5Us/UvqE3fmPj9izE9wO1PybLxx93D7enT+A78Y=; b=WemygbxeO5LgQpvc1fcjZk/j2Q0TV7x3EyB8mLzfSl2PCFx23NQmNOaBgb9BjNTWpx qJvCsfW4/WhAhyYXSmXNd/rbLkbknK6IfADn4J2xAVjxtVEKUl49eWdQbS/5zjPRTucp llhZnGPILXoCoVVmqgR7ms0hoWG4FNjF143PmKdbq5iExmsKvuwv8MZvb2kwmBFAXzJ2 ZMk1OhoZrgcdcatswyqxoYCVcXP4pIUrzaUpZ+Hzrl9T2cBwMai/+cJw5DvSeCmt8kPm /N5r9Ok9xbq9jMb4+B3SMofJryL8BrMhSf3swSsKdUedHdCjC31+RKXIviYGNbJpz4Tb K80g== X-Gm-Message-State: ACgBeo1JgEQEL6KrjlxpIqmdFs7fAr//LJ2wSe0T+LZSrsjcN9g4ANpA /S3/mnMdv2WrZau4Fv/reJPoM/1L6OC9U/GV X-Google-Smtp-Source: AA6agR6KzBdOzDzUjMJeu8kBdy/IXNSSA+LUHcS83iW2y/Pg30NdAcBz07eF2LkEPPv+0W8+i4sG0w== X-Received: by 2002:a17:90a:4fc2:b0:1fb:3486:7b3d with SMTP id q60-20020a17090a4fc200b001fb34867b3dmr4385131pjh.49.1663079234915; Tue, 13 Sep 2022 07:27:14 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f196-20020a6238cd000000b00540de61c967sm7840286pfa.201.2022.09.13.07.27.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 07:27:14 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 06/14] doc: bitbake-user-manual: add explicit target for crates fetcher Date: Tue, 13 Sep 2022 04:26:36 -1000 Message-Id: <17bcc3e3eb45bfa2ff88002f300fa0d2efd9cb80.1663078873.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 Sep 2022 14:27:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13967 From: Michael Opdenacker Like in other sections describing fetchers Signed-off-by: Michael Opdenacker Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit c9bab35f6aecbf85ee1a19a7b70e15a80b42471f) Signed-off-by: Steve Sakoman --- doc/bitbake-user-manual/bitbake-user-manual-fetching.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst b/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst index f9d9e617..ea8a8aa7 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst +++ b/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst @@ -688,6 +688,8 @@ Here is an example URL:: It can also be used when setting mirrors definitions using the :term:`PREMIRRORS` variable. +.. _crate-fetcher: + Crate Fetcher (``crate://``) ---------------------------- From patchwork Tue Sep 13 14:26:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12796 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 373B2C6FA8A for ; Tue, 13 Sep 2022 14:27:20 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web09.5464.1663079238452346540 for ; Tue, 13 Sep 2022 07:27:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ldYoj0Uu; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id l10so11988966plb.10 for ; Tue, 13 Sep 2022 07:27:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date; bh=+8g8k4aGB5h5nH+/V9CltFxlo1WEQD0HNcKu8PVaR18=; b=ldYoj0UuZXd0iLy2jrXWPI2cUWh+bmEk2GSGduDECLkW8bxzG2n1OjggQIUi8uCJ5I +pPCFO3yu3X+jKtBVnKxZm/9sLrYS09ydRtLqdES6jI2msymtGwRnLGMR/ns6ekQWX3t UN7FC+NbdwU0zZ4UdsPX1QGp2zRRRXIysmONBRwRs2Ide2sm7nZGdaySonQu3PQp97ky adPiH0zxKkyZMj+FZQiO9vl70H4eq+rMjjHzT2/WfwnddM3ZZaUSi6oNCC5C1fg9pwsE 8EjikFlIIVCXcKW2sHXfFZkAJSm096DB30aBs3aeTpugaQh1afi/v/vO4ttuIcHaH/p2 8Gug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=+8g8k4aGB5h5nH+/V9CltFxlo1WEQD0HNcKu8PVaR18=; b=NOjICMV+k1PF5ynrS7sDA92VXE0uNkgfTyjVn7LAg1OWGEHkakobZQZ2mJlYZUqG7R BTJDSz8eE4RfPCuAitl4oywWmwB+RedEC2DhzP2pxsU6U9XE+DR8dEp9LXuC2z0gpI2i 3XCOja/yMgrhaRYwv7HVp/DJtWRLeU6YZnZqsiXKHoxeJg+LlzkuFO6bUmI1jTHy2VhA lRmSHWotfq3nnjx+NC6Pzv2Ska9ucTeDRL/XJU8tPy7pjziqMOJUU7coi9YAqsb4FvtK CcKAYkzokBUbdpwrKX59YLdJUhdPXT7AOezSz0NPi5wa0Y1KLla6aYXzSlDQm9EVtRz6 WpqA== X-Gm-Message-State: ACgBeo3u2wFAs5SD5Uw7CKycd/1bKiyuuQ9uaFc743zaXGHpDHeLLVbm YcKcYjdrb1vkKWZ93QJU4dYJrcEeXnSiV3d6 X-Google-Smtp-Source: AA6agR7/YrDU7eZXooFmch1P++BRHOix/2Wk6jNnfr+4L9Sp7ECnr08WFEg4NPiuXUrtRN3kZfd0bQ== X-Received: by 2002:a17:903:11c9:b0:172:6ea1:b728 with SMTP id q9-20020a17090311c900b001726ea1b728mr32053417plh.95.1663079237214; Tue, 13 Sep 2022 07:27:17 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f196-20020a6238cd000000b00540de61c967sm7840286pfa.201.2022.09.13.07.27.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 07:27:16 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 07/14] doc: bitbake-user-manual: document npm and npmsw fetchers Date: Tue, 13 Sep 2022 04:26:37 -1000 Message-Id: <79bec5d23116c85724a98e59c4ebfa33a1b57dd3.1663078873.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 Sep 2022 14:27:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13968 From: Michael Opdenacker This addresses bug [YOCTO #10098] Signed-off-by: Michael Opdenacker Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit cca7999586317435d79bf53df4359cdd8bfadff4) Signed-off-by: Steve Sakoman --- .../bitbake-user-manual-fetching.rst | 76 ++++++++++++++++++- 1 file changed, 74 insertions(+), 2 deletions(-) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst b/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst index ea8a8aa7..4dfb7889 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst +++ b/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst @@ -706,6 +706,80 @@ Here is an example URL:: SRC_URI = "crate://crates.io/glob/0.2.11" +.. _npm-fetcher: + +NPM Fetcher (``npm://``) +------------------------ + +This submodule fetches source code from an +`NPM `__ +Javascript package registry. + +The format for the :term:`SRC_URI` setting must be:: + + SRC_URI = "npm://some.registry.url;OptionA=xxx;OptionB=xxx;..." + +This fetcher supports the following parameters: + +- *"package":* The NPM package name. This is a mandatory parameter. + +- *"version":* The NPM package version. This is a mandatory parameter. + +- *"downloadfilename":* Specifies the filename used when storing the downloaded file. + +- *"destsuffix":* Specifies the directory to use to unpack the package (default: ``npm``). + +Note that NPM fetcher only fetches the package source itself. The dependencies +can be fetched through the `npmsw-fetcher`_. + +Here is an example URL with both fetchers:: + + SRC_URI = " \ + npm://registry.npmjs.org/;package=cute-files;version=${PV} \ + npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json \ + " + +See :yocto_docs:`Creating Node Package Manager (NPM) Packages +` +in the Yocto Project manual for details about using +:yocto_docs:`devtool ` +to automatically create a recipe from an NPM URL. + +.. _npmsw-fetcher: + +NPM shrinkwrap Fetcher (``npmsw://``) +------------------------------------- + +This submodule fetches source code from an +`NPM shrinkwrap `__ +description file, which lists the dependencies +of an NPM package while locking their versions. + +The format for the :term:`SRC_URI` setting must be:: + + SRC_URI = "npmsw://some.registry.url;OptionA=xxx;OptionB=xxx;..." + +This fetcher supports the following parameters: + +- *"dev":* Set this parameter to ``1`` to install "devDependencies". + +- *"destsuffix":* Specifies the directory to use to unpack the dependencies + (``${S}`` by default). + +Note that the shrinkwrap file can also be provided by the recipe for +the package which has such dependencies, for example:: + + SRC_URI = " \ + npm://registry.npmjs.org/;package=cute-files;version=${PV} \ + npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json \ + " + +Such a file can automatically be generated using +:yocto_docs:`devtool ` +as described in the :yocto_docs:`Creating Node Package Manager (NPM) Packages +` +section of the Yocto Project. + Other Fetchers -------------- @@ -715,8 +789,6 @@ Fetch submodules also exist for the following: - Mercurial (``hg://``) -- npm (``npm://``) - - OSC (``osc://``) - Secure FTP (``sftp://``) From patchwork Tue Sep 13 14:26:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12799 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 380E7C6FA8A for ; Tue, 13 Sep 2022 14:27:30 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web10.5461.1663079240676361703 for ; Tue, 13 Sep 2022 07:27:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=uP9YsjLi; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id b75so6690634pfb.7 for ; Tue, 13 Sep 2022 07:27:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date; bh=4q+21DAOjF8kMoYjP0/X2MrRB7sqDfyCY7Y3L6Wimq4=; b=uP9YsjLiwSqO8C0WSs1LiWXMz7hce7XvH0a9b/jLC2jsOYC7v9c6qBN4FwlLUtH0Nv o5623w28msb+0jGouKakoeS7zlwEfv3wHb8oBDUw35VlxLXVehaf3JsLAzmcDyCvKtzK hV3Ehenmak8w9JkhVSDEkyBK822cSLqnsDepNh+suUDVcneq468ZZgQI0M+P/QQGHIal MEyAf0+zleuzl1byCZjYJJ9OS/ZQWiYlBTuOn5PUc70Ufab4OQH0lKUzylCw53yPa1gf CtAtc8MvslKljPrKiBB7Lw9xNP2aCmUHtQBnE0aIlt0/tcaWZmApcgG8z+W+eImAOb7M 17ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=4q+21DAOjF8kMoYjP0/X2MrRB7sqDfyCY7Y3L6Wimq4=; b=cfMatb5oMuXvfOc536o52G6Ik/MB3McCfzF+GouWy5cpro4XC8xe1+aZwkCE6gqC5v TmESGI1h9E0VP4qE5TUyIMj6PdCS4jfNncg7Gwyesl7+F9OJ6UCgqA8jJPOdNFGr9MT6 y7lU2a49DnGx2r8BN9LQlknql/stC1ZKmoy7qZM1cNoaazLbGk9mWNp9Dgwj/wHpAMIz khTOYU/pSnv39umFXcVSuTGf4UHmBRWg+eASXxs9LQQPNSsdzkCIlaZBbC1a+PXHqzo/ 9xQgK2DqVMi7Gzsn9M7KY67PWkIoOnY//kBYCuPPBA6JmuhlmSEsr9S6w+7b7XHzdQl8 vaCw== X-Gm-Message-State: ACgBeo1Vh7Az2H7/94gubcc8i8N8P5vQbyMggHWwV9rRQPdlPXpBU64+ HRIfekFiVwwNghb/04FYttdqmCHjZCRE7es/ X-Google-Smtp-Source: AA6agR570G2rS5BM74YL+XxHB8lAZfLfsxtRWD2QqM5fYotu9RUwpwbt1PUQfpYrQ8zjgz8Eu8BomA== X-Received: by 2002:a05:6a00:e16:b0:537:40a7:b095 with SMTP id bq22-20020a056a000e1600b0053740a7b095mr33312469pfb.64.1663079239524; Tue, 13 Sep 2022 07:27:19 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f196-20020a6238cd000000b00540de61c967sm7840286pfa.201.2022.09.13.07.27.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 07:27:18 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 08/14] fetch2: gitsm: fix incorrect handling of git submodule relative urls Date: Tue, 13 Sep 2022 04:26:38 -1000 Message-Id: <394bcd8d4b8f596cbfeef7ab9a5b043c209c81dd.1663078873.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 Sep 2022 14:27:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13969 From: Gennaro Iorio As specified by git submodule manual relative urls can start either with '..' or './', second case was incorrectly managed leading to an interpretation of urls starting with './' as absoulte urls. Signed-off-by: Gennaro Iorio Signed-off-by: Richard Purdie (cherry picked from commit 4a0bd3bcd1f7fc25364df8bbf185ff64881c015b) Signed-off-by: Steve Sakoman --- lib/bb/fetch2/gitsm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py index c5c23d52..c1950e48 100644 --- a/lib/bb/fetch2/gitsm.py +++ b/lib/bb/fetch2/gitsm.py @@ -88,7 +88,7 @@ class GitSM(Git): subrevision[m] = module_hash.split()[2] # Convert relative to absolute uri based on parent uri - if uris[m].startswith('..'): + if uris[m].startswith('..') or uris[m].startswith('./'): newud = copy.copy(ud) newud.path = os.path.realpath(os.path.join(newud.path, uris[m])) uris[m] = Git._get_repo_url(self, newud) From patchwork Tue Sep 13 14:26:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12802 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3E78FC6FA89 for ; Tue, 13 Sep 2022 14:27:30 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web09.5464.1663079238452346540 for ; Tue, 13 Sep 2022 07:27:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=3iDVWg/l; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id l10so11989205plb.10 for ; Tue, 13 Sep 2022 07:27:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date; bh=+urg61y2Fj3ocDy8sdhqwi7kKvoIxv/p9Fq9PehVjxk=; b=3iDVWg/l7V5VG6zySSW6HDyamjuyHWeAjdV3wbRVmApNPRobR/dfb08EuRVGgIKLBn eJO+HegHZ7FJdCiMsSjMOkF++iemMIC6cVhZN+ubIivAT8Vy/aVuVRxW7sithvdrzehG 2Boy3vSyook1Vmm37WOhY/927Y27qbxGAW9YbhuszYMyH8t+v0FA/gDqwNByIDKMJH1M AQXlPyR7c9BhJt18lAylAxhugV760VUAmCoxNYUAmofM54X9MmoMFCY6QNXgyTpzeHTP 8teCS8eeyQAE3gKdIeKCIR6XKHxA7v69Z7pmKNU6zOlgrW3mhhkQ3lLRlEiZGdCn7bZ6 jxrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=+urg61y2Fj3ocDy8sdhqwi7kKvoIxv/p9Fq9PehVjxk=; b=LvHHnpWDCIPcdhzIgL756rizwJP4vwuytebhWs4D42fIbf9kPofK7BeHSV1d2/aTig NC0bK0TF4Q320+D8E5yKPYMjil8AzR8WZW2AxQXRn2ZWruaqyzSxKBd8ENvCgOiSSirP xGDgXSi8AVmvbs30VEu2huSvdaf9PhZh1DZkmNQSujqQd7z9o5wwhNIrSyzn2G9JABeU tIDKbu5D0Ni2o+11pqnhNjNMm5Ay1E3ebCZxT9Cg9gOYaL9AdgAc5UX5Y9XvkF2VxmdR siSX6WtkCABlXhjMxNoyvJJjoMOtsXwy7I8mNGaDWfNWN3UtY+fvD/2ITCPHmL8yOUF/ tJzA== X-Gm-Message-State: ACgBeo1vNG6E8kAE6wzAkKSj1dSJT5MuOK7epaZk8oSAB5Q8wPxqTgyL GHvHpLHH2as5JH17TUi7YbadNj8mcDcN3PRS X-Google-Smtp-Source: AA6agR4z7xOGIzZgu97ke43MakV5AeVXJ6othi2rvnV1OkuGY68JqBCeYq6iTfbnH/3InrzzTcKfZw== X-Received: by 2002:a17:90a:d151:b0:1fa:b2a6:226a with SMTP id t17-20020a17090ad15100b001fab2a6226amr4374666pjw.104.1663079241875; Tue, 13 Sep 2022 07:27:21 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f196-20020a6238cd000000b00540de61c967sm7840286pfa.201.2022.09.13.07.27.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 07:27:21 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 09/14] ConfHandler/BBHandler: Improve comment error messages and add tests Date: Tue, 13 Sep 2022 04:26:39 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 Sep 2022 14:27:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13970 From: Richard Purdie Currently if you trigger one of the comment errors, the newline characters are stripped and the line numbers are incorrect. In one case it prints the empty line which is also unhelpful. Rework the code around these errors so the line numbers are correct and the lines in question are more clearly displayed complete with newlines so the user can more clearly see the error. I also added a couple of simplistic test cases to ensure that errors are raised by the two known comment format errors. [YOCTO #11904] Signed-off-by: Richard Purdie (cherry picked from commit 712da71b24445c814d79a206ce26188def8fce0a) Signed-off-by: Steve Sakoman --- lib/bb/parse/parse_py/BBHandler.py | 4 ++-- lib/bb/parse/parse_py/ConfHandler.py | 9 +++++++-- lib/bb/tests/parse.py | 23 +++++++++++++++++++++++ 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/lib/bb/parse/parse_py/BBHandler.py b/lib/bb/parse/parse_py/BBHandler.py index ee9bd760..68415735 100644 --- a/lib/bb/parse/parse_py/BBHandler.py +++ b/lib/bb/parse/parse_py/BBHandler.py @@ -178,10 +178,10 @@ def feeder(lineno, s, fn, root, statements, eof=False): if s and s[0] == '#': if len(__residue__) != 0 and __residue__[0][0] != "#": - bb.fatal("There is a comment on line %s of file %s (%s) which is in the middle of a multiline expression.\nBitbake used to ignore these but no longer does so, please fix your metadata as errors are likely as a result of this change." % (lineno, fn, s)) + bb.fatal("There is a comment on line %s of file %s:\n'''\n%s\n'''\nwhich is in the middle of a multiline expression. This syntax is invalid, please correct it." % (lineno, fn, s)) if len(__residue__) != 0 and __residue__[0][0] == "#" and (not s or s[0] != "#"): - bb.fatal("There is a confusing multiline, partially commented expression on line %s of file %s (%s).\nPlease clarify whether this is all a comment or should be parsed." % (lineno, fn, s)) + bb.fatal("There is a confusing multiline partially commented expression on line %s of file %s:\n%s\nPlease clarify whether this is all a comment or should be parsed." % (lineno - len(__residue__), fn, "\n".join(__residue__))) if s and s[-1] == '\\': __residue__.append(s[:-1]) diff --git a/lib/bb/parse/parse_py/ConfHandler.py b/lib/bb/parse/parse_py/ConfHandler.py index 810b6011..451e68dd 100644 --- a/lib/bb/parse/parse_py/ConfHandler.py +++ b/lib/bb/parse/parse_py/ConfHandler.py @@ -125,16 +125,21 @@ def handle(fn, data, include): s = f.readline() if not s: break + origlineno = lineno + origline = s w = s.strip() # skip empty lines if not w: continue s = s.rstrip() while s[-1] == '\\': - s2 = f.readline().rstrip() + line = f.readline() + origline += line + s2 = line.rstrip() lineno = lineno + 1 if (not s2 or s2 and s2[0] != "#") and s[0] == "#" : - bb.fatal("There is a confusing multiline, partially commented expression on line %s of file %s (%s).\nPlease clarify whether this is all a comment or should be parsed." % (lineno, fn, s)) + bb.fatal("There is a confusing multiline, partially commented expression starting on line %s of file %s:\n%s\nPlease clarify whether this is all a comment or should be parsed." % (origlineno, fn, origline)) + s = s[:-1] + s2 # skip comments if s[0] == '#': diff --git a/lib/bb/tests/parse.py b/lib/bb/tests/parse.py index 2898f9bb..1a3b7493 100644 --- a/lib/bb/tests/parse.py +++ b/lib/bb/tests/parse.py @@ -194,3 +194,26 @@ deltask ${EMPTYVAR} self.assertTrue('addtask ignored: " do_patch"' in stdout) #self.assertTrue('dependent task do_foo for do_patch does not exist' in stdout) + broken_multiline_comment = """ +# First line of comment \\ +# Second line of comment \\ + +""" + def test_parse_broken_multiline_comment(self): + f = self.parsehelper(self.broken_multiline_comment) + with self.assertRaises(bb.BBHandledException): + d = bb.parse.handle(f.name, self.d)[''] + + + comment_in_var = """ +VAR = " \\ + SOMEVAL \\ +# some comment \\ + SOMEOTHERVAL \\ +" +""" + def test_parse_comment_in_var(self): + f = self.parsehelper(self.comment_in_var) + with self.assertRaises(bb.BBHandledException): + d = bb.parse.handle(f.name, self.d)[''] + From patchwork Tue Sep 13 14:26:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12800 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33B73C6FA82 for ; Tue, 13 Sep 2022 14:27:30 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web08.5358.1663079233557791317 for ; Tue, 13 Sep 2022 07:27:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=mYcC/rJ3; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id d12so11989904plr.6 for ; Tue, 13 Sep 2022 07:27:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date; bh=SbD6Nb0691aKTcJHMUT+bExdrjdTQwBU6QYNP4ZYdk8=; b=mYcC/rJ33sPpvXdpYyvL4/646fItVxX0nEAos8vTLUP4vlVGN/vOuCnSFi5pkclmvQ /RcztXwiNDrQHcJlLWT1ZkHehrEmbEEq37EjJ1FjfK0F2Qq1NC+fn0dxdM+Z0XDO4Krm 7qtBHkd8BvXEo6ohHhLVatzRVMznxIMXY1+8/kDa9Y4sm1YDoX95/s5aD4x54Ai9/ZNj psvgAatzNdWbkAmIpaZet6ru9emupq4HEfWH0QkrC4hNujyp5vlNajweo2+UsAkiPE0f +VqBvj1mjjB5XcdexSiSiOROCH34oe+5lNeJcWpUcTijJ153MbxMx4sS2L7NJTV0A1SC G44g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=SbD6Nb0691aKTcJHMUT+bExdrjdTQwBU6QYNP4ZYdk8=; b=VJgjouM8ARS/uFgDm4n2SL/FgVZm7ylIG/Ek1ljuFBQ3QABq/FWOyoJ2fULZj8n8VB LfFvW0sl29rUM9fl0Dje49+qOSRRlFNG/ieq0e43ROU0rLAVkAUfLrLVXJa7ukQ1QlTt jeZP15wt5EiSrEHm0T6UCT7cU7TVVONekYNkLqavUF/pB/K3ZwGSHeyXh1lgmpCx6K4f Vh0qHctotJrpFmzEl1nRctXGgatz/h0VmIFsPcMi+KWmg40pSBNMM7ywfH9LXRdBghCy FLD+n5habrSo0TjSiNSE3C80QDi6kGDO7JXMA21N6mb/eJFd3Ev2PEPqmgWa0o4Iuw9K zi8w== X-Gm-Message-State: ACgBeo2whPu8vEUgyyWzJhmPWQ8V21Ew0Bz7MNOBQcZjiZ0KH6Owx/C4 FqvzLpvLbhdGulnRlMeTeIuvI/AlukQJMWyj X-Google-Smtp-Source: AA6agR4rc4QuIQuA+Kwq01K6wYHxiGiwtji/4Y41RUQrRFG6swlOrPflMqoCq0LSa9Y4I8d9t1sJUQ== X-Received: by 2002:a17:90a:fa8e:b0:200:b4b9:c6f3 with SMTP id cu14-20020a17090afa8e00b00200b4b9c6f3mr4320019pjb.190.1663079244301; Tue, 13 Sep 2022 07:27:24 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f196-20020a6238cd000000b00540de61c967sm7840286pfa.201.2022.09.13.07.27.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 07:27:23 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 10/14] fetch2: Ensure directory exists before creating symlink Date: Tue, 13 Sep 2022 04:26:40 -1000 Message-Id: <4f75814ee6580f61a27b71ed9169582e7ddd1559.1663078873.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 Sep 2022 14:27:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13971 From: Richard Purdie If the mirrors code is trying to create a symlink and the parent directory doesn't exist, as might be the case for sstate mirrors where the fetch is into a subdir, it can silently fail. Ensure the directory exists in this case to avoid issues. Signed-off-by: Richard Purdie (cherry picked from commit eff16e474ee7dc49ae433420a4c8d15d3314a618) Signed-off-by: Steve Sakoman --- lib/bb/fetch2/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index ac557176..a3140626 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -1097,6 +1097,8 @@ def try_mirror_url(fetch, origud, ud, ld, check = False): def ensure_symlink(target, link_name): if not os.path.exists(link_name): + dirname = os.path.dirname(link_name) + bb.utils.mkdirhier(dirname) if os.path.islink(link_name): # Broken symbolic link os.unlink(link_name) From patchwork Tue Sep 13 14:26:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12801 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3809BC54EE9 for ; Tue, 13 Sep 2022 14:27:30 +0000 (UTC) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by mx.groups.io with SMTP id smtpd.web09.5465.1663079247735907587 for ; Tue, 13 Sep 2022 07:27:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=cV19OBeJ; spf=softfail (domain: sakoman.com, ip: 209.85.215.176, mailfrom: steve@sakoman.com) Received: by mail-pg1-f176.google.com with SMTP id c24so11470525pgg.11 for ; Tue, 13 Sep 2022 07:27:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date; bh=SQQozrF2B7Si5qVKeRDFjwFn8Av+q4JfnFilhotDfQI=; b=cV19OBeJFVPmj5ubKF4dErfljRehye7jdzhYGJYsEeHsFESe8DcXLu3LSpnhIyRalr K3y5iIWNOVEqnwDLamA8HYu0fcKi17mQKmyVelrrjBaj8d+Pi6d2IjM97SbHko+djTRP ym3AuczkqfXANpprvYp/2beF4rpQ6dxN/f5EN1eZKo0N6LU+PoqtjG5EGZZZvU6QR7H9 EJJr2I9H7Jl0QUufsUJ0CAqgWoGv+49nQa7y85P5daVML71E5km4Izl3D6pKHVff1kVh SzfdSZ1C26a/vcVHWDvpwuL7dk5hR+qu5Z7k/hfAVv4g361Ui14Zq/fl7zwWzziw8FR8 oeng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=SQQozrF2B7Si5qVKeRDFjwFn8Av+q4JfnFilhotDfQI=; b=II3eP1Oiflc+M96ZFZ7B/iIpPFTYD7rKPb5pbjxGi2gnCRYbO4P59fFn+feHwHRWeG 6ZB6iHYNjOyj15eirqadqAhog3k4gzhHgUzi/Dvq8PE+1aYQnNcUKlneG+qULNz8foaK P52TPNFRJa/yw6xKmxSDu18J9IpNLKLOz8qs0IG/g2WoLcAT3SDX49mByvHXuYgcs0pL c59CILb+qkptFh9qpK2NCuzbzZY1cI6vhWqCu9cylVTIZ/0nN/yry7PKNzd3BTRkkqje Ub36cAugdm+p1UpguqaXmgxfz5kNh4kZgM8/BBSmBsZa38IggnKxCBewHyA9zY6dW4aB ND5A== X-Gm-Message-State: ACgBeo3dLCh1UP8UEU0b7/uHdCuFhxA5BBFY+p6YnRvC4Q5sD3y0GCHU 6wK/77242lWJ65cs+iFEJ29fVY5uXjO1S50r X-Google-Smtp-Source: AA6agR5eEo8W0Y5jS4j8V0TfJU3My72yhrGIEktrP2GPu+HOtd8yJRBGd0E4td4sEJ0akvJseMQ0Dw== X-Received: by 2002:a05:6a00:88f:b0:530:dec:81fd with SMTP id q15-20020a056a00088f00b005300dec81fdmr33517709pfj.64.1663079246556; Tue, 13 Sep 2022 07:27:26 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f196-20020a6238cd000000b00540de61c967sm7840286pfa.201.2022.09.13.07.27.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 07:27:25 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 11/14] bitbake: bitbake-user-manual: hashserv can be accessed on a dedicated domain Date: Tue, 13 Sep 2022 04:26:41 -1000 Message-Id: <9d27db5320fd9cf8bbed3b5a2b0e84a4f6e5138e.1663078873.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 Sep 2022 14:27:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13972 From: Jose Quaresma Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni (cherry picked from commit b171aa45fb8518dcfbba315b303a4fe9bf2180c6) Signed-off-by: Steve Sakoman --- doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst b/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst index af4ff980..12aef3cb 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst +++ b/doc/bitbake-user-manual/bitbake-user-manual-ref-variables.rst @@ -401,7 +401,7 @@ overview of their function and contents. Example usage:: - BB_HASHSERVE_UPSTREAM = "typhoon.yocto.io:8687" + BB_HASHSERVE_UPSTREAM = "hashserv.yocto.io:8687" :term:`BB_INVALIDCONF` Used in combination with the ``ConfigParsed`` event to trigger From patchwork Tue Sep 13 14:26:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12804 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 382E3C54EE9 for ; Tue, 13 Sep 2022 14:27:40 +0000 (UTC) Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by mx.groups.io with SMTP id smtpd.web11.5260.1663079251445711340 for ; Tue, 13 Sep 2022 07:27:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=xdqVwQm+; spf=softfail (domain: sakoman.com, ip: 209.85.216.50, mailfrom: steve@sakoman.com) Received: by mail-pj1-f50.google.com with SMTP id x1-20020a17090ab00100b001fda21bbc90so15816864pjq.3 for ; Tue, 13 Sep 2022 07:27:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date; bh=VaRm9ErnvSCkuTySdvMbJmOPKg9vQHtdygFQjhkjY3k=; b=xdqVwQm+74NNvvOSRojp4tGZ0tOz/NiTw6QBmk83QWOleozY9sGRPC/RhSSiGrOPIE /xPqgIRk88AyQHQ3fgbyr3aNha7lBZf+/4n9Gn0i9vHRfcwWt86FwfgeMrNb0Ye5YZy8 Hj/qz18RNoPerBqwXNAG2wyRNzjVUzwfhee7VP1Yy58qEYn25rA8sJEa5zhqI+C0lRdC kfR+HEeirzaIVSOHBOqA1hBIjYR8YyOUrt+5cYMFrxcbH9yZ6oyM76UTXMYfTRVrT9Ju sMXHWLL0rKNzt1rg0xk9Jeif5ff6oORjM6TNvCtfXZjiazqExHIiw1H1kEchKbl+SzlM TF/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=VaRm9ErnvSCkuTySdvMbJmOPKg9vQHtdygFQjhkjY3k=; b=5iAsrLBPJuxU18iBWGJVP+AolqLuD617Fd+1yR2o4POdgb5p5wh0il2A+r93GI8bOY 2PoH/L3jymT1RU0N7CZd9HssCo+tb3ypiXr/rBJy7dxauz3sgxiNjoYliu9awJfv+iL8 6oY3EAGjou7NOaOIrkIzBcnd43AjOoIGjj8a7LdVVffjpkfsgGaRla1DbCdj5f8/fJ4l vmjtin41CRynw1R/T27miU7DXwZkWmyAg3RcBFMMHkqp3I3+m0wgDM2OgbIh1mdeRbi4 fy3oqEfsgsuNbWSrMhZ5Y6bdv0n5xZ+ZW3pCezYuP3Ba9KnbCGUJYDmcnzDqyExhLvzc xegw== X-Gm-Message-State: ACgBeo1v4VxtCM31zvylrEMMh5eUcDFc+BLwDCgvTy4UGrFKjKLzQlZu Z76tghGNdZoPv7JG0K+/+z4Sy/6y/0j+D102 X-Google-Smtp-Source: AA6agR5nQKiCO3eUz81V95MEBqdVxLuwDV6UfV3NajT/ibl2uDmuvXGjnf8mHKe2j1CPW0DiWGOUCA== X-Received: by 2002:a17:90a:644e:b0:200:422c:6b1 with SMTP id y14-20020a17090a644e00b00200422c06b1mr4269367pjm.183.1663079250237; Tue, 13 Sep 2022 07:27:30 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f196-20020a6238cd000000b00540de61c967sm7840286pfa.201.2022.09.13.07.27.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 07:27:29 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 12/14] bb/utils: remove: check the path again the expand python glob Date: Tue, 13 Sep 2022 04:26:42 -1000 Message-Id: <13a291b79a9fc6a217433a40a7f28d21d8dd3bd5.1663078873.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 Sep 2022 14:27:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13973 From: Jose Quaresma When we call the remove with recurse=True we first check if the remove operation is safe in _check_unsafe_delete_path. But the check is been done on the path instaed of the expanded python glog. Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni (cherry picked from commit 7236488b898309ec5f1880936ddae22a28ccf5d3) Signed-off-by: Steve Sakoman --- lib/bb/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bb/utils.py b/lib/bb/utils.py index 29801765..e92d5feb 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -694,8 +694,8 @@ def remove(path, recurse=False, ionice=False): return if recurse: for name in glob.glob(path): - if _check_unsafe_delete_path(path): - raise Exception('bb.utils.remove: called with dangerous path "%s" and recurse=True, refusing to delete!' % path) + if _check_unsafe_delete_path(name): + raise Exception('bb.utils.remove: called with dangerous path "%s" and recurse=True, refusing to delete!' % name) # shutil.rmtree(name) would be ideal but its too slow cmd = [] if ionice: From patchwork Tue Sep 13 14:26:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12803 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37872C6FA82 for ; Tue, 13 Sep 2022 14:27:40 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web08.5358.1663079233557791317 for ; Tue, 13 Sep 2022 07:27:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=k7z1vjTq; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id d12so11990348plr.6 for ; Tue, 13 Sep 2022 07:27:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date; bh=dSrI0ciGAGCjRFZn4zGSUh1ciGeoNRxQQcLbiDGRBPc=; b=k7z1vjTqfjJ4OYXC0CoG9NVn0GcIc87LQT5HyFvnhizm7eW8GmDzzCPUTTgSIimFiI NH7T29jpXPZtip6vaaM4nLSMn5OB/YmecmZyGKPUn0X5NQToLs7TUMi1pd0GgYB9zD6u EUlvnPctrOB81CfYz7xdxgpIevVXfXFAmJrRsX2gbVzlwBFsUUeBjipz1lJOurHYiqMB uANznTll9xSBuYXxOAlfQKoUrFHnBlHXacVJI3P3bqPhE2Rh/smrZ0yJFvSdkafcx7Io tGzsSG+1lgVYbknJuzoNGF+auI4DH35iJfXOsIHwAN85H9yk/SXf0Kn0MfVCQJYBQzTg 7VdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=dSrI0ciGAGCjRFZn4zGSUh1ciGeoNRxQQcLbiDGRBPc=; b=mz1yr5w2daN11QwI1ZA7EGfNqDVJ3uH5e0BOxyWYeBX/RHf533lTxicSnao2bTVGEL KFKXrY6zQ3AmZJ5wz+c9u/sQrhcgyIg8yOZxfTPtDjeEvZrrn4Loi2vkMI1NSyPiRLLh sQ2z1ek7JBJNOVKHWsvdtJWQEahNuA8D7yNDTq6KYeaz4c02ET+3cfgE/VoXa6HMnAj2 e80NfnisxEvQFA8xlb9uvVIoELiPOJGhVC08nIgLpuOE7wGGOnmFsbCYbgfhvI9lDx4l qhAYukyBhdfehmplvhximlY21uiozwNHWtAnUKZ4/nnwNGIBfDU1BMkElI6vd5xRZibe as9g== X-Gm-Message-State: ACgBeo0Dl/+YKDQ1PWIdzWzpCFdNroaKvuLBlvKzU0EGu1aeun1JMklr sGVEM6yIBY98HUpnzU3woVkPCexMlosa4vB1 X-Google-Smtp-Source: AA6agR5eQzUB9UirZfsIE0MCTcVoCGcrId2Uu8CPWR8lNU93b3S3y2a9bqnRXa07USUaKTqdTRvBQw== X-Received: by 2002:a17:903:18b:b0:176:afb8:b4ab with SMTP id z11-20020a170903018b00b00176afb8b4abmr32264780plg.80.1663079253148; Tue, 13 Sep 2022 07:27:33 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f196-20020a6238cd000000b00540de61c967sm7840286pfa.201.2022.09.13.07.27.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 07:27:32 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 13/14] bb/utils: movefile: use the logger for printing Date: Tue, 13 Sep 2022 04:26:43 -1000 Message-Id: <8c96393391bc63a87719168f4c9e2b88b7969e15.1663078873.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 Sep 2022 14:27:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13974 From: Jose Quaresma Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni (cherry picked from commit 274b2d7a2fa0b43b0b542cb5471ff832e692ea93) Signed-off-by: Steve Sakoman --- lib/bb/utils.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/bb/utils.py b/lib/bb/utils.py index e92d5feb..95b3c898 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -753,7 +753,7 @@ def movefile(src, dest, newmtime = None, sstat = None): if not sstat: sstat = os.lstat(src) except Exception as e: - print("movefile: Stating source file failed...", e) + logger.warning("movefile: Stating source file failed...", e) return None destexists = 1 @@ -781,7 +781,7 @@ def movefile(src, dest, newmtime = None, sstat = None): os.unlink(src) return os.lstat(dest) except Exception as e: - print("movefile: failed to properly create symlink:", dest, "->", target, e) + logger.warning("movefile: failed to properly create symlink:", dest, "->", target, e) return None renamefailed = 1 @@ -798,7 +798,7 @@ def movefile(src, dest, newmtime = None, sstat = None): except Exception as e: if e.errno != errno.EXDEV: # Some random error. - print("movefile: Failed to move", src, "to", dest, e) + logger.warning("movefile: Failed to move", src, "to", dest, e) return None # Invalid cross-device-link 'bind' mounted or actually Cross-Device @@ -810,13 +810,13 @@ def movefile(src, dest, newmtime = None, sstat = None): bb.utils.rename(destpath + "#new", destpath) didcopy = 1 except Exception as e: - print('movefile: copy', src, '->', dest, 'failed.', e) + logger.warning('movefile: copy', src, '->', dest, 'failed.', e) return None else: #we don't yet handle special, so we need to fall back to /bin/mv a = getstatusoutput("/bin/mv -f " + "'" + src + "' '" + dest + "'") if a[0] != 0: - print("movefile: Failed to move special file:" + src + "' to '" + dest + "'", a) + logger.warning("movefile: Failed to move special file:" + src + "' to '" + dest + "'", a) return None # failure try: if didcopy: @@ -824,7 +824,7 @@ def movefile(src, dest, newmtime = None, sstat = None): os.chmod(destpath, stat.S_IMODE(sstat[stat.ST_MODE])) # Sticky is reset on chown os.unlink(src) except Exception as e: - print("movefile: Failed to chown/chmod/unlink", dest, e) + logger.warning("movefile: Failed to chown/chmod/unlink", dest, e) return None if newmtime: From patchwork Tue Sep 13 14:26:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 12805 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37CF0C6FA89 for ; Tue, 13 Sep 2022 14:27:40 +0000 (UTC) Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) by mx.groups.io with SMTP id smtpd.web10.5465.1663079256486981304 for ; Tue, 13 Sep 2022 07:27:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=46sbGjEr; spf=softfail (domain: sakoman.com, ip: 209.85.216.41, mailfrom: steve@sakoman.com) Received: by mail-pj1-f41.google.com with SMTP id fs14so11476670pjb.5 for ; Tue, 13 Sep 2022 07:27:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date; bh=0sMoDlW+E0cIU3wL3iyCgCe/WYt7BXuTxZxM9G2hKEg=; b=46sbGjEry+E2EM4kuSa8Ccojl4OVsiMObMmu+x6/UXtSx9yOGWl7vgk+SkSve20ni1 kjsQmcMUvajJz3zW1oYjLfy6jv/yHC+XzFJetFy1pY+aA7EXChV+vGL3MS4tvGYEXXT+ p9bLFvi2/o4OQZBHIHHUuoWNokPQRcVwOU111aiQycrn6ntVWOp/Bz3zzN0WvFWpMrh2 UIPqL/WGExqSyrYEQHzFxDCEnRqeM4sAlUMHAwNvZOM3/sZU6Rl/rTJOc6K7NsaPj1aO /kJWQnrPpjIzNY7J0MizNja1ym0BXYczBQgr37+PbnEdZCFUP3o/Wii3u7FG5GmAoe3C zSXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=0sMoDlW+E0cIU3wL3iyCgCe/WYt7BXuTxZxM9G2hKEg=; b=F5RFcAXn+6MeHqrGjtSS/viwVeXtZTcCgkMgnnXgERQ5x7I7n9ZWA2IEpeA29S23jK sxBYZ0zuGzy30NzJ8vEtkLyRyuR8a//jSbjGXzR6HujTW2uxW9xp/8M0OGLd26uUjshP KQPZhQE8vV4TyyQmaVAWeEIDLhjD+gWDbpHiCpLyIgXO8M9ZFPTAPz+hpS05iBuqmWxU M+Pg0GmWg8HpCTk+N5MES+WdiG2jsU75BkTk4HPcKlwFE9a5eKKp+Y8Wemgx9tHR9FJO QHL4crZgyZ39Zu+l3xC3uWXmbNrcex7f9BsYDsKrUv5zbBBgjl3zBBwsBvUm0BNoHsU2 lqnQ== X-Gm-Message-State: ACgBeo1Cb0TTNYeEkUqi1JSc5g1VxKbxvp73z/vGq7k3Md3EcJi2mwV7 3LN6VARZ7bBJevOoadWNWtnZ036ov+6HaDbp X-Google-Smtp-Source: AA6agR4yHuFtW+A+11CRSY2yQkwow8IUIRjZUBKzlBkeg1pMLjkq8rI4LBbzZUOlcjox+dI7rNPSUQ== X-Received: by 2002:a17:903:32d1:b0:178:1cf0:5081 with SMTP id i17-20020a17090332d100b001781cf05081mr16993988plr.54.1663079255516; Tue, 13 Sep 2022 07:27:35 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id f196-20020a6238cd000000b00540de61c967sm7840286pfa.201.2022.09.13.07.27.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Sep 2022 07:27:34 -0700 (PDT) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][kirkstone][2.0][PATCH 14/14] bitbake-user-manual: npm fetcher: improve description of SRC_URI format Date: Tue, 13 Sep 2022 04:26:44 -1000 Message-Id: <1f8fa1cb1dbd683a6177bb1275097df6821d2a3b.1663078873.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 13 Sep 2022 14:27:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13975 From: Michael Opdenacker Using the term "Parameter" which is consistent with the description of SRC_URI parameters in the following text. Signed-off-by: Michael Opdenacker Reported-by: Quentin Schulz Reviewed-by: Quentin Schulz Signed-off-by: Luca Ceresoli (cherry picked from commit 87e42f1202162152c779ccc8bbd06f88f0bdab96) Signed-off-by: Steve Sakoman --- doc/bitbake-user-manual/bitbake-user-manual-fetching.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst b/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst index 4dfb7889..9c269ca8 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst +++ b/doc/bitbake-user-manual/bitbake-user-manual-fetching.rst @@ -717,7 +717,7 @@ Javascript package registry. The format for the :term:`SRC_URI` setting must be:: - SRC_URI = "npm://some.registry.url;OptionA=xxx;OptionB=xxx;..." + SRC_URI = "npm://some.registry.url;ParameterA=xxx;ParameterB=xxx;..." This fetcher supports the following parameters: @@ -757,7 +757,7 @@ of an NPM package while locking their versions. The format for the :term:`SRC_URI` setting must be:: - SRC_URI = "npmsw://some.registry.url;OptionA=xxx;OptionB=xxx;..." + SRC_URI = "npmsw://some.registry.url;ParameterA=xxx;ParameterB=xxx;..." This fetcher supports the following parameters: