From patchwork Sat Nov 11 15:02:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 34305 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 3A0D9C4167D for ; Sat, 11 Nov 2023 15:03:34 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web10.52967.1699715009547017311 for ; Sat, 11 Nov 2023 07:03:29 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=wZYIaaGS; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1cc37fb1310so23825255ad.1 for ; Sat, 11 Nov 2023 07:03:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1699715008; x=1700319808; 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=wZYIaaGSpuOLeFW50pC/6qK5gMdMz9FXjHAC8W/j4SvZuQiJdL11+tp7KTKGWzRivs MH+Ob+YnNM3G+3hozClnEBnAJXe8a/UJNyCYz0WGgxa1yflVLCxbcOF0kTkRegiht8Ei cKN4xwJ7e5Mqjyptl3tD+os0mVLYSApF+vMOFH88Os1kxzk80/gm2YFpdpVJeuJw0FQu 9r2X+a5A3EPsWmJg+05zRIKwe0d9n75gsViLvoVZA8zDBLVKWcSTDf07qcdXK81ii2aL xN+p5/08C4YPh4V7kZFK4PC6b8aL4+0GBftzC2PETA4/7i25DJcI+4GDxxghOaWkSDbS Vlew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699715008; x=1700319808; 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=D9D+vBfYUkCwIS00JJRrVf+xZnND63yd3NQNl8AaGZnJG5fqmeaDH7rmd0f3R0RuVW qBzOj725EJN/+Mz36JyxGJtrJNpVU18gHIhnIFtnLSTqlOCDblebH/3wCJ7+It1sUVHL qHamGAHjLeXtLN5eTBoKp6jn481MymVg50K1uygkQaEWjLXxT/15i/t3OwCC1AgCND+A A7MrZ43Y5HbFjA3nWu4fEG3WCR6ST54lz1hDZGNhRrjPQIgAb0HWmq+NeSm7ogDPIsWH vgewgcekrXPZEu2YZQrbLELvTku8uUINZgyD0P67zoC1J3t9Q2B38rFsFgYlDNIAMdAB XP+g== X-Gm-Message-State: AOJu0YzLf1WGCdMd4VM9DoicfHTg8go2CeWdXb9L87rM4tP8XykS4oZS I8rsaVTm0yKYrUP4+RRqg0lBXsln2R+tw9yWpb/Afg== X-Google-Smtp-Source: AGHT+IGizR0LSoTwKDV/fZ0CCZLE/T0ZQUpOi8SGWxhTbSsllAGI/G5ZNMzg9uWenHcsH5dhg6LA4Q== X-Received: by 2002:a17:903:249:b0:1cc:51b8:8100 with SMTP id j9-20020a170903024900b001cc51b88100mr1959412plh.7.1699715008202; Sat, 11 Nov 2023 07:03:28 -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 y18-20020a1709027c9200b001b53c8659fesm1379200pll.30.2023.11.11.07.03.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 07:03:27 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 09/15] cve-check: sort the package list in the JSON report Date: Sat, 11 Nov 2023 05:02:58 -1000 Message-Id: <1461db690d01bdfc46d77a38aa040736139bfccb.1699714834.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 ; Sat, 11 Nov 2023 15:03:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/190424 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)