From patchwork Wed Nov 8 22:53:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 34110 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 9888CC0018C for ; Wed, 8 Nov 2023 22:53:30 +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.web11.107111.1699484001903364646 for ; Wed, 08 Nov 2023 14:53:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=B8Z/XtAP; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-565334377d0so174954a12.2 for ; Wed, 08 Nov 2023 14:53:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1699484000; x=1700088800; 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=Z0v6XyoOheDwqe6so5zFf6HdKGvFAiBekg8DF3w3an8=; b=B8Z/XtAP9Vij7MwVPKm22fLPUTiSLX+9ZMNXmYMwUtg3Mm8Wigkj/eWVZz+QywUFg4 ZtuTRVvx/e/HPGt+8tKQjKOybBE+nlamreSuL5BDVByw7Fjb54mnFv0Q3sM4Lq9F8epT 6iiNQ4Ts70mXTxF0avjw8ciMzgChJ5XF9WlBDw97nKFiZmqkwx6QLCx1aFgVVK+vcC2j 56VhLiNMKjl15UnJHRvRhS/G/HPY2Vk1iHK9CWy4TCYOl07/Vt2D5mmgE7BeVW1xkK5s U0boRMNwxr35qmQxEXvBPNUhPcrGq6Ydu9XDZgnrrDkcryoOMvIUihgtyo3NqHfSvcJd vxrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699484000; x=1700088800; 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=Z0v6XyoOheDwqe6so5zFf6HdKGvFAiBekg8DF3w3an8=; b=fRVk3KnxPyvNwNrEUxxtu0MKkBI6PTeNPwq/x/HP8WIZzdNJcEfnA3UJybURnAw0sP l2spTWOK/txi8Abq6X7IlkOECMIbSwgUHM/NjIQz4q/BIzrVF+IedRJXGLGrSWeGj09t otBqFNf7siC2WzRYCywpHXH5uC+LLKtPSrAAEnACXzQ5gddIC9QrxGyDDuSPvH+pAI8U MSdKwioSUZXiPr111YafDUyGO+KCOUAyl2DJoJsUZNyRQRrvOwz2XoTdEn2J6qArc1dJ H9M48gsm3+XtXjA9Fnss4Bmfrg4kRinn7t93SPCOizd90bf+e1CEuAiapGyst+IzZ8iw rnpA== X-Gm-Message-State: AOJu0YzF3ljSsSzZOdCRML/TWUGpwMgG3llEJ2G2RzP7epLZPTgGMYWL +Hfv/kf6pvdYHbV+GrCrV6SiIkPQ8/yM5dSshyh7Dg== X-Google-Smtp-Source: AGHT+IGkKR6mps1rc5L0NryeA/tHidBkmqhJ6x2GJyBQwD6FuDriCpGtK9q3tNmiYmMfvS6FgEnsMQ== X-Received: by 2002:a05:6a20:54a8:b0:136:faec:a7dc with SMTP id i40-20020a056a2054a800b00136faeca7dcmr4134667pzk.11.1699484000587; Wed, 08 Nov 2023 14:53:20 -0800 (PST) Received: from hexa.lan (rrcs-66-91-142-162.west.biz.rr.com. [66.91.142.162]) by smtp.gmail.com with ESMTPSA id du4-20020a056a002b4400b006884844dfcdsm9467883pfb.55.2023.11.08.14.53.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 14:53:20 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 4/7] cve-check: sort the package list in the JSON report Date: Wed, 8 Nov 2023 12:53:03 -1000 Message-Id: <1245649fd2725915154648a98584c908da07af18.1699483825.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, 08 Nov 2023 22:53:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/190362 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 494fa03ec1..f554150d94 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -98,6 +98,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)