From patchwork Sun Apr 10 19:08:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 6503 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 59E80C47082 for ; Mon, 11 Apr 2022 17:17:58 +0000 (UTC) Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by mx.groups.io with SMTP id smtpd.web12.20904.1649617737183568927 for ; Sun, 10 Apr 2022 12:08:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=O6/xtE2W; spf=pass (domain: gmail.com, ip: 209.85.216.53, mailfrom: ticotimo@gmail.com) Received: by mail-pj1-f53.google.com with SMTP id a16-20020a17090a6d9000b001c7d6c1bb13so14549328pjk.4 for ; Sun, 10 Apr 2022 12:08:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wLPxoIcrs7D54p0xqvu6Be+unhoE3U/V6Tkv1+8fe/k=; b=O6/xtE2Wb79wlFG4qokHiqOThg4zTGkoxx1tY0+/OgT7nwTQBOuYVQJVy5xuSBHkfN XGn3DAwRzLuvaaxImjaoagQu7X/Qt4Od1JYXP26bZEr7BMWnuW0FO7jtzqODKsZBnb47 uMdItdZFq6NZuVM25aAlzEyd/ccmfIrtGcY1EIooQq+KJwNOx3lIzRce76Oq2JsxidCc JwRHMcKTLMaVDIhMCqiobvnQkLkPNDWTHNC0eOfLCcuIZGNORYyCG4bdifTtKxlQATqg hkfpoDUxUsEUYY2wDYuwu0RoG5AU01q6T++E0d6PGGz3ArjuP3/y+RmGXyTjOC78l9WZ LHjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wLPxoIcrs7D54p0xqvu6Be+unhoE3U/V6Tkv1+8fe/k=; b=q6AxNW6RnjGgVNcwvnMB80ySeSKzZZ8VZRWA35raIvK48S/BjpwmJn7vQeef5ZwBW6 j07TXfQwhf26PUlPqtOhWuk2PF3cW2zTeZYttlt+e5fnEWqKrWf6KmiLLBsmcTCEFsd0 S1rx5cW4eQUR2dBy42xXqrY1fZa3oMvF5PJYuC1GIZK29y0KQEQ2aXMKHSu7vBEOVh9g 54DygVAa53gq1ZbLtdSMNaenaYvLrDV9gCof2DCFSh2o8q1J57lWx+ZCZt0yOVCjDDih Au/8mBcEXjPbYd5m96yVe6gBcKO8i2dQUGqiRIz4MBftpdaTHwb9oulKQe7hExSryWPc ZngA== X-Gm-Message-State: AOAM533egGPe81K/qCYmMiZXCeei0mhUEaT8W2lZCQoyWYRXvFRBg1Gw pcnAKduWhrvyZIee32gqSzYz8BYKXW8= X-Google-Smtp-Source: ABdhPJxjcVH8Z+IiheVX78yRo7nra2oXttBbnPn1DSpWDEreHyq9ZVkeXWZ7xjP5bhe2lge7ktsoRw== X-Received: by 2002:a17:903:246:b0:153:84fe:a9b0 with SMTP id j6-20020a170903024600b0015384fea9b0mr29172969plh.163.1649617736367; Sun, 10 Apr 2022 12:08:56 -0700 (PDT) Received: from nereus.hsd1.or.comcast.net ([2601:1c0:6000:1b20:48cd:8d9b:66c9:7179]) by smtp.gmail.com with ESMTPSA id f16-20020a056a00239000b004fa7103e13csm34001213pfc.41.2022.04.10.12.08.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Apr 2022 12:08:56 -0700 (PDT) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Cc: bluelightning@bluelightning.org Subject: [layerindex][PATCH 1/4] layerindex/urls.py: fix about url pattern Date: Sun, 10 Apr 2022 12:08:39 -0700 Message-Id: <75f052d19dbefd4d54dc3331bf11acb01eba88ea.1649617288.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.30.2 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 ; Mon, 11 Apr 2022 17:17:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/56711 The url pattern was not including the trailing / [YOCTO #14445] Signed-off-by: Tim Orling --- layerindex/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layerindex/urls.py b/layerindex/urls.py index 45dbd3c..de15bb0 100644 --- a/layerindex/urls.py +++ b/layerindex/urls.py @@ -128,7 +128,7 @@ urlpatterns = [ EditProfileFormView.as_view( template_name='layerindex/profile.html'), name="profile"), - url(r'^about$', + url(r'^about/$', TemplateView.as_view( template_name='layerindex/about.html'), name="about"), From patchwork Sun Apr 10 19:08:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 6509 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 5F481C35294 for ; Mon, 11 Apr 2022 17:17:58 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web11.20996.1649617739302211605 for ; Sun, 10 Apr 2022 12:08:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=SjTI62wC; spf=pass (domain: gmail.com, ip: 209.85.216.44, mailfrom: ticotimo@gmail.com) Received: by mail-pj1-f44.google.com with SMTP id c12-20020a17090a020c00b001cba1ebb20cso147745pjc.0 for ; Sun, 10 Apr 2022 12:08:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5qT0V+6/nwYHJhXXLeVmy019B5DCE+Nevux9/EpYhXg=; b=SjTI62wCTAnZACVsaKcxIdA3+J4Kc0RpOoMWmZ5qr36Zdx5N9tM7veZzKQo6LunlBb JlCviyIvjYN95ulw4MtrVnRxgvQH7QnqMTyEn2V6llHDdUV7oIsSO1cnjy3e0yE98rc8 q7tjnK0EVLI9zOnOTVqzVHbfqzmFoGduHkUk2QzaU6ux8d4wWbfo+nQ7+STwHI9Jfg/D AeLnlSX15qVWCTkTNaMyGG5hUreytVamD/kUmjzheBPXtEQxvTtK1u0O7C3ysgN2P0/O +CMSWOUDlwg0ww6KU5dJ3ejE+NBo1t7Fsnmo6uOlxl9cJj0Dk1Yv4VUmLJIhff33GsUM D17Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5qT0V+6/nwYHJhXXLeVmy019B5DCE+Nevux9/EpYhXg=; b=GK6g6NvD3dA0MxP5YrqPy/atxIyAT26Eghx0oum1y7P+cAlnkN0C0+DpfgSb/aoG9G AXNKm/8icyBA2VAMQ0qurHCPVVtA3MH6kamyQh+vbe55Iu4rK6PD6T/TTaitoz+rjYvI I3+i5ciq0WdDFFufgXC5AnhzlkBwWbb/IyUS1njXsvJvC24pOi8vqAla3h/URADvlv7r nBE2aFsowIA7AM0diNcjPrzTKqpmfI1198jtycYVYK8z8LAdZbD5hpEJ86gk0sRBewDS 5eVxo4rmlTXPFJCbaYhrEKMhnmK/isq0OvPMfhahsaM2wxBhCBzAs0V7QlNynZZrgNGx 2uIQ== X-Gm-Message-State: AOAM530dp3/oXc4A9GyT3X/ZdWIc+n0pGRFFOHe/794I6aqnDhyu+MLq ohlfzT+85l7N7QzLilOg7lgc31J2PdU= X-Google-Smtp-Source: ABdhPJyLJ3ZQutpwVS4NLZkt+DvamcBZWiJEgtYj944Skjh4VUD9uLBScM5dKgJipnSfLcXDaHLlyQ== X-Received: by 2002:a17:902:ec89:b0:156:c5db:356d with SMTP id x9-20020a170902ec8900b00156c5db356dmr28773983plg.74.1649617738505; Sun, 10 Apr 2022 12:08:58 -0700 (PDT) Received: from nereus.hsd1.or.comcast.net ([2601:1c0:6000:1b20:48cd:8d9b:66c9:7179]) by smtp.gmail.com with ESMTPSA id f16-20020a056a00239000b004fa7103e13csm34001213pfc.41.2022.04.10.12.08.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Apr 2022 12:08:58 -0700 (PDT) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Cc: bluelightning@bluelightning.org Subject: [layerindex][PATCH 2/4] layerindex/models.py: add Inactive-Upstream Date: Sun, 10 Apr 2022 12:08:40 -0700 Message-Id: <8293eee252fafdd714aed399f4fcf6f538da46bd.1649617288.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.30.2 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 ; Mon, 11 Apr 2022 17:17:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/56712 Add the newish Inactive-Upstream upstream status. Add 0046_alter_patch_status.py migration. Signed-off-by: Tim Orling layerindex/migrations: update patch status Signed-off-by: Tim Orling --- .../migrations/0046_alter_patch_status.py | 18 ++++++++++++++++++ layerindex/models.py | 1 + 2 files changed, 19 insertions(+) create mode 100644 layerindex/migrations/0046_alter_patch_status.py diff --git a/layerindex/migrations/0046_alter_patch_status.py b/layerindex/migrations/0046_alter_patch_status.py new file mode 100644 index 0000000..74025c4 --- /dev/null +++ b/layerindex/migrations/0046_alter_patch_status.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.12 on 2022-04-10 19:20 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('layerindex', '0045_layerbranch_classicrecipe'), + ] + + operations = [ + migrations.AlterField( + model_name='patch', + name='status', + field=models.CharField(choices=[('U', 'Unknown'), ('A', 'Accepted'), ('P', 'Pending'), ('I', 'Inappropriate'), ('B', 'Backport'), ('S', 'Submitted'), ('D', 'Denied'), ('N', 'Inactive-Upstream')], default='U', max_length=1), + ), + ] diff --git a/layerindex/models.py b/layerindex/models.py index 329cc33..5ae60c3 100644 --- a/layerindex/models.py +++ b/layerindex/models.py @@ -561,6 +561,7 @@ class Patch(models.Model): ('B', 'Backport'), ('S', 'Submitted'), ('D', 'Denied'), + ('N', 'Inactive-Upstream'), ] recipe = models.ForeignKey(Recipe, on_delete=models.CASCADE) path = models.CharField(max_length=255) From patchwork Sun Apr 10 19:08:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 6508 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 6800BC47081 for ; Mon, 11 Apr 2022 17:17:58 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web09.20666.1649617741571034262 for ; Sun, 10 Apr 2022 12:09:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=lWnT7UPX; spf=pass (domain: gmail.com, ip: 209.85.215.174, mailfrom: ticotimo@gmail.com) Received: by mail-pg1-f174.google.com with SMTP id q19so12319358pgm.6 for ; Sun, 10 Apr 2022 12:09:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zVM07lhquWmRCr5i9bpefNnS+WKtFfYejTKV7Iz6XE8=; b=lWnT7UPXKETj6Xqf4CFwgKiurvuNM8+QYlye48HKHnHzmsZ1C3aG3DE3fB3ya/rBBn MCZN9p9NfooNd3oRXH3ceF81a1KLbSOYusKt4xesMUOet4pLo3+NPXonvHFhHLh6K8ly K46D7eZMsDuHLcFc6uXWETMkUnBxi4j3Ltmf9hdpXTZ99LedSwmKNaDtCqmX70n99SrO QTvcxUcPE9OqmiU1vARTprjZKzLbm2y58a6fQaIwNjqyjrVig058Wdur2H4SWwbs4fya E9Moun+jE20wBYf9C3F6yS1ocw31mDiKOGbNKTABlfSRO+KljHecQR+YAYNgFZ3rXbW9 6ZIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zVM07lhquWmRCr5i9bpefNnS+WKtFfYejTKV7Iz6XE8=; b=p2kcqf8PqHBfufhQ/YsPVSP0schV2G6u0susWOrRneqpFQPXwzxEzjiuUz+iqHxDue eZanzgCZoTh//x/iFC/v/yxXISZ+khpcMfJj1VHcwa1ic6wdtajVi3wZf/1bhnFb5Hy8 JzVu17k5EWanHMJKqF6DjRYtoQMnbPzinor2nWgYxjNNdAY4LAphv6X31I3jdU2B1dNn 9WwIIeduB+ECsE4/QwEdWMAfn5dRD156vMFCQpH5gtMf/x6Z59CZiWxj+4z0a/rOz6j+ DmYa/mQU3/2gr21uttir1X9tl0+o9U7AzA3uO4z9vJa8Tm2cyF5KwcYVYTkuAnIuk2FM G9fA== X-Gm-Message-State: AOAM532HiK+ZV81jCTKOOer2DXNomAgb6yc2lO0nkAO8uWniQthaVkqH RCjh/Y/547Kz21yihh6kvMXezIpOzAM= X-Google-Smtp-Source: ABdhPJywynePTQgj509a0TxgMg26+fC+58pdzM+MuV00Q7QjRH/qvHFMXygAXAxPnpjA6fZ9Azg7uw== X-Received: by 2002:a63:4625:0:b0:39d:4a92:804f with SMTP id t37-20020a634625000000b0039d4a92804fmr2272181pga.258.1649617740812; Sun, 10 Apr 2022 12:09:00 -0700 (PDT) Received: from nereus.hsd1.or.comcast.net ([2601:1c0:6000:1b20:48cd:8d9b:66c9:7179]) by smtp.gmail.com with ESMTPSA id f16-20020a056a00239000b004fa7103e13csm34001213pfc.41.2022.04.10.12.09.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Apr 2022 12:09:00 -0700 (PDT) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Cc: bluelightning@bluelightning.org Subject: [layerindex][PATCH 3/4] recipe{desc,parse}.py: BB_ENV_PASSTHROUGH_ADDITIONS Date: Sun, 10 Apr 2022 12:08:41 -0700 Message-Id: <271107f0247da1ba777cde3347f560d3627e1856.1649617288.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.30.2 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 ; Mon, 11 Apr 2022 17:17:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/56713 ERROR: Variable BB_ENV_EXTRAWHITE has been renamed to BB_ENV_PASSTHROUGH_ADDITIONS ERROR: Variable BB_ENV_EXTRAWHITE from the shell environment has been renamed to BB_ENV_PASSTHROUGH_ADDITIONS ERROR: Exiting to allow enviroment variables to be corrected Replace BB_ENV_EXTRAWHITE with new variable BB_ENV_PASSTHROUGH_ADDITIONS Signed-off-by: Tim Orling --- layerindex/recipedesc.py | 2 +- layerindex/recipeparse.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/layerindex/recipedesc.py b/layerindex/recipedesc.py index ee7f2fe..7ed1bae 100644 --- a/layerindex/recipedesc.py +++ b/layerindex/recipedesc.py @@ -63,7 +63,7 @@ def main(): sys.exit(1) # Skip sanity checks - os.environ['BB_ENV_EXTRAWHITE'] = 'DISABLE_SANITY_CHECKS' + os.environ['BB_ENV_PASSTHROUGH_ADDITIONS'] = 'DISABLE_SANITY_CHECKS' os.environ['DISABLE_SANITY_CHECKS'] = '1' sys.path.extend([bitbakepath + '/lib']) diff --git a/layerindex/recipeparse.py b/layerindex/recipeparse.py index c918677..d93d27e 100644 --- a/layerindex/recipeparse.py +++ b/layerindex/recipeparse.py @@ -36,7 +36,7 @@ def init_parser(settings, branch, bitbakepath, enable_tracking=False, nocheckout utils.checkout_repo(bitbakepath, bitbake_ref, logger=logger) # Skip sanity checks - os.environ['BB_ENV_EXTRAWHITE'] = 'DISABLE_SANITY_CHECKS' + os.environ['BB_ENV_PASSTHROUGH_ADDITIONS'] = 'DISABLE_SANITY_CHECKS' os.environ['DISABLE_SANITY_CHECKS'] = '1' fetchdir = settings.LAYER_FETCH_DIR From patchwork Sun Apr 10 19:08:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 6507 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 67EF2C35280 for ; Mon, 11 Apr 2022 17:17:58 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web12.20908.1649617745151706129 for ; Sun, 10 Apr 2022 12:09:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Bb/gszOE; spf=pass (domain: gmail.com, ip: 209.85.216.54, mailfrom: ticotimo@gmail.com) Received: by mail-pj1-f54.google.com with SMTP id md4so4906958pjb.4 for ; Sun, 10 Apr 2022 12:09:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ztaNX79eXDXJeCygs10U2jXFnpfaK4+J2CnKsfRvMdY=; b=Bb/gszOEmlYxNnG+zoYE4vpbDFvEq98FI2gB+HSMO7toKqYmBI8eXiUC+4797C/769 2JK27oM0VGT36PCs/SJY77DS5sZRpHX+EjlkCaePISxvfwO9ohaJC3/+fIDRrAW57NBl e2SCpFX5i7IuKNxhtrn/5ybJHsgZD+4FObfYs9xDhoUtIVTIJ7KXZgqC9u8//9IO7ODT LPhQ6K6DmfznSrmB3EArTe9Kx84Cx+d+QNXlresH2NuEdbD7+woC7JzmqvakpHlNE9Q1 fGGJQZBLHTz4b+JbYddd78jl7vKq4556JCnHGqoideHleuZ9EKSHIEjOaVfsmFXoI92F zVWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ztaNX79eXDXJeCygs10U2jXFnpfaK4+J2CnKsfRvMdY=; b=RRkomP0RtZyyqjr/Z7e4f5a2z2g+/bwfnf+tLubYGsLow2M0WNj2qhlQIrloquZhDB IIedtd6oFirlVUGdsIRW6+Q8MLIUSTS0eIHBptzYaOL0CrP9NlKPHZIgDSyjla6/r5ca fIQnU5dvZrM2TOzmrI15GlzrpyThaFqighiemV2ktGRR22rM9/c4LApu6VE9aeGO5ha5 ZdmEtqlzXQsJgN6fmgptoI7AjDz/XAIDBqC7kFh2R1WSdggMCORDPr3oZOERCqzu1HtI B5SX971uY44q0Er4CbYfrCZgWSwMVCT6tNcpdWmjXHby1r0vt8aSc/DyfOlzYY4BmJYt h8uA== X-Gm-Message-State: AOAM532pl3Z2lN3UX8C0E6FYUvODjdxMod9C8vuYTleEdU9JiviwiML9 xANE5k16KrgDixCiICuQylah7gncmBs= X-Google-Smtp-Source: ABdhPJwn6Z5ix/gXj+psimB9IGvry7FuINkWuqcagylEVDosBnNa+wVK5PdWDPrX3RVPpqCAFa1j6g== X-Received: by 2002:a17:90b:3a91:b0:1cb:955d:905c with SMTP id om17-20020a17090b3a9100b001cb955d905cmr2837603pjb.164.1649617744334; Sun, 10 Apr 2022 12:09:04 -0700 (PDT) Received: from nereus.hsd1.or.comcast.net ([2601:1c0:6000:1b20:48cd:8d9b:66c9:7179]) by smtp.gmail.com with ESMTPSA id f16-20020a056a00239000b004fa7103e13csm34001213pfc.41.2022.04.10.12.09.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Apr 2022 12:09:03 -0700 (PDT) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Cc: bluelightning@bluelightning.org Subject: [layerindex][PATCH 4/4] layerindex/utils.py: ignore 'core' in BBFILES_COLLECTIONS Date: Sun, 10 Apr 2022 12:08:42 -0700 Message-Id: <2fe25da55e38e9335037f962893c83d20d7e3752.1649617288.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.30.2 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 ; Mon, 11 Apr 2022 17:17:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/56714 Many layers append BBFILE_COLLECTIONS and therefore have 'core ' During update.py, this means we are likely not handling the collection we expect: WARNING: /opt/workdir/git___git_openembedded_org_meta-openembedded/meta-oe: multiple collections found, handling first one (core) only BBFILE_COLLECTIONS = "core" Signed-off-by: Tim Orling --- layerindex/utils.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/layerindex/utils.py b/layerindex/utils.py index 32be16d..497ab99 100644 --- a/layerindex/utils.py +++ b/layerindex/utils.py @@ -44,7 +44,12 @@ def get_layer_var(config_data, var, logger): collection = collection_list[0] layerdir = config_data.getVar('LAYERDIR', True) if len(collection_list) > 1: - logger.warn('%s: multiple collections found, handling first one (%s) only' % (layerdir, collection)) + if collection_list[0] == 'core': + # Many layers append BBFILE_COLLECTIONS and therefore have 'core ' + collection = collection_list[1] + logger.warn('%s: multiple collections found, ignoring the first one (\'core\') and handling (%s) only' % (layerdir, collection)) + else: + logger.warn('%s: multiple collections found, handling first one (%s) only' % (layerdir, collection)) if var == 'BBFILE_COLLECTIONS': return collection value = config_data.getVar('%s_%s' % (var, collection), True)