From patchwork Wed Nov 8 13:46:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 34067 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 EFC2AC4167B for ; Wed, 8 Nov 2023 13:47:16 +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.13933.1699451227469903765 for ; Wed, 08 Nov 2023 05:47:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=IN1JQqoP; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1cc5916d578so62249195ad.2 for ; Wed, 08 Nov 2023 05:47:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1699451226; x=1700056026; 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=JlCme3nNCJCOUhLGtiS9nGcdARcmiBfisFHPEYGAH+Y=; b=IN1JQqoPPw2au9UPTcTyMdL233/aZrLAp7Xf7IDwCZYOIeeCcKsfRb973STQIB2N/0 3AUpBVEpkdJ7eb89FiCwrZythPI/NMka0RAmns1gfSeeqIZURrlNBnWhX0sqgmV4drGJ PXXgxfjKFcdoAVnQyrbaPNcjpRWJf58xz+JvxjLs9b16dYYbLbvWeUdCqpGKNnVBT21a ldMqrgovB+7QJkgcn3cFusyOGCeApJHiosd76Ph/VxKdP934f1P1+4NmwdJ2iZVjH0c0 gF1NBZ37RUy3s33jSSQG/UXGFiPKWm0rcNGjwK/sT8rCs4WO/w3Qqr8jb493K9IAHKxB +plg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699451226; x=1700056026; 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=JlCme3nNCJCOUhLGtiS9nGcdARcmiBfisFHPEYGAH+Y=; b=dzu2mnmON30kcoskOb372IgndyllH7y6fh8xePzAnzFWTlqjxwjJ3TWJY1I+JvPA/v rW4OJZG27jjvUIqSrWvECBjt+E0wNyiOXUr9CGkd/tfE9ZrsTfp5dexH5Pkce21/FB/O j0zodeLYWNDWhTBNepeHqFHBFBAETi1ZvWKBnq16HEdTlFU/9O41KLB1Nrk7xrnoK7rq xalOdCo/spyVp5r5oI8Vh8rdwQp27UK9TspHazRfk9w0Bz2dXrBDkiY7/+qAbnmTUJTK GY4kgMw19lDeahYT/whjF04YlAssuwR+YVCyp19RY/hrOHuSZzovUnhUvcuHYSOReHy6 yuwg== X-Gm-Message-State: AOJu0YzAp+mWKCmVzj89wEkuAafZraL2UKqxaj7fa15cXcU2TsdMyt7M nw2uttZSzL+X7b3Wf9anghSrFXA5L5w5VamVZYkZCw== X-Google-Smtp-Source: AGHT+IFx2TMN7HzwqGW4gHdevHUqvs1GuQ9h7YPPg7GiEbQW93z1exz1kyRQrgtEJ7SRzLVtOBr0/A== X-Received: by 2002:a17:902:ea0c:b0:1cc:4f55:db72 with SMTP id s12-20020a170902ea0c00b001cc4f55db72mr2303163plg.0.1699451226117; Wed, 08 Nov 2023 05:47:06 -0800 (PST) Received: from hexa.lan (dhcp-72-234-108-41.hawaiiantel.net. [72.234.108.41]) by smtp.gmail.com with ESMTPSA id w12-20020a170902d3cc00b001b7cbc5871csm1781980plb.53.2023.11.08.05.47.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 05:47:05 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 05/10] cve-check: sort the package list in the JSON report Date: Wed, 8 Nov 2023 03:46:46 -1000 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 ; Wed, 08 Nov 2023 13:47:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/190331 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 3846aee5ea..171e472cef 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -104,6 +104,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)