From patchwork Mon Jan 15 18:03:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 37871 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 E8796C47422 for ; Mon, 15 Jan 2024 18:03:32 +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.90056.1705341804860710828 for ; Mon, 15 Jan 2024 10:03:24 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=fH0UKnGL; spf=pass (domain: gmail.com, ip: 209.85.210.170, mailfrom: ticotimo@gmail.com) Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-6d9bba6d773so7858303b3a.1 for ; Mon, 15 Jan 2024 10:03:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705341804; x=1705946604; 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=Usj1EVBYLbvqkE71r80OWMRnMfp1W7hYok7N/hSchIo=; b=fH0UKnGLLGNIpqX4gavod43TsECotHLintrtrGhvKTPrZKZZG4ZHIOM0PnyYFDhj/y dMuL1IaeXFnxJnCxTNQMY0Yl9h1l8Yc/kouEfOuNkSKqEWYwrXnxRzgfkgbopOq0+977 SUiAGxOJXxXtOmT+Uk824L8NZXbR8lPwR3EpoYtHQeBo+qqP1EpixDxJZrOgmmjBTv6Z 9DcEnCdZNTzGeTeySU8ZKba3HsAzV6Xq0liml3xKV7mJ/XnLhY8ez3IxsolLTIajvJQJ Mr+5Tzjp59qOHArW1VBECqFig/mlHNg8+8tfGFt2PiuFSlSxsJrWk+6f3SiS8y8brS9G jVCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705341804; x=1705946604; 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=Usj1EVBYLbvqkE71r80OWMRnMfp1W7hYok7N/hSchIo=; b=q3G34MbCYyuduAv6+s9dR2n9ozkJbc3bKY9SSCnHHTFa/K4n1uZlzerRrlyqnCPdDR JtP72WtXFqfQQnaDe94D8wLjicRiQ+zdY1x1TVIg+Edc2F0Q09D2edEUUPqA1eyeqs+b 1/tZKDyuDQqpUaXTTc90Iv17ICMbJWJAra1BT2wUdX+iS1CgHzcTuQ9yZIFBmBzTdTo2 3+t4OgP/0H85MkpWb9aspN/dyAN9CYtRjUgxYQ0gCIm8jutAOam0OxD2pcUmpe63Tfp4 hGLscgue1mvHpize+Gj/dJKW3kv0WhDe6mbHJjVlDFJR4hDsiDD6OdzKBl2SF3lZ0M6r uGEw== X-Gm-Message-State: AOJu0YzkgWnGucul+hEzJplBKz3s1p+s09IlzudpDm/UFKz4+U5TswXc 7n8y+23wu+Dpp9gfADBnRDMuh1sqHHU= X-Google-Smtp-Source: AGHT+IFC2yq0U7zVfpKGqo+FrDo6cErso7ZV0P1G+NedX+RzxlxTGp4umUzQEuwWxlZLdI6wjUVq9g== X-Received: by 2002:a05:6a21:6d9b:b0:19a:66a4:7966 with SMTP id wl27-20020a056a216d9b00b0019a66a47966mr6539123pzb.55.1705341803994; Mon, 15 Jan 2024 10:03:23 -0800 (PST) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca01:19f0:9093:7b1b:b931:af99]) by smtp.gmail.com with ESMTPSA id s5-20020a056a00178500b006d96ad39308sm7880792pfg.165.2024.01.15.10.03.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 10:03:23 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web][PATCH 1/6] rrs_maintainer_history: new override syntax Date: Mon, 15 Jan 2024 10:03:12 -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 ; Mon, 15 Jan 2024 18:03:32 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62154 * Allow the regex for RECIPE_MAINTAINER to use either _ or : override syntax to allow processing maintainer changes across the change boundary. Signed-off-by: Tim Orling --- rrs/tools/rrs_maintainer_history.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rrs/tools/rrs_maintainer_history.py b/rrs/tools/rrs_maintainer_history.py index 15e1d17..d2dd94a 100755 --- a/rrs/tools/rrs_maintainer_history.py +++ b/rrs/tools/rrs_maintainer_history.py @@ -37,7 +37,7 @@ MAINTAINERS_INCLUDE_PATH = 'conf/distro/include/maintainers.inc' """ def get_recipe_maintainer(line, logger): import re - regex = re.compile('^RECIPE_MAINTAINER_pn-(?P.*)\s=\s"(?P.+) <(?P.*)>"$') + regex = re.compile('^RECIPE_MAINTAINER[:_]pn-(?P.*)\s=\s"(?P.+) <(?P.*)>"$') match = regex.search(line) if match: From patchwork Mon Jan 15 18:03:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 37874 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 03053C47DA6 for ; Mon, 15 Jan 2024 18:03:33 +0000 (UTC) Received: from mail-oo1-f51.google.com (mail-oo1-f51.google.com [209.85.161.51]) by mx.groups.io with SMTP id smtpd.web10.90057.1705341806869364366 for ; Mon, 15 Jan 2024 10:03:26 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hz36k8Bk; spf=pass (domain: gmail.com, ip: 209.85.161.51, mailfrom: ticotimo@gmail.com) Received: by mail-oo1-f51.google.com with SMTP id 006d021491bc7-598d168f253so1742776eaf.3 for ; Mon, 15 Jan 2024 10:03:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705341805; x=1705946605; 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=PjXg9NKiFSL8Lm1s7gTvlUIdXnp++64MsH4tD0kla1g=; b=hz36k8Bk3nR5BYx6KSjy0/b1EivEqtLFWffpbY/5OTgLwSbIzCMInrgJjijdkqWHCe Wt6aW/aTApD3QDx5Xl35Kn67Y2zrTWzg3V90xYqPr3L/Y6MgcP44jIBFBAii0SJsaIyr rMUIf+3O7n1AkBxHYtSzUBq1hdzMy5R+ruzhxPkFLDVxTBdMMoL83bloyp3Q/IaBvwVD PGO+Ty8/3bsuwP+wFXlBwcINgcXH5DJGfnTcMQ6/D99Zg52I1R369AOsfQNHYjyftBoB msCwt4nzR1hrgI1oqSdzvCFq0LestnbP4Gsq0SGKm8GCBRIxHx4554BetIeAMRHg71VH oqZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705341805; x=1705946605; 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=PjXg9NKiFSL8Lm1s7gTvlUIdXnp++64MsH4tD0kla1g=; b=kEBUX7Tix/xSqkTx43rl9EqFnW6Ny2LXWp+MmmeBnkp5OFlPFPQaOpTDUJ8HB+vQtf 6HMT4BYcxfXZjJ4Ap6gSOtUi4f27bHOtSoPotI43Shp/NllE+BYCrN3iS3gZcm1OqwR4 JMw0Rg3AfirIHRoohqjRFYhrLwv+PapuMHnsvc/sECtNo15n52LgJm7R5uWjvHz1y5Dz a9wriGNIz81xljQADkZRIBQ3Wbq7NG7ok541lsduCAT4oRwC5XJgKNXSqArtpmoZUeJj 1d2PPtVosK6IBAOeiQ6KmwGHMf4uoc9b2kc9lqOjLDdGfI+y4zN3o/cf0Q1zTiUScu2l nZUg== X-Gm-Message-State: AOJu0YyGL17aPvpTLuyJeJDGc26Lb+htNdBTimk1xO9Y7Idlx4EPYh3x gJm/Hf+NvIomjJC/khIj7kTAaJvzJEM= X-Google-Smtp-Source: AGHT+IFg2PxFjf5TYjN+mKR3ccc5R506+60UCjq1v/B12U9UKynBgDsblBUt7bEJhnFn961eCOjHLA== X-Received: by 2002:a05:6358:60ca:b0:173:8b3:71c2 with SMTP id i10-20020a05635860ca00b0017308b371c2mr8906945rwi.45.1705341805452; Mon, 15 Jan 2024 10:03:25 -0800 (PST) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca01:19f0:9093:7b1b:b931:af99]) by smtp.gmail.com with ESMTPSA id s5-20020a056a00178500b006d96ad39308sm7880792pfg.165.2024.01.15.10.03.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 10:03:25 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web][PATCH 2/6] rrs_maintainer_history: fix syntax Date: Mon, 15 Jan 2024 10:03:13 -0800 Message-Id: <836eca1d82cdc4d9335e741fc5ef4a6c67dedd69.1705341467.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 ; Mon, 15 Jan 2024 18:03:33 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62155 * Fix the link_maintainer.recipesymbol.pn syntax for debug logging Signed-off-by: Tim Orling --- rrs/tools/rrs_maintainer_history.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rrs/tools/rrs_maintainer_history.py b/rrs/tools/rrs_maintainer_history.py index d2dd94a..a6da861 100755 --- a/rrs/tools/rrs_maintainer_history.py +++ b/rrs/tools/rrs_maintainer_history.py @@ -136,7 +136,7 @@ def maintainers_inc_history(options, logger, maintplan, layerbranch, repodir, la rm.history = rms rm.save() if link_maintainer: - logger.debug("%s: linked to maintainer for %s" % (recipe.pn, link_maintainer.recipe.pn)) + logger.debug("%s: linked to maintainer for %s" % (recipe.pn, link_maintainer.recipesymbol.pn)) else: logger.debug("%s: Not found maintainer in commit %s set to 'No maintainer'." % \ (recipe.pn, rms.sha1)) @@ -155,7 +155,7 @@ def maintainers_inc_history(options, logger, maintplan, layerbranch, repodir, la rm.history = rms rm.save() if link_maintainer: - logger.debug("%s: New recipe linked to maintainer for %s" % (recipe.pn, link_maintainer.recipe.pn)) + logger.debug("%s: New recipe linked to maintainer for %s" % (recipe.pn, link_maintainer.recipesymbol.pn)) else: logger.debug("%s: New recipe not found maintainer set to 'No maintainer'." % \ (recipe.pn)) From patchwork Mon Jan 15 18:03:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 37875 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 11D63C47DA9 for ; Mon, 15 Jan 2024 18:03:33 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mx.groups.io with SMTP id smtpd.web11.89456.1705341807639378391 for ; Mon, 15 Jan 2024 10:03:27 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=GbYldAY5; spf=pass (domain: gmail.com, ip: 209.85.210.173, mailfrom: ticotimo@gmail.com) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-6da6b0eb2d4so4505463b3a.1 for ; Mon, 15 Jan 2024 10:03:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705341807; x=1705946607; 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=rQBfUxQpT+iHqV9dUv/Dz+CpVOq4dYTiW4sRo3NuEvs=; b=GbYldAY5oe7s/sm4MTvbjOqmCcE8B+jybSaY+r0cOLvVYFvqLoIzScI5Loj6cZWLzy 9NMf4TxeZAJcIzM2liaztv9l/c4FN+sf0fWGkMnsk+dHihprlA6UXelJBmCzPvT4wJso 3Z8ozQ/k0G4jdTatIOXNQoQvTJIu5eXkDp5j07Hzui52lCtfwMzU0Mq2oXJ8jmPYHwdJ /M2TWiUg54am9jNAv3Q7gUVvHfqtWHI9JNoVfDn6Wq+bim0SltJAjtGxi9C5/pfsqTTg lGvKMgkDAn7xkhdVmSd+7B/BNuLMXZsVF1eAKAKQJMVtrWcB3Gh0iZIVQrFkAgTBnHup A4Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705341807; x=1705946607; 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=rQBfUxQpT+iHqV9dUv/Dz+CpVOq4dYTiW4sRo3NuEvs=; b=Ow6f8KlfCSXmVqXwYpukIT3xdldfwPcn9d1gx+t5xfFLa4YNJfhoKQzeVV+2w/8yGM KAiKRWsvxnn+emP728swTaWykEGhYmpOv08jxoZbur2HT5QNRG3TGG4fpDyBrrMHbzr3 O2g5+Hs+FlehERLYIuUXtsf+U9p1elSIKCtuway/4SOEj0+VNjdc/3INvyeplJTdKewL 5unULGMk7zjdGGLwWPnv2oZk6QtPG0YYn7Dcbi1jxHITeOpxgePqNaKbZRvScn7JBPrr 7x0kfpCs2a9mDnUYSlX3BI3eqZT6g22q5XeOsdcx1g3SmvKYVNAgoCg/BtmDJUe31aOL ZLjA== X-Gm-Message-State: AOJu0Yz1GAf8rkKoMLwaNrO35yr6bpcKWZ0fAFs8WmLeSLJiuqBsOx+0 41hhgDhcqL/tf1wp4jiBCjEm3oyt3xc= X-Google-Smtp-Source: AGHT+IEwhWxnMCe9o0AFInb9SIsSqx3s9bFhRiVgBkXyNMnEdRYhrIe4YE5yI/c7I5K/AbkmdDgLLQ== X-Received: by 2002:a05:6a20:96c3:b0:19a:61d2:6fa7 with SMTP id hq3-20020a056a2096c300b0019a61d26fa7mr2319323pzc.105.1705341806729; Mon, 15 Jan 2024 10:03:26 -0800 (PST) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca01:19f0:9093:7b1b:b931:af99]) by smtp.gmail.com with ESMTPSA id s5-20020a056a00178500b006d96ad39308sm7880792pfg.165.2024.01.15.10.03.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 10:03:26 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web][PATCH 3/6] rrs_upgrade_history: remap new srcrev fetcher API Date: Mon, 15 Jan 2024 10:03:14 -0800 Message-Id: <1fccf3217540a67751e6890ccfacfa23fc48b102.1705341467.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 ; Mon, 15 Jan 2024 18:03:33 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62156 When performing rrs_upgrade_history for commit date 8/24/2023, the 'fetch2: Add new srcrev fetcher API' bitbake commit is not automatically added. Fix this by remapping 'cooker: Fix error message' (8/22/2023) to the tag on 8/24/2023 'fetch2: git: Check if clone directory is a git repo'. This allows upgrade history for oe-core to continue across the 8/24/2023 date. Fixes: 2024-01-08 23:59:07,114: DEBUG: run cmd '['git', 'show', '-s', '--format=%ci']' in /opt/workdir/git___git_openembedded_org_openembedded-core 2024-01-08 23:59:07,215: DEBUG: output: 2023-08-24 13:34:35 +0100 2024-01-08 23:59:07,227: DEBUG: run cmd '['git', 'rev-parse', 'HEAD']' in /opt/workdir/bitbake 2024-01-08 23:59:07,329: DEBUG: output: a06619951a43acb80b80d92e0caac560657ca249 2024-01-08 23:59:07,448: DEBUG: Running "GIT_DIR=/opt/workdir/bitbake/.git git merge-base --is-ancestor 87104b6a167188921da157c7dba45938849fb22a HEAD" NOTE: Starting bitbake server... ERROR: Failure expanding variable fetcher_hashes_dummyfunc[vardepvalue], expression was ${@bb.fetch.get_hashvalue(d)} which triggered exception AttributeError: module 'bb.fetch2' has no attribute 'get_hashvalue' The variable dependency chain for the failure is: fetcher_hashes_dummyfunc[vardepvalue] Signed-off-by: Tim Orling --- rrs/tools/rrs_upgrade_history.py | 1 + 1 file changed, 1 insertion(+) diff --git a/rrs/tools/rrs_upgrade_history.py b/rrs/tools/rrs_upgrade_history.py index 9b74a05..42ba9b8 100755 --- a/rrs/tools/rrs_upgrade_history.py +++ b/rrs/tools/rrs_upgrade_history.py @@ -182,6 +182,7 @@ def upgrade_history(options, logger): # Filter out some bad commits remap_range('fef18b445c0cb6b266cd939b9c78d7cbce38663f', '39780b1ccbd76579db0fc6fb9369c848a3bafa9d') remap_range('5796ed550d127853808f38257f8dcc8c1cf59342', '547128731e62b36d2271c4390b3fee2b16c535dc') + remap_range('a06619951a43acb80b80d92e0caac560657ca249', '2117db3146ce38bb4a6e2df40b6cd2ab11b514d5') if options.stop_commit and (options.stop_commit not in [x.split()[0] for x in commit_list]): logger.error('Stop commit %s is not in repository %s' % (options.stop_commit, repodir)) From patchwork Mon Jan 15 18:03:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 37873 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 D1576C47258 for ; Mon, 15 Jan 2024 18:03:32 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web10.90064.1705341809245631495 for ; Mon, 15 Jan 2024 10:03:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=IPTuSNEf; spf=pass (domain: gmail.com, ip: 209.85.210.181, mailfrom: ticotimo@gmail.com) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-6db82a57c50so651126b3a.2 for ; Mon, 15 Jan 2024 10:03:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705341808; x=1705946608; 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=u7yWiaaX+OhGqfWmdz0ecJW1uP+ldd2UxoB4tzNiZE4=; b=IPTuSNEfXcrJb1EwzSx7Tq5pFWLAtfVoKJnIramREBmFcO4qPQKn4nKvLyK7UEILmp QAU3Fk5AQUYOSswRbghvfc4Ok4qtsFm3EVWhGvizyGxoZ1PsPvmCS/6jXjHc66z42fDX Shnhl4eHL/Kbrjync5Zyki47xq7aNaV9VVqzOsOfgZp/Gu6Ad5QwXbXCYwU0bHkJjf4L bhkBXdHv5tqrLFyumNTQ2FXbXvRjzrTxeoY1WswRjuO3NRIlhSnJwk1vNqL0EpAm+ju7 B9S4HqNBm4pSfvIjF1Ez5/G0yaP6g6k12yh9JZ7BJSEHiWQvbPvKxKpMDhbm1HDuBMD6 qNdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705341808; x=1705946608; 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=u7yWiaaX+OhGqfWmdz0ecJW1uP+ldd2UxoB4tzNiZE4=; b=PVtd7aR8aXXkCYiIEUfDmBjxFho4QIm/NBK8FRU9r/WqgRMsGQWqzdcdzhQ2eTyGSY YuulnwaiRxdiLf9zcP0BXZoJiQy5a6zmm9ReX8CHvVBm/y+WYrqFMT2HgMujvPv+gE/Z ucoraM9cbeVPVpvvZv3ADkcGW1f9hPU4riyWCpaORFnhegyuv3ETv6vi92DyleiTeUGV BCcxMdZG0f3GEuxAkRRsbb3QXGPL2dktVlmHJlHbF8vGUmgCwVo52AdNfq/XRBxCLBsE c4qCGkb98lgYn0qVUqxUK/Su/kdrms19oJlUCoC0ijU7vQcIlhZB5Z9Mr6QEmQBWID3h AqDQ== X-Gm-Message-State: AOJu0YznTNmhLHfm6TE6FTBBR5RXAFvuYxu/J1XXKj/rzTYfICaSLQK6 UueE2SzlGkHGT5kdHPcX6T7s19ZbeRw= X-Google-Smtp-Source: AGHT+IHCoF5Mr7qt1AN+HKY+QaG99tfZM1SiahWpHnT3wyWijcrgf/Hgv6NVPQR3/qxILFlxhS+9EQ== X-Received: by 2002:a05:6a20:d80e:b0:19a:f083:1824 with SMTP id iv14-20020a056a20d80e00b0019af0831824mr1161374pzb.25.1705341808353; Mon, 15 Jan 2024 10:03:28 -0800 (PST) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca01:19f0:9093:7b1b:b931:af99]) by smtp.gmail.com with ESMTPSA id s5-20020a056a00178500b006d96ad39308sm7880792pfg.165.2024.01.15.10.03.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 10:03:28 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web][PATCH 4/6] rrs_upstream_history: allow skip update_data Date: Mon, 15 Jan 2024 10:03:15 -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 ; Mon, 15 Jan 2024 18:03:32 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62157 Fixes: Traceback (most recent call last): File "/opt/layerindex/./rrs/tools/rrs_upstream_history.py", line 210, in set_regexes(recipe_data) File "/opt/layerindex/./rrs/tools/rrs_upstream_history.py", line 73, in set_regexes bb.data.update_data(localdata) AttributeError: module 'bb.data' has no attribute 'update_data' bb.data.update_data was dropped in: 584989ed 'data/data_smart/build: Clean up datastore finalize/update_data references' While we are here, drop some trailing whitespace. Signed-off-by: Tim Orling --- rrs/tools/rrs_upstream_history.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rrs/tools/rrs_upstream_history.py b/rrs/tools/rrs_upstream_history.py index 7dbf64c..25f4b20 100755 --- a/rrs/tools/rrs_upstream_history.py +++ b/rrs/tools/rrs_upstream_history.py @@ -70,7 +70,10 @@ def set_regexes(d): localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES', True)) - bb.data.update_data(localdata) + try: + bb.data.update_data(localdata) + except AttributeError: + pass for var in variables: new_value = localdata.getVar(var, True) @@ -107,7 +110,7 @@ def get_upstream_info(layerbranch, recipe_data, result): ru.date = ru_info['datetime'] pv, _, _ = get_recipe_pv_without_srcpv(recipe_pv, - get_pv_type(recipe_pv)) + get_pv_type(recipe_pv)) upv, _, _ = get_recipe_pv_without_srcpv(ru_info['version'], get_pv_type(ru_info['version'])) @@ -143,7 +146,7 @@ if __name__=="__main__": parser.add_option("-d", "--debug", help = "Enable debug output", action="store_const", const=logging.DEBUG, dest="loglevel", default=logging.INFO) - + parser.add_option("--dry-run", help = "Do not write any data back to the database", action="store_true", dest="dry_run", default=False) From patchwork Mon Jan 15 18:03:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 37869 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 DAD4FC47DA2 for ; Mon, 15 Jan 2024 18:03:32 +0000 (UTC) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web10.90066.1705341810622554064 for ; Mon, 15 Jan 2024 10:03:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=V54L4LyP; spf=pass (domain: gmail.com, ip: 209.85.210.171, mailfrom: ticotimo@gmail.com) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-6da4a923b1bso4526351b3a.2 for ; Mon, 15 Jan 2024 10:03:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705341810; x=1705946610; 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=AXK/9s/cGYYQg2qqCTRGGFRnoUFjT76loV+A8iu1ens=; b=V54L4LyP9eArrk1mb+ElFSLv403TJjKGqKRNozsgiqHMhfYetlVC/e2smwQHIOxgwS I2Q4bCPpLSkOjv1pm7fOhXEj6e4kjonSV4OLApDyTBTF3AExSaJX9YLQcoA1Xf+g8FiT /e9wD37OjNkukG/4EyCln9vYAqCUOLOuwisH+hMVKPbmS5xbxR0SbMQtUpa6un4jphvj iqNsn9DCaYlAfU8GaXOunM+gjfeEiQkA6SwI9cySz2BIb5gHFIr57Lo0OO/Skdq4x+2S MZ94Gccw1tFtSzo12ec0/WqxWZ9IT6HAYj7LVKOQv/3Q/xCdFh6w+DGPR18zQuRFUUiQ r6Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705341810; x=1705946610; 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=AXK/9s/cGYYQg2qqCTRGGFRnoUFjT76loV+A8iu1ens=; b=T3JVEStWP7M9VzbBgiOc5Q5YFX/bsFlcCFxY8VShyQ/g3jC1Gt0gYS4g1fX6dVx26N RFKuRt5yVnaH6y6/j1npv908QOG6OWNeMX19YxNrg2GD0ea7hF6NBtagyNJAFaUOS1kv xtwRropFi/132vIThwtxgCaDxs4Vs9cJ2oHFCKwbHtMInAfJlrAUYM4NHCL/elyq8le/ fdAAG+7GMgmupdegiU0dVmtH+1D9DT1DCAY7cSYI6T06akY2LU6k5Qs2fS9xSuCjvESB wrOf6/2Hfi69HAL/q9GZ+TSgJsp7JcYoOJLzvaXk2XE8sUZZo58EUFRiu8w5Enudt4zT ghfw== X-Gm-Message-State: AOJu0YyOWCDl5VpFF9IIOvjSj3z2NcSR1wMATr3CKVCSOfoBt6jWhq/k L6LFQ6vQlArDmOQ6m+zNe6fYwc+1Gsk= X-Google-Smtp-Source: AGHT+IEg3RDIenLmIdfX3t+zBmmMcYMfd4njsULdjjDHAazv5zHDKdyPoDKMBcMGnYcHKFfsebGuUQ== X-Received: by 2002:a62:844d:0:b0:6d9:acc8:a326 with SMTP id k74-20020a62844d000000b006d9acc8a326mr2633516pfd.8.1705341809730; Mon, 15 Jan 2024 10:03:29 -0800 (PST) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca01:19f0:9093:7b1b:b931:af99]) by smtp.gmail.com with ESMTPSA id s5-20020a056a00178500b006d96ad39308sm7880792pfg.165.2024.01.15.10.03.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 10:03:29 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web][PATCH 5/6] rrs_upstream_history: fix get_recipe_pv_without_srcpv Date: Mon, 15 Jan 2024 10:03:16 -0800 Message-Id: <288b2eeba489d89fdcaf579bd7c8a712eb6711a4.1705341467.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 ; Mon, 15 Jan 2024 18:03:32 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62158 The get_recipe_pv_without_srcpv function was renamed to get_recipe_pv_with_pfx_sfx in: 84794b59 lib/oe/recipeutils.py: accommodate SRCPV being optional and deprecated in version check regex Try to import/call the old method and fail over to the new method. Signed-off-by: Tim Orling --- rrs/tools/rrs_upstream_history.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/rrs/tools/rrs_upstream_history.py b/rrs/tools/rrs_upstream_history.py index 25f4b20..bf32c5d 100755 --- a/rrs/tools/rrs_upstream_history.py +++ b/rrs/tools/rrs_upstream_history.py @@ -87,8 +87,11 @@ def set_regexes(d): def get_upstream_info(layerbranch, recipe_data, result): from bb.utils import vercmp_string - from oe.recipeutils import get_recipe_upstream_version, \ - get_recipe_pv_without_srcpv + from oe.recipeutils import get_recipe_upstream_version + try: + from oe.recipeutils import get_recipe_pv_without_srcpv + except ImportError: + from oe.recipeutils import get_recipe_pv_with_pfx_sfx pn = recipe_data.getVar('PN', True) @@ -109,10 +112,16 @@ def get_upstream_info(layerbranch, recipe_data, result): ru.type = ru_info['type'] ru.date = ru_info['datetime'] - pv, _, _ = get_recipe_pv_without_srcpv(recipe_pv, - get_pv_type(recipe_pv)) - upv, _, _ = get_recipe_pv_without_srcpv(ru_info['version'], - get_pv_type(ru_info['version'])) + try: + pv, _, _ = get_recipe_pv_without_srcpv(recipe_pv, + get_pv_type(recipe_pv)) + upv, _, _ = get_recipe_pv_without_srcpv(ru_info['version'], + get_pv_type(ru_info['version'])) + except NameError: + pv, _, _ = get_recipe_pv_with_pfx_sfx(recipe_pv, + get_pv_type(recipe_pv)) + upv, _, _ = get_recipe_pv_with_pfx_sfx(ru_info['version'], + get_pv_type(ru_info['version'])) if pv and upv: cmp_ver = vercmp_string(pv, upv) From patchwork Mon Jan 15 18:03:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 37872 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 EC9B4C47DA7 for ; Mon, 15 Jan 2024 18:03:32 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web11.89458.1705341811997828746 for ; Mon, 15 Jan 2024 10:03:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=BK4Z7hYj; spf=pass (domain: gmail.com, ip: 209.85.210.176, mailfrom: ticotimo@gmail.com) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-6d99980b2e0so7446207b3a.2 for ; Mon, 15 Jan 2024 10:03:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705341811; x=1705946611; 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=X1+739vPgFDT7MOtwCUP4mRY7NX/Hynhh1vqQtdUeDU=; b=BK4Z7hYjC2jewRTOTGjXVMVS0xwWhLtFXEh6KNa2m+NBFVdPCt6plIYaLTcoJdVTXg gN+A3RBJgg8R+DIZqesm2YH3go/Ag9t+9F+NyzrvUIv8NQBkgR8OK/x0s5ITKsx7N/1r sKvB4iGDp91JG6kGUjupFGJ9ncryBisrLIBdiCp8iDPkz7PTNk/H8OcHdbBnHyoA3AZD ZFO69SGRkJokuduE87vBE+W5kJWvJisbqvf1ERsnE0hy0uc375YUzes/thbKSdutaIqb rU6FkpDqzxM2uXOmXo4kRrwsldFXaOoMMRlZYBszo5q1DBc3wcgmNYOxkEY//x4jeH2o Facw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705341811; x=1705946611; 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=X1+739vPgFDT7MOtwCUP4mRY7NX/Hynhh1vqQtdUeDU=; b=ChwOd2aBwzadNdqcZjTcu+j17P0SEVVqw+uY01kJcTSrqtF8DbBSJuUjRIdkua2LKa Dk/Ofg5kUKVzIXAh73MT3ABZ0oQytHZu5SWM9aGoLgUXk6FcHRCHMX1/1a8ezg43ViKV DgWFVPQJ5Nwk9YDoujci84fHehKqRiZtDL+7o1sxP/lU2pomvqnLzN6pHZRqUggMDE/W EKxwmeNg+fyk5m5c/CWnlaGcwUIO2UgYJ1VDBa9t8gf+D0iCNp8W4VwxJd/lwUamuHWa 6XfMW9b0a+18T7Jp9ZXayFs3eQzdvuj2ZHuJmDvj21oAJGVjEAzRyB4mu9inSxOSBbRa /Seg== X-Gm-Message-State: AOJu0Yw1FA84ufcPlUoag2jELZDY7OfIDCXrmByRm57n7kB8M6JTLIII ckcNP0+X8BBErgvkPe3i1ZeM7hcpIrc= X-Google-Smtp-Source: AGHT+IFRaqk11euphfQDpfUdombLM9AN1sau70M3Tql5YMdbRmR4x5dNb4SK9ald7PXn9pMjXlXvuA== X-Received: by 2002:a05:6a20:3947:b0:199:9e93:4ec3 with SMTP id r7-20020a056a20394700b001999e934ec3mr6130537pzg.49.1705341811129; Mon, 15 Jan 2024 10:03:31 -0800 (PST) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca01:19f0:9093:7b1b:b931:af99]) by smtp.gmail.com with ESMTPSA id s5-20020a056a00178500b006d96ad39308sm7880792pfg.165.2024.01.15.10.03.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 10:03:30 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web][PATCH 6/6] rrs_upstream_history: fix get_upstream_info Date: Mon, 15 Jan 2024 10:03:17 -0800 Message-Id: <0f3299e4a3664face731afce56e6c29c7d93ee72.1705341467.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 ; Mon, 15 Jan 2024 18:03:32 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62159 'result' is a list of RecipeUpstream objects... drop legacy 'recipe, ru' syntax. In the current code base, result.append((recipe, ru)) was appending a tuple of the last value of 'recipe' (in 'for recipe_qry:' under 'for maintplan in maintplans:') and the RecipeUpstream object. Fixes: AttributeError: 'tuple' object has no attribute 'history' Signed-off-by: Tim Orling --- rrs/tools/rrs_upstream_history.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rrs/tools/rrs_upstream_history.py b/rrs/tools/rrs_upstream_history.py index bf32c5d..73b6d91 100755 --- a/rrs/tools/rrs_upstream_history.py +++ b/rrs/tools/rrs_upstream_history.py @@ -143,7 +143,7 @@ def get_upstream_info(layerbranch, recipe_data, result): ru.no_update_reason = recipe_data.getVar('RECIPE_NO_UPDATE_REASON', True) or '' - result.append((recipe, ru)) + result.append(ru) if __name__=="__main__": parser = optparse.OptionParser(usage = """%prog [options]""")