From patchwork Wed Nov 15 03:17:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 34510 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 9190DC47076 for ; Wed, 15 Nov 2023 03:18:06 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web11.5037.1700018279589546684 for ; Tue, 14 Nov 2023 19:17:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=2bTbwRS5; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1cc9b626a96so47991695ad.2 for ; Tue, 14 Nov 2023 19:17:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1700018279; x=1700623079; darn=lists.openembedded.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=DV81cWH/8wfZf7UR9Qb6h71srl3O92Jsl4T+8ZSsUCU=; b=2bTbwRS50VcFX8eXpDLkOd/nzHaAaJQQUgAN8wZNTHvooe+Boql/T7dnRuyoLBQZB6 1DBK9Xhc5ZB4cSdFvAPY6nsSaL7AhpF6voQcbSvFkB7E3cm18NyggXV8C7AuOq/f8vOp 92sgXL5Tk9yMJ10dhyJH9u7WIFUcHTZNwCuLgAfxexjra9lgoIHrOE1ti0fA/E+gQsgg f2/KGzULf/foy76x6VP3Zv39PgQcUWQky4PTqcVpJ4LFfjf6l3vfjvLt5wXSDmzeinNS 9/tTVpvZwNrENUnFQKK81tdS30I7bScGkyLtZ8nr41gvwobvlL31P8RXDAiQ8ymbXaF/ iZsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700018279; x=1700623079; 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=DV81cWH/8wfZf7UR9Qb6h71srl3O92Jsl4T+8ZSsUCU=; b=uU6RHkk2U1ux0TB18kfbTevDBSP4mzYwqj1jN4wyykwUnhjYJ/sQFYhllLE/fMNh0z mwPYR9tu2dmVaYBndjZBq4mpVdo1wKxkSO/6l+666abmAsvkOWTCO4rdrLsmJOoYb8cX pFwP9eCqTxWYrbs1NK8/6xxq66er1zL9mEnjRH8vmy/OFzFiV1Y+Qk89q91w9w/8cFTg D94a4Y/pghVCF+O8mKVPn3x7RLL2ZgT8+3oAqL/YKwKt8qxdnfmdwCOo9CEX/onMqMkk VB2azRlUhC4DSUMlRh0PwyFbMs45nJ8t8lZ5cVkYMHSEXBBabuTMBIKxFvzSRnfQVv1z 5Szw== X-Gm-Message-State: AOJu0YziRywBT3lFptCqdG/xFl1SQQItQku13o3bhrYP4cSiOBeBeVPj Oe2r6QgSaXPEy+F3aHajeUgwrKzJy0MYZ54XQbChGg== X-Google-Smtp-Source: AGHT+IFBy0J3l2PjUGDqowSSrLtl6Z5BW4TBOSZyZp6N+lvNyOGrrwpI0stYwXsMOztsMKPZkJZHbA== X-Received: by 2002:a17:902:704a:b0:1ca:d778:a9ce with SMTP id h10-20020a170902704a00b001cad778a9cemr4229220plt.38.1700018278780; Tue, 14 Nov 2023 19:17:58 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id l5-20020a170903120500b001c6187f2875sm6369300plh.225.2023.11.14.19.17.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 19:17:58 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 10/17] cve-check: sort the package list in the JSON report Date: Tue, 14 Nov 2023 17:17:27 -1000 Message-Id: <5a509bc6f26247cc7561189d582c91816042fd91.1700018112.git.steve@sakoman.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 ; Wed, 15 Nov 2023 03:18:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/190540 From: Ross Burton The JSON report generated by the cve-check class is basically a huge list of packages. This list of packages is, however, unsorted. To make things easier for people comparing the JSON, or more specifically for git when archiving the JSON over time in a git repository, we can sort the list by package name. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit e9861be0e5020830c2ecc24fd091f4f5b05da036) Signed-off-by: Steve Sakoman --- meta/classes/cve-check.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index b0ccefc84d..5e6bae1757 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -97,6 +97,8 @@ def generate_json_report(d, out_path, link_path): cve_check_merge_jsons(summary, data) filename = f.readline() + summary["package"].sort(key=lambda d: d['name']) + with open(out_path, "w") as f: json.dump(summary, f, indent=2)