From patchwork Tue Jan 23 04:15:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 38211 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 87B60C47DDB for ; Tue, 23 Jan 2024 04:16:25 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web11.4228.1705983382948368442 for ; Mon, 22 Jan 2024 20:16:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=mCJCCCqT; spf=pass (domain: gmail.com, ip: 209.85.214.177, mailfrom: ticotimo@gmail.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1d730b6943bso7207665ad.2 for ; Mon, 22 Jan 2024 20:16:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705983382; x=1706588182; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=qb/WcP8KOQKFhFEnpi/TNbrotTo8U/kP/8tn/jTKwNY=; b=mCJCCCqTzw9eZ0Wo09wZ2FC0IcfYy5mri/hPBdyMBvW2WomIaMkPeywXG/clSXzWP/ xOOI03QuUEd5WPVwyVnAS4LtambCRbH2za5VPPB1/FPDq+uCJLmu8dnLqqTgXEKVixzx GWUDTbk6468iEqO85tuKSdiGtk63L0cw9LilPQgzW8v4LthMWC0J0rHKEJKAY1mdU33j 63tw2FNNu+1mIGrerUnH0zw21ALnyDYcvB/z8PWv1xWGowLR3vVZzAPCO3uDWuhZA2i9 DB3OcBCQw++q82N6GZfMZbWkxalVqWAqoIBiWZ34hTxkxal5RB14EEAo+KOhfTM1JV+i wuIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705983382; x=1706588182; 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:message-id:reply-to; bh=qb/WcP8KOQKFhFEnpi/TNbrotTo8U/kP/8tn/jTKwNY=; b=ZEiD1DAGQ1gnuyB8pQ5le3GETjMRRRwEnNvvR5KQLy3//rQxLmrnMPiCg2hbOD//Mo ZFyrMnFr+AlKIewBtsvkGoWI6lZSKIxO5rBdDYyMZOmbq0wVJ8MDF63mLxT7jWucwyfY vHddbfe0nguqZAg1ClosE8Q1x0h2RQWP8fdjJZdUcpyBKxnSbOX4EpnuYQ56sht5Ugl+ yJHQ0BDN0iZJzKpneE+hW0Mp5XZDp2ps1fdglkSaLAxDyEDBGveyednBsgzmacKz53pZ 7/jnvagel9H5WsdvOSXZLqX2qM4YmLamAlZy9nWfA2K25ApwjCnW8ghxE8RNEs+2dKO0 YLqw== X-Gm-Message-State: AOJu0Yw+os/4bwLIYAu+Ef4IV5j5GkUyAk1ZXWjao3n27PQL4L+yI3Zu bpQb0UN4nZB0xXcFEOQc8RNGrD/BmQpw1sFYfPFq36mvXnA9HmnuT7XFa1eq X-Google-Smtp-Source: AGHT+IEdx5C3cUo1LYB8hnpo0vWq0Pnh0wsbBcpIf4+hAFCzCVrvw17kfXCcPUWsXLad0ied/dbp7A== X-Received: by 2002:a17:902:e548:b0:1d7:51e8:7cdc with SMTP id n8-20020a170902e54800b001d751e87cdcmr2040106plf.124.1705983381909; Mon, 22 Jan 2024 20:16:21 -0800 (PST) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca01:19f0:66cf:30fc:9774:9e5a]) by smtp.gmail.com with ESMTPSA id iz11-20020a170902ef8b00b001d73126cac1sm4380274plb.173.2024.01.22.20.16.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 20:16:21 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web][PATCH 1/5] layerindex/models: add BBClassRecipe BBClassGlobal Date: Mon, 22 Jan 2024 20:15:19 -0800 Message-Id: X-Mailer: git-send-email 2.34.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, 23 Jan 2024 04:16:25 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62233 Add support for classes-global and classes-recipe, but use "proxy=True" to not create new tables for the new classes. Rather, we use the bbclass_type field. [YOCTO #15238] Signed-off-by: Tim Orling --- ...obal_bbclassrecipe_bbclass_bbclass_type.py | 41 ++++++++++++++++++ layerindex/models.py | 43 ++++++++++++++++++- 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 layerindex/migrations/0048_bbclassglobal_bbclassrecipe_bbclass_bbclass_type.py diff --git a/layerindex/migrations/0048_bbclassglobal_bbclassrecipe_bbclass_bbclass_type.py b/layerindex/migrations/0048_bbclassglobal_bbclassrecipe_bbclass_bbclass_type.py new file mode 100644 index 0000000..dba7927 --- /dev/null +++ b/layerindex/migrations/0048_bbclassglobal_bbclassrecipe_bbclass_bbclass_type.py @@ -0,0 +1,41 @@ +# Generated by Django 4.2.9 on 2024-01-20 21:20 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("layerindex", "0047_layerbranch_updates_enabled"), + ] + + operations = [ + migrations.CreateModel( + name="BBClassGlobal", + fields=[], + options={ + "proxy": True, + "indexes": [], + "constraints": [], + }, + bases=("layerindex.bbclass",), + ), + migrations.CreateModel( + name="BBClassRecipe", + fields=[], + options={ + "proxy": True, + "indexes": [], + "constraints": [], + }, + bases=("layerindex.bbclass",), + ), + migrations.AddField( + model_name="bbclass", + name="bbclass_type", + field=models.CharField( + choices=[("", "Class"), ("Global", "Global"), ("Recipe", "Recipe")], + default="", + max_length=25, + ), + ), + ] diff --git a/layerindex/models.py b/layerindex/models.py index 676f05f..c52927f 100644 --- a/layerindex/models.py +++ b/layerindex/models.py @@ -784,18 +784,59 @@ class BBAppend(models.Model): class BBClass(models.Model): layerbranch = models.ForeignKey(LayerBranch, on_delete=models.CASCADE) name = models.CharField(max_length=100) + # Type field + TYPE_CHOICES = [ + ('', 'Class'), + ('Global', 'Global'), + ('Recipe', 'Recipe') + ] + bbclass_type = models.CharField(max_length=25, choices=TYPE_CHOICES, default='') class Meta: verbose_name = "Class" verbose_name_plural = "Classes" def vcs_web_url(self): - url = self.layerbranch.file_url(os.path.join('classes', "%s.bbclass" % self.name)) + # We cannot override vcs_web_url in the sub-classes without defining self.url + # but we want url to be dynamic + if self.bbclass_type == 'Global': + url = self.layerbranch.file_url(os.path.join('classes-global', "%s.bbclass" % self.name)) + elif self.bbclass_type == 'Recipe': + url = self.layerbranch.file_url(os.path.join('classes-recipe', "%s.bbclass" % self.name)) + else: + url = self.layerbranch.file_url(os.path.join('classes', "%s.bbclass" % self.name)) return url or '' def __str__(self): return '%s (%s)' % (self.name, self.layerbranch.layer.name) +class BBClassGlobalManager(models.Manager): + def get_queryset(self): + return super().get_queryset().filter(bbclass_type='Global') + +class BBClassGlobal(BBClass): + objects = BBClassGlobalManager() + + class Meta: + proxy = True + + def save(self, *args, **kwargs): + self.bbclass_type = 'Global' + return super(BBClassGlobal, self).save(*args, **kwargs) + +class BBClassRecipeManager(models.Manager): + def get_queryset(self): + return super().get_queryset().filter(bbclass_type='Recipe') + +class BBClassRecipe(BBClass): + objects = BBClassRecipeManager() + + class Meta: + proxy = True + + def save(self, *args, **kwargs): + self.bbclass_type = 'Recipe' + return super(BBClassRecipe, self).save(*args, **kwargs) class IncFile(models.Model): layerbranch = models.ForeignKey(LayerBranch, on_delete=models.CASCADE) From patchwork Tue Jan 23 04:15:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 38212 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 8798AC47258 for ; Tue, 23 Jan 2024 04:16:35 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web11.4229.1705983394366040022 for ; Mon, 22 Jan 2024 20:16:34 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=QwJvSv3j; spf=pass (domain: gmail.com, ip: 209.85.214.172, mailfrom: ticotimo@gmail.com) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1d74dce86f7so14008765ad.2 for ; Mon, 22 Jan 2024 20:16:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705983393; x=1706588193; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=vH1sRnJIyyZYUbxQ8QsGvEMD7Ie/HOdWys1LYmoZtyg=; b=QwJvSv3j161qf8kc2E3JRw+aZKqAyxj9w1BPGi9yh42Np7/TCrYSrBXLKjGOyVsfBI 89LCeMsm8MaytyGYxeHaUYx04+dsq8LNAdUtYucbyAO8bD6r+OxKQ5WnVtIYtIyuB76t JtE34Oavz4iZ7KjzRvm8Y9M9ijUI3QfE4Iq9bDm0g/aWBODjg4cDihSTCzSmV9o9A0dO DdVu3yr9lMiEzD8U3glDBdGxvnQ1j6A1frOm4lUfKlEFqxj5d10KWndSXpXrAMFN/faC 26EO3NDQ9L0BZrG9aCYicW5aBJN36Q7ClSykLm3jTv2xQcjfV5UoJCUVL1zAMzmmPMh+ QNuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705983393; x=1706588193; 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:message-id:reply-to; bh=vH1sRnJIyyZYUbxQ8QsGvEMD7Ie/HOdWys1LYmoZtyg=; b=OZwBRgC1ZV9Zztu5GoVnoBkaddS/21sig7qR7kz0QaE9OgFuhdj25d/fifbOsOs/DK t/RYXTmwXkXnBgBY7ne+4fWm/7c+ljsEd2EHYhf8wSI1ZWK+FR3gUKgxa6Ia/6yv4J58 vswsVO3X9KceZoX8CyNbOSf+3bk6Oejdz77xfnzicgVM6iD/oSe60FMlaRsZNjWGWVpy jrmq1OxVoVVJAAoSRW5kTbeaQUBwy+SLxeeyrJ7YKIsbf5SkDR5+sG+iysQ6O7IjcmZk DiWg0sm6bCcLHinMag/rbFUUjX9q0RvtTqgmShLCBlmlTLzItQpDm+VtGkFNxVqvFurw 5u3g== X-Gm-Message-State: AOJu0Yx51OP6dC03fvRoNQKToeun899MdRfesC3bMwVau2YcwdVR7GQW DM+VZmaRTZVrcjTK4dnQwFi/npbG3S2Mq1tDS3zjLwldq6cWei4lf2BJviDQ X-Google-Smtp-Source: AGHT+IGst9xz6lRKjNLRUaepPVP7XDRBQwLaave1Q14UBel9iUd7GYfKHxbWGnDFjq1biDlJUfSwNA== X-Received: by 2002:a17:902:b614:b0:1d4:ebbd:e7dd with SMTP id b20-20020a170902b61400b001d4ebbde7ddmr5254264pls.125.1705983393118; Mon, 22 Jan 2024 20:16:33 -0800 (PST) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca01:19f0:66cf:30fc:9774:9e5a]) by smtp.gmail.com with ESMTPSA id iz11-20020a170902ef8b00b001d73126cac1sm4380274plb.173.2024.01.22.20.16.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 20:16:32 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web][PATCH 2/5] layerindex/recipeparse.py: extend bbclass regex Date: Mon, 22 Jan 2024 20:15:21 -0800 Message-Id: X-Mailer: git-send-email 2.34.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, 23 Jan 2024 04:16:35 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62234 Extend the bbclass regex to match classes-global and classes-recipe [YOCTO #15238] Signed-off-by: Tim Orling --- layerindex/recipeparse.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layerindex/recipeparse.py b/layerindex/recipeparse.py index 6202745..9be6c10 100644 --- a/layerindex/recipeparse.py +++ b/layerindex/recipeparse.py @@ -130,7 +130,7 @@ def setup_layer(config_data, fetchdir, layerdir, layer, layerbranch, logger): machine_conf_re = re.compile(r'conf/machine/([^/.]*).conf$') distro_conf_re = re.compile(r'conf/distro/([^/.]*).conf$') -bbclass_re = re.compile(r'classes/([^/.]*).bbclass$') +bbclass_re = re.compile(r'classes(?P-global|-recipe)?/(?P[^/.]*).bbclass$') def detect_file_type(path, subdir_start): typename = None if fnmatch.fnmatch(path, "*.bb"): @@ -149,7 +149,7 @@ def detect_file_type(path, subdir_start): res = bbclass_re.match(subpath) if res: typename = 'bbclass' - return (typename, None, res.group(1)) + return (typename, None, res.group('name')) res = distro_conf_re.match(subpath) if res: typename = 'distro' From patchwork Tue Jan 23 04:15:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 38213 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 86458C47258 for ; Tue, 23 Jan 2024 04:16:55 +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.web11.4233.1705983409438031136 for ; Mon, 22 Jan 2024 20:16:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=WkJ5nDPu; spf=pass (domain: gmail.com, ip: 209.85.214.182, mailfrom: ticotimo@gmail.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1d731314e67so8100035ad.1 for ; Mon, 22 Jan 2024 20:16:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705983408; x=1706588208; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ea/u4GlbSVQPP9JZ4Vie0xkz5yM2JIhwedV383xElg4=; b=WkJ5nDPuWq5ulCBWtrMMQe17zwnMVLXKhy5dbUMXtuXCpphW3bq9Wr4AqkI3UtW5Wp 4pzwt/yC4DdLQqc5bajuEoqA4TcJxEHYe8Gj35FtTSAhk+r67PhcHWIzkRxatc7NCpBO /H9LJHvR4FywizNRW5r1yCC0R6fg4CpUgWH7Gt4kf5sVz2ZwUJJ+n4z6wiYvC1NE/IfK VdJbNDUEQgfy+eWKM+e+MuqyzAVftd8pT/+hAJQ0an7M94GKUhT+xlodPLiqffBEYBDW qCqD3bR/YmDOmEogzOpcbk48wJOUTJGfW6w7U2BSjqpp2+D12Wte4YUyvtN4UhZvAh5V 30hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705983408; x=1706588208; 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:message-id:reply-to; bh=ea/u4GlbSVQPP9JZ4Vie0xkz5yM2JIhwedV383xElg4=; b=sgUczQB0H6v4Jx4JdJNQ0WWya+0WvSgSZ6pChBO5yMOPMZMKfnjXAocZADJAxZNeuH lRMhjkNiWZhltF/FyhVD7TPc1A7+HFE91zX4Geq3mInEZQms0JN6IiLF74ziW1ehPM2j xf2uZNE2826d2echx43mN2U6oSqJmKKEgQB+E4I83yOW88iRtDgvDpVLg9FgndDQAubo rlaOc3T8XESJuuzo8Xv+EfV7F/j99M9HWAEuiRGZgbGMt8vOxHnGx4lBiK1B1EsSARUr //tc5lVUAIPAjl+N/mQp3xOYM/1ZNTz8BZgjEoQBOcMazamRw/YtUJdAj8iNs0KC0Zj+ w5Cg== X-Gm-Message-State: AOJu0YyLWgaawviTVfGM9dt6oNNz5HifuBoJDGP1opI4sUvFk9CtycJ3 MXwZLoTEZaL/n6B3GRJA61Y9Uduw+sI3wqoywuV3tU/TVuDiR0sP+4KDTqG4 X-Google-Smtp-Source: AGHT+IFO54WPkMpYm+/P2P566eECoKFYFmpJ6xpP/OG4uB/a5zzPKR+tPgVNDqdyCnI4DqGAtahK+Q== X-Received: by 2002:a17:902:d4cf:b0:1d7:691e:2704 with SMTP id o15-20020a170902d4cf00b001d7691e2704mr969887plg.35.1705983408429; Mon, 22 Jan 2024 20:16:48 -0800 (PST) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca01:19f0:66cf:30fc:9774:9e5a]) by smtp.gmail.com with ESMTPSA id iz11-20020a170902ef8b00b001d73126cac1sm4380274plb.173.2024.01.22.20.16.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 20:16:48 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web][PATCH 3/5] layerindex/views: add classes-recipe,-global Date: Mon, 22 Jan 2024 20:15:23 -0800 Message-Id: X-Mailer: git-send-email 2.34.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, 23 Jan 2024 04:16:55 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62235 Since commits: bitbake f33ce7e7 'BBHandler/cooker: Implement recipe and global classes' oe-core f5c12800 'classes: Update classes to match new bitbake class scope functionality' we now have a lot of the oe-core recipe classes in meta/classes-recipe. We are also missing any bbclasses in meta/classes-global [YOCTO #15238] Signed-off-by: Tim Orling --- layerindex/views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/layerindex/views.py b/layerindex/views.py index 04e39d7..c7a1f09 100644 --- a/layerindex/views.py +++ b/layerindex/views.py @@ -51,7 +51,8 @@ from layerindex.forms import (AdvancedRecipeSearchForm, BulkChangeEditFormSet, LayerMaintainerFormSet, RecipeChangesetForm, PatchDispositionForm, PatchDispositionFormSet, BranchComparisonForm, RecipeDependenciesForm) -from layerindex.models import (BBAppend, BBClass, Branch, ClassicRecipe, +from layerindex.models import (BBAppend, BBClass, BBClassGlobal, BBClassRecipe, + Branch, ClassicRecipe, Distro, DynamicBuildDep, IncFile, LayerBranch, LayerDependency, LayerItem, LayerMaintainer, LayerNote, LayerUpdate, Machine, Patch, Recipe, From patchwork Tue Jan 23 04:15:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 38214 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 8808FC47258 for ; Tue, 23 Jan 2024 04:17:15 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web10.4254.1705983427303686522 for ; Mon, 22 Jan 2024 20:17:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=htr22w42; spf=pass (domain: gmail.com, ip: 209.85.210.169, mailfrom: ticotimo@gmail.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6dd7a44d51bso93990b3a.3 for ; Mon, 22 Jan 2024 20:17:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705983426; x=1706588226; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4rKILDO4obWs1GTEI+Wo6oazDKJX6ZYIoYlII8ukvKg=; b=htr22w42ztPSQ0yg3ABO25eNgzIlorYvEzRiMB58z1eXEoc/xByRe5nyAvZoVlbLTp i5UjczUGr5aF7BDDPBAVIv2gj1FgQtirNQWTMT5GOS6jpBwYSMFuL2t7seIrARYZjuvv XsA60ldxgNpYuE1ZFxzSmV6kQ7jOYxnefVloP1aURdxTOl0GAjRJmuXDkBxkNH+K4Gfw J+BXoSnqO6pBZQwHCmhYqCgdBCJNwwr3CHKqdrzuCHjSI67YW5ZbLSdJP9s+rsRT1hbT VzhpE4zviukkw6+clcEMC+tXy9xli3Jzo2rbceKUrd6Y01uhYGT6wHAh0fPijgwBUM6r EVYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705983426; x=1706588226; 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:message-id:reply-to; bh=4rKILDO4obWs1GTEI+Wo6oazDKJX6ZYIoYlII8ukvKg=; b=TENUB9JNBxoHIawYxIlacg+MR44yG2QOUzLbhQEG6rNv57398v7Ybrd71UCKYFXDcp JpLT0KogDVe0DZy9fZa+tXdB5ILD5U2tjL1GiMFPX9XMzM6C/E5f7wnyPxNCGT3+3KUW WYkyo/l1u/Azm3K2d88BgHVzdFnZJmptETs0H5wC1teXRMKvJJgQ8JtJq7qoCpR4k1U8 P8wR7CkUFLcjhrq31VltzOP/nhjaz1DaKltSMDddcMM7UexiJyj6C9kZjgfv6ZNxOgft FB8uDopBSnC8zbNlNQlyRCpV8w5b5VvJObgOwyQ916mxAChUn1lNz9ATzWqhjyiqtas8 OmJQ== X-Gm-Message-State: AOJu0YxrS2BiMjI4FApD58q4nXCqIlaThNmy/+FSwUAMkImmn0ktAI9S X+87w1Z39NO6tF/ISAZl0nMRLlHX4uMPG0EXl6PFEDkJBiRvdgHbq6yh1/xI X-Google-Smtp-Source: AGHT+IEcO7XaVtDiWXdoNIqpzkMNF5kNNIPqES/nCHzleaQ+GKNhE+Yn8L5+kI5+heffDImBZJAhnQ== X-Received: by 2002:a05:6a20:4e0f:b0:19a:92b:3f14 with SMTP id gk15-20020a056a204e0f00b0019a092b3f14mr2339974pzb.92.1705983426256; Mon, 22 Jan 2024 20:17:06 -0800 (PST) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca01:19f0:66cf:30fc:9774:9e5a]) by smtp.gmail.com with ESMTPSA id iz11-20020a170902ef8b00b001d73126cac1sm4380274plb.173.2024.01.22.20.17.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 20:17:05 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web][PATCH 4/5] templates: add bbclasstype badge Date: Mon, 22 Jan 2024 20:15:25 -0800 Message-Id: <38ec722128dd948370b97191f6681f3d6baf36e6.1705982792.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.34.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, 23 Jan 2024 04:17:15 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62236 Now that we have different BBClass subtypes, it is handy to have a UI indication of the different types. Add "badges" to display "Global" (for 'classes-global' paths) or "Recipe" (for 'classes-recipe' paths). [YOCTO #15238] Signed-off-by: Tim Orling --- templates/layerindex/classes.html | 5 ++++- templates/layerindex/detail.html | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/templates/layerindex/classes.html b/templates/layerindex/classes.html index bc3d0ac..e99761b 100644 --- a/templates/layerindex/classes.html +++ b/templates/layerindex/classes.html @@ -54,7 +54,10 @@ {% for class in class_list %} - {{ class.name }} + + {{ class.name }} + {{ class.bbclass_type }} + {{ class.layerbranch.layer.name }} {% endfor %} diff --git a/templates/layerindex/detail.html b/templates/layerindex/detail.html index 0fa8caf..11c7df7 100644 --- a/templates/layerindex/detail.html +++ b/templates/layerindex/detail.html @@ -311,7 +311,10 @@ {% for class in classes %} - {{ class.name }} + + {{ class.name }} + {{ class.bbclass_type }} + {% endfor %} From patchwork Tue Jan 23 04:15:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 38215 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 89ADDC47258 for ; Tue, 23 Jan 2024 04:17:25 +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.web10.4260.1705983441272237193 for ; Mon, 22 Jan 2024 20:17:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ZNLJ5M+X; spf=pass (domain: gmail.com, ip: 209.85.214.182, mailfrom: ticotimo@gmail.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1d6ff29293dso23422685ad.0 for ; Mon, 22 Jan 2024 20:17:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705983440; x=1706588240; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=H3v92YiXzlK026DqoKSXaBDzSqgr6i8vYgmQ8oOtI+w=; b=ZNLJ5M+X+7BlFlKNsAOhYEvn6eHRDATxTKk/KPBH5JjZqC5z90iKIQfrz3/exQMagH zTvMTHOB7x32NHANxbMQAQP4IIsVbMAFL3GTfdorYCTxcY1YbnOskE2jpHXxvCDc6QYo slb1eA30k0NhQTffSN7TYH51xOEv9XAsDdvD07CnIeMUNyZt73A0QVSdUMt0PspkwQ88 uXeiO17iL0L61q2gXCqCavNb7Wlbs+Cv97ma7CP73fzB9H9H6E3rVGbbtrfr+hdNQ187 1R9S9GgeOfQmUvebnol81OB1YOztYidNLptAn61HWObsvh6W4Jg+LeeqvN4kuUSVJNx9 dzwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705983440; x=1706588240; 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:message-id:reply-to; bh=H3v92YiXzlK026DqoKSXaBDzSqgr6i8vYgmQ8oOtI+w=; b=QCVEIhAQ/XabOFxSu2FOwVOl8XEl9UBp81XVlhl23I59LSvIid+NN68Wj6WPDnFxcG mO20DbFYS+dzwvxUcqgRyYHLYl8hTOS8yaSR7yNaznvsravtvVue/kaWIH84z0LSnu0X hFhOMlSHHgbCMQo/zqp42oGDPZWfOIub5Pr4a8x2aQSLipIAKvqL7ONxXKHHinEsh4Ii u2zdxYC/gZjiRUx570Vf6HWjiIW9pngrJTDSTay0m/m1fLt2KUz47XqJw1Xq6Nx7tRTX AHbIiVQEw1ZJqXekF3lJKWFEk3uqFUcI8NmoUmn0ztstgYLWIDACd1aJV+Gnv8dbbuDk 0K/g== X-Gm-Message-State: AOJu0YyTMLzBQwCMouUHSVXXDLy408EULOX9A0Zn87OtJmZpMotvbmUS RrojbmelZ+E8pzSB8Bwia5Nv+MkVy6+3U7PYb0o9Rd0Qd1+dqOMGAyojWRHu X-Google-Smtp-Source: AGHT+IFIPG4btZ+fuuG6MGpnHLALH95uXizPnfC+c46qFm63fvyyrvv3dS4VIkbHIdCOSDy79y8MPw== X-Received: by 2002:a17:902:6943:b0:1d4:4467:97dc with SMTP id k3-20020a170902694300b001d4446797dcmr2905939plt.6.1705983440342; Mon, 22 Jan 2024 20:17:20 -0800 (PST) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca01:19f0:66cf:30fc:9774:9e5a]) by smtp.gmail.com with ESMTPSA id iz11-20020a170902ef8b00b001d73126cac1sm4380274plb.173.2024.01.22.20.17.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 20:17:20 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web][PATCH 5/5] layerindex/update_layer.py: enable classes-global,-recipe Date: Mon, 22 Jan 2024 20:15:27 -0800 Message-Id: X-Mailer: git-send-email 2.34.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, 23 Jan 2024 04:17:25 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62237 Add support for the new BBClassGlobal and BBClassRecipe sub-classes. [YOCTO #15238] Signed-off-by: Tim Orling --- layerindex/update_layer.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py index d9bec0c..33c5cfb 100644 --- a/layerindex/update_layer.py +++ b/layerindex/update_layer.py @@ -296,7 +296,10 @@ def main(): utils.setup_django() import settings - from layerindex.models import LayerItem, LayerBranch, LayerDependency, Recipe, RecipeFileDependency, Machine, Distro, BBAppend, BBClass, IncFile + from layerindex.models import (LayerItem, LayerBranch, LayerDependency, + Recipe, RecipeFileDependency, Machine, + Distro, BBAppend, BBClass, + BBClassGlobal, BBClassRecipe, IncFile) from django.db import transaction logger.setLevel(options.loglevel) @@ -644,7 +647,12 @@ def main(): update_distro_conf_file(os.path.join(repodir, path), distro, config_data_copy) distro.save() elif typename == 'bbclass': - bbclass = BBClass() + if '/classes-global/' in path: + bbclass = BBClassGlobal() + elif '/classes-recipe/' in path: + bbclass = BBClassRecipe() + else: + bbclass = BBClass() bbclass.layerbranch = layerbranch bbclass.name = filename bbclass.save() @@ -765,7 +773,12 @@ def main(): update_distro_conf_file(fullpath, distro, config_data_copy) distro.save() elif typename == 'bbclass': - bbclass = BBClass() + if '/classes-global/' in fullpath: + bbclass = BBClassGlobal() + elif '/classes-recipe/' in fullpath: + bbclass = BBClassRecipe() + else: + bbclass = BBClass() bbclass.layerbranch = layerbranch bbclass.name = filename bbclass.save()