From patchwork Tue Jan 14 15:37:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niko Mauno X-Patchwork-Id: 55528 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 2FD56C02185 for ; Tue, 14 Jan 2025 15:38:36 +0000 (UTC) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (EUR02-AM0-obe.outbound.protection.outlook.com [40.107.247.102]) by mx.groups.io with SMTP id smtpd.web10.48044.1736869106533705878 for ; Tue, 14 Jan 2025 07:38:28 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@vaisala.com header.s=selector1 header.b=TkD0dHep; spf=permerror, err=parse error for token &{10 18 spf3.vaisala.com}: parse error for token &{10 18 _spf-dc57.sapsf.eu}: limit exceeded (domain: vaisala.com, ip: 40.107.247.102, mailfrom: niko.mauno@vaisala.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lh892suPKjtz4D6SLbrij4sNr7UoVbjjAmwLBBeIUFeIQvX6dk8I8+aX1V0eYBVyNnUZaEKpCmnKarwuyw7GYwU9tI3Dp4v9fPch69lY7VXw7i+1uzDFPY+Vlh/sNvMeV0tJIug3th7QWYNrRHP1OkDwBw3mVRT8viZH/wi+fALWgHzuNlRYYfbKdzBu8dgQS7XawCBDvrZX5XXEABFbxJCf8WzVA7GsP5gK8R9UfcOfte/x65A080abXof0nNjrwBGk4V6SDqr4ZW/9l+TtUGT3PqoLhpUo9GFUa+ucAoi5vy8rtkd8O7yPIEmmS8MMjHS/rsbrbWhiPU5NlwnQOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3ughvRDeE/dLVN439P34FOiNfL52m8JbjKS1QrrTvV4=; b=wdFW6jtdjw639vSJZexZZjUIuaNuANDSO+wGnsOgy1ihRMRmv8YtIXJJ0DGwkUfEQQTdNPDB9BRA3fPqMfCaaT5vuP9D/6O4q5km+vdnG2d04COpDhXUALywNyKlUZeBlnG7mICFJg98WqSZ3X6Jw2GQ8bFDEg2+ccam5nD19HcfRPDXAX+CfKkauXrZSfSb19MwpBxyCUOVNxX4EO1OkMQJA1oC4ZTBFiaz3aSARYP49CrHh5iuOS2PIH8DAJYyHl5L+3bt85fVeE92pXKPBKRzA+X4cXHz+7vL0P/uzzubHOqyITiYQtxE5IQ2howTtsjcW9im+Q69OptFIL7Sxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vaisala.com; dmarc=pass action=none header.from=vaisala.com; dkim=pass header.d=vaisala.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vaisala.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3ughvRDeE/dLVN439P34FOiNfL52m8JbjKS1QrrTvV4=; b=TkD0dHepKL2k0qcP3cUImv+h5C0XiX8S9kj2YCSnfQrcL0QRnUdUXf/Mjo3hgzt4PgqYixJG764xCezx6vZOZpTbnrM0W+SdkalKgu2jn1xso/yi59U7HklpinrSxxPcpKtkEGYGKPSixrUvYJqTZ4u5rVWqgrPsWnEYGLgXJRV40NKnl6gmCZUkWPwkOSQ7bUhzeSZGEYU/aCZ9s06DBfPKT9DnBa5ZHT626QHbGmtJ7G3pdzNQx9YyiG0M4meCvQvOU/7O/ajHbXGjllu4j3KGWHgjQTKhlGHFXbKBW2o1zfY95loK3FvTC/EiyLPWrSozGSNAMqEzqdvcZH57Mw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vaisala.com; Received: from AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) by GVXPR06MB9178.eurprd06.prod.outlook.com (2603:10a6:150:1c2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8335.18; Tue, 14 Jan 2025 15:38:21 +0000 Received: from AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::af93:b150:b886:b2bc]) by AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::af93:b150:b886:b2bc%4]) with mapi id 15.20.8356.010; Tue, 14 Jan 2025 15:38:20 +0000 From: Niko Mauno To: openembedded-core@lists.openembedded.org CC: Niko Mauno Subject: [PATCH 1/5] vex.bbclass: Drop redundant import update_symlinks Date: Tue, 14 Jan 2025 15:37:44 +0000 Message-ID: <20250114153748.2358116-1-niko.mauno@vaisala.com> X-Mailer: git-send-email 2.39.5 X-ClientProxiedBy: AS4P195CA0001.EURP195.PROD.OUTLOOK.COM (2603:10a6:20b:5e2::8) To AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR06MB8447:EE_|GVXPR06MB9178:EE_ X-MS-Office365-Filtering-Correlation-Id: 5d841116-e665-4fd4-0935-08dd34b1791b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: hOKvPjQplO1m2QRDg6wioEOENwmiC4HCy5oj+tk7215Kumnf95CJ7zFNVS5R+HiJFMSvDap9sYE6BU2nz6y86lSSPnIyqv+K0480AsqgkSMe+wKftuQCvkw1sAoCTcmgT8RYlIafAnBkHKjQ5jHN6o4fFGAQ227nPopTsIL34kYZVCQDur41e2uIjPsWL2AgvHaRFpxbC8ap4JOFSAztbO1Wrjv+BkqUCwZttRdNk5SGh17m0LkH1sd2zFYQJYagInCNLqeWmo/sQZ64pUxQZVaTpzE8BnBhvwiOvMI5/bHqduJaifeP/HSd+s99ugBfu+j0SWQOVh5RKAaKCVXJD++bCywVVIiVMXGgy5r1sIapCKs7FD33LREcdhVjSAarZPtvvIxZkVrRP9sfkGO/l8an9xt9FXxJApFmMdDXXKKe25iXmKfWDoHZh6U5Zbxhw8KuZFGCLeYZwCuEq6QOVUF+Y4EGj6mEjV8rHEzsWPDjePuvMAywtJY5MhNCN5eH0wM9rDm5PqTEnb2/Q0gk4oVVr9ZgkrDsG3EEYLpiW6NCB4/s5nQZ6T695Byp6Obvya7ztMcm/SNWgpSyoNViU414cYmLQ2NapvcDbvcIpbUUOCh+pKSAYaxjMSmo6cbygeK9Bn3ubEBC9KGZKcOFaL9riYSQPckGaHpgzRxMaC3d3paaEi5ezndK6AnXGVjjk34eiPHzunKkEoJ1nah0lJYTDxB6ONAJB9/Q/YTmfhSy86WLnlJvPbhq0CajouOCefkGT+rnX+O3ZSs9lF/88bEzmmB0tvKxjnGk2skYmLFRU3gyoGuSrzZVhbXriPo0Oh7o2FPjetD4Niw0v0VNPt8vHvK0s2MATddR0+p5Aj/rxXfoJelOjnH9Sfaf9yk9sG9wBFlOSXp+oDFdnelJr1MXYjsF7E2tIOkirvd7mDK8Z3wQvBr+feZvccwgHL91FTumswwA3jzMjgZC+gIYdXQV1GsEUY+gL04ncFZYQ4Hd3MlQR31kZw0O4cFAZoZP7eTN7gQATAeqwArOsVVuUlEcmObfNYtm0BXhfDQo9gEB7HR+el9vEbrw9noZHhxetflHxU6WmoCfzoCJ1GoDznIoiMjHCz1n80K01PiwKP76mGkRHLQqFxAck5+RicjWtzoNNiLOW0nBkjSpldO0ZpgPICbMrfnLhvCMueN2OLGXEa2J1S+9eQNHZeJXAxm1P7/rVVNjPLDEnbz08tUoHu8CLatWcQq54Pc3esS1AwJ8zg7VDjDXyyQcwQpzPI4pVk0wzwefNSysxkaiXOCjTcHZK5cLk00ifZfv98C5Rh6KW/FOAR+8WR4U6/1HASOXEZiFFRyRy7aR6av7QVMBfvKvZ9fO0spss2VkHRnASP5MRcPdsTyRY569T2eTsEPp/HAZhlxWnBPgzJ07RBw17T11uT0006vYA/xkoTMi6M3mtGyUT6NstQxLpzEoHK8K X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR06MB8447.eurprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(52116014)(376014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TgmKORXEWvrF4p1s3w73Uap2UTFRYqX1k60pthiVGF6mE8FgCusS+ApTFZhUAHfXVQ0yUhSb/Fu1m65Ccdy+JlMDsuiWV22/yWakLXphmbbIYi0rDMrQzsKJcWPpmcypJt1mj/EsnPTAZCpi95R79ECEEjzG+pjfcOhYO0P4XORHRVg1ZoU/+P5mch7hHD9PX/v5l4pb54uBMACwvkLoQizC9q4IGMceULF71MdK6Y+5x7eTWt/+soNWMbSmMffhJZ0P/pf6WketW0eCEiJ8CRk8UdpL6UILcHiusNWN7GYzcUKuXspV4YIEsokuKj7K3EOLxf+SQWHi3g2XAaR+QMsku/JXnpz2j3KLNORn+7k95W3HHocJEFxlecXvRSyN+07kB/81M46hg+L+6L0sbBkFaSgiMBxTyRkeP5fRIcnvuxfLQ6I0RMqsR6CLBG7966X/jgx26sThhAESTQX/g4mTdLQ+R/wsGGI0Xj79kS/ut1NuaZdas755EXJafmOBqwtsQipfMql/1t/eODfp4J+5vLUUp3bKDZtBEIGj+rihYONo6SCsIwmCTOWxy6sPFKB5Q+ezhwAfUPC5amBW9+wf5SOfyGHpgjGbRTojJaaQe9W7euBUg1zz/nQXS/ojfEjgWudnoYVvRTpQa7GIZ8mVo79dOy4gFfKh8xZJmWL1NRWulbJqe82UQLKtRo1JH9Rk+QKLFmQOGWmiY6yPAtxfA7XIE8db6Av3f7mek76e+FcZdVwpoiV5JS1h5/0E13t8Wfw1bygaxY2ue9TMwuXyQuc0GwJvxu9Qnh3tC+7Hz/N2bbN4iUl9tFSSNneQUGV/hZad4Y8B0bwcQfWkOlE1CCa0TLGo/zdMdGVPS1pgOvYP0Pww8oOlX57JQYQvFLc2Er270TxNlQ2gnfAlYqDeY26+hZ5XZ+qaAyTzkd/i6Nj0XXGnkj27rPPc4XHIAEKHFU4ttgHzapxp3Ome0w4/sJREdHulqvOHcVbJ30EWaIVfJPA4362wAZubySFtDmQr3Z1cAQJmLpdX8ATjeUEo6Yu2PYGZsypkmOXdUzSOzqGemZsqMZziLJtZy3m5KtpvcWeusiHSBpRy8aImlq6/KxVGVUCAP4Z0pJwJrbSGrSiXpCNoxuaWuca88zOdShT7lBLDQw/P1B9UyPELxFTV0bLcF7T+Rc9NdFLX0VVTPx8u7qLMWgdt02qsgDgsHg5Ypf9k44S6ehFFuPVkOvcTdFtBNC3GVvafbQ+w67TXv8hgxUNZbs37x9aNVPwayzMeZvzsrnIhiqtBMczvC4XTMj84uEWnGL2i50P6CLPhNCgUbWT+KoUTYpAKVCA3j+gY3tzGeF6Oabvrsi4K6SveNdYkeQsoFfLgKTbUjgZAcRxC+muT5wpViypBF/aBejyaf1qiRI29vTumwBzwh2kQsn1urWARuMshbur/QGuOzbPXmi1NWiBeuG5zOHZ93G5NXzlpGvFttLRRdhW4zK3QNuq0qghXOGtm44Le8Ng2VsCALPeLHqNsqoV7vAdOMGQsGAU8o4slNBK5hCJY45bXfAyR/KsGA1FFsLmHbArUAM5Psjqi2C7Zr9YNXQcih+icTsXXDsfZ/9a+UQ164g== X-OriginatorOrg: vaisala.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d841116-e665-4fd4-0935-08dd34b1791b X-MS-Exchange-CrossTenant-AuthSource: AS4PR06MB8447.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2025 15:38:20.3637 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 6d7393e0-41f5-4c2e-9b12-4c2be5da5c57 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: s3fbeRtcPPaFdiAgSzIgJLWAn3wJhUEHVHrXaEdxcgXCfeBIGw1vqRX9ZwBm3JSLPmdG6aUoh4C+hOsdCRuFrA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR06MB9178 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 ; Tue, 14 Jan 2025 15:38:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209803 Remove import from context where it is never used. Signed-off-by: Niko Mauno --- meta/classes/vex.bbclass | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/classes/vex.bbclass b/meta/classes/vex.bbclass index 01d4e52051..c9749d4ceb 100644 --- a/meta/classes/vex.bbclass +++ b/meta/classes/vex.bbclass @@ -119,7 +119,6 @@ def generate_json_report(d, out_path, link_path): python vex_save_summary_handler () { import shutil import datetime - from oe.cve_check import update_symlinks cvelogpath = d.getVar("CVE_CHECK_SUMMARY_DIR") From patchwork Tue Jan 14 15:37:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niko Mauno X-Patchwork-Id: 55529 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 4131EC02188 for ; Tue, 14 Jan 2025 15:38:36 +0000 (UTC) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (EUR02-AM0-obe.outbound.protection.outlook.com [40.107.247.102]) by mx.groups.io with SMTP id smtpd.web10.48044.1736869106533705878 for ; Tue, 14 Jan 2025 07:38:30 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@vaisala.com header.s=selector1 header.b=B0CRy4Iv; spf=permerror, err=parse error for token &{10 18 spf3.vaisala.com}: parse error for token &{10 18 _spf-dc57.sapsf.eu}: limit exceeded (domain: vaisala.com, ip: 40.107.247.102, mailfrom: niko.mauno@vaisala.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ippobShELnt/UHOVY6eVhENMIi/GmWomvajtfa/AQKeXelbxejrdamlsTJvCx5+zgJ4FY2zKdGHEseGgH/CkdNhXYxIrcDonAHUgBieumZrZexhbNeCy2Ucyvtlg1sa2a1TfEG1a9N7AJmcn4TKKXC+8wnlsRZTXeTFbzG98axzZnq8iwg4o0qmQMOWhaYALQyEdOgcVKf8Qm3bxnA/bncUnLx2mPhtAyYxif+TpXWzvL/EqbUMpK9oWXiCV/ZHzClsiFFVd2pW2YSp99PLBJo/L0MQ96YlmvJYLi9y84s6FWStZE8Swo4KO03mTWx6f9mkS5LRgMzzcs9yjtLuJXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gKx2DUdG54iIWZk9QEQ2ViDFZ6Fnmfs0xC3fS0nnVW8=; b=pOICy5X76T47sRzw6QGcrgqr4Tvfea+DSga+tWbFUyt2bGG+n5a5hmBPnGRu+gQ6GuVgOxOIq5CGU3QSK6s0NKy+Rjk5WcUIAcI8D9Tzw0WkZPJhXCkshx5qvdDweT+a1G14hKzeZkLY3MvVHoqig8pScR/5HPVMg+tCGivOXBDLgm1VdULV4qd4ruWF4W5QRXfOV3O+vTzZDfS4dA6ohrQGUrY8gfyF30U6djM2LPwJyGujV18G57+w/Z6osLRLlzPGRjpEkVhHbYj/MmKfBMU53lvgzx8IcE8jijDYlRGZPQRTUl9Cd7HKUB6G07Zyzo8K95IN6zubL+f6Pf105Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vaisala.com; dmarc=pass action=none header.from=vaisala.com; dkim=pass header.d=vaisala.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vaisala.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gKx2DUdG54iIWZk9QEQ2ViDFZ6Fnmfs0xC3fS0nnVW8=; b=B0CRy4IvKUA+cvNA/IHSxR6uByWVJXVwR7cJtkygOCa/FUMF1hxm03JBiBXHDsZTNTmSzikamhn3Zw7u1oqfPu0LEYjNLhLJccShPj/D1L7rb4zLjqHHM3jyb4diESH0D6ewcanBiTk1YSiR2mzQzCyPiOm/QEKHMffzkxmNRzDRqSVycLw2oFMghna8m+n8Y96KeRbh9ys/R1wYIRszCCSS17tOZRQ7WE2BIrbkkgImQ45Zw/mdvnX8waNjCZ09Ji/YnigMdHdIOxDxWI1MFE9y/fCF8weDkv5LI/6U3D3Ok5sMSWKQpaYG6QLMKyEazoh27UWvynT2JEHaIBa+rA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vaisala.com; Received: from AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) by GVXPR06MB9178.eurprd06.prod.outlook.com (2603:10a6:150:1c2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8335.18; Tue, 14 Jan 2025 15:38:21 +0000 Received: from AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::af93:b150:b886:b2bc]) by AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::af93:b150:b886:b2bc%4]) with mapi id 15.20.8356.010; Tue, 14 Jan 2025 15:38:21 +0000 From: Niko Mauno To: openembedded-core@lists.openembedded.org CC: Niko Mauno Subject: [PATCH 2/5] vex.bbclass: Cease forced symlink creation Date: Tue, 14 Jan 2025 15:37:45 +0000 Message-ID: <20250114153748.2358116-2-niko.mauno@vaisala.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250114153748.2358116-1-niko.mauno@vaisala.com> References: <20250114153748.2358116-1-niko.mauno@vaisala.com> X-ClientProxiedBy: AS4P195CA0001.EURP195.PROD.OUTLOOK.COM (2603:10a6:20b:5e2::8) To AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR06MB8447:EE_|GVXPR06MB9178:EE_ X-MS-Office365-Filtering-Correlation-Id: ac2b6d1d-b7de-4f1a-9d80-08dd34b17952 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: A4qAChGFDwD9pdZ3GUfgzVtMcIldYC1nP+VMSPTWxmtLfChEPtwu/yWFKFRr5ZIK3GW7aR352V+sXTGupckbvOvFH/RmAsr1st/WNyaG17yXow9fLd/wNvOYEJBlmHHqdA2Kmw+/q3vSvljLXMxd1mVb15DA5TIA73KdRGfOgE2MKOggLj7UNu91FuUTTT9pAeSoxYcrzTWQwpUNgyrd38ZwN6tdB3gLGR4OIV41U52FwQdRrkwe3v8oXy0Di5CmE1DP6JseU0rWXFujJke8PzWuxo579K9aG/ILeud42PIN1JUemg1bP9pO+osXRC8ghvSxtOQXChXvOaOVcb4bef/8u74+7+VL60uCHXRdjUUj1RkK20+4o+1I/rFDeQX/QPdFsyOSiBb1obwvFLUnXCnseGuVcM0OsJQtyv6mFzFDmjTDeB124OoCM3VgJADbrP72kVM48kXoAT30pQLgSLKVjR7xg9VFgFdm832cVyhb37VYqOHbHvKIJRxsKYK4uYGjWkClSeeocvSLIHEtBdofZcy2Hh8apT21b64G7OXYSCqgAW9J11Yo3rIRzv+NzQtc1yjImISoM44rS9FytilEWZMm7MOYpt0OEUgUb5YZa0tff6/eG3++RLb50gXIeQaLEyxewTNuGVxe/DirCWLdjwEy61q/SFwClfutWG1qffrW2YFKwR5MGYG09toC8+kBqE2pRvs1ZXBMQ+ycXRV+RcvKjhMZKOaR1wleMwKKR0Gqv95c3S84JReaggupMhfwzvKfbgerJ7ntpcbsWu/uMgoC+rQGVY2Owt9B7P2GwvvQ3SS2yHBRTVqbF1tQKXjdxlnDXCxrMKRP+dmibijWZKrbuTojPq4cthhsz5ykN2ZSbfNeSFreVyB9L1eBFN3yoPCSxLdVdbViPAQSvDbir8TeMUlGAk5AAhiR8vCu057e7vUCya/TC4VXF23GHZMlhoFTtXDJACvnynO4H7Jz1kI1LLtOZm+XZvt1vPqwMH4QSY7gucpYyjqyULyUABYJWH7el7TmckpMIzhfOIrm3poCCzV7NJwu2ALyxVK3cWq12qWsL0ag+iMgOZxDkTxwJMlEirY7pIHONIl0FPXgSCmUadv20Y1S6WJ2j1F5e+SXdIr5/1UvysWUsnroQha+LBJxdhgAq8Agx3YvHiCAGDYf6ddE38GwhxTGK8HBIZhvGi64lpW9okVV4AmPDRA/V1LI1JkqwkfqSrbCH7ujIdNCDkLQnEpyjpHShMiiiKZuY4ffSFlOQj08QCFMW8c2Pnqi4NpLhtVhbMgJGyycfMsGL0uKoWEl5AkGYP/glGH/LaLAxt7AbcF9MPaVmfPbtZ0rreqgmiaKDzXla75knvGh1ycn8q/Ft0CNLXbBc9S+IwuPACHQT5aialhBgFRUReVgVs0HcDED9ZVRU1nrb39Ezvx3fXRfSnhfPPmuyf1Do+Z8XLqpbv2T/gab X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR06MB8447.eurprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(52116014)(376014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: O6DOeMLHPF1xxuMqd0uSliLEgyPlwFyISuoMoloMaZh25xae5eEMFuLGR3UqBMo+qJ2mI7+pM51FU5wTXhZL2BggWlYaP7m3aM5eKiWtCeMna8+S0rXqDB7zEEkKdxsxRhJ2HiOxQqtyj5hAMdjyPDyEpO56+zvqD2q+Dn3jD9qz054VjxpCZ+T5LnAQRGqgnV+qi39tQkWXM5dHFZwR45rdo5IBSV1nm/RqxQ4tt6HwqH/ev8RPXK5uK6UIrE5mgn5+WZR7V83mT/5f64uB9IF38SnkGSP5MPyGep1Ftrc362a5BaO0kEsR0A//pK1IQhj1zO1NbKp5IeKq8nI+7L/t+gpD37xXzZvDL00Igu/mS6D+Pt6/yi6pHmQOjVg1ThDyhtndHueuj8GdTyNwFnuCYoiRQxzxzdnlrw1spIQiDiqLpiIRU6pj9EGzQWhZeskJUKeRVENGP9gf4xXSLIsZQLcRXoRRIwKMmNPfqt5bNh9RL0xERrCRgf9ImS6bJzG+k9Uq13aSIKYXZJ0/ofFB62+7GVZRn1oRP/K8T3o1wdVjVqlEtSMJoqk2jubjXlEoZITLVjPiDR0I+IXbL5qvNihIfPArPN99yW4krm+ia7K9I4mTI9xo5P8cX84OwHFE8RJLpt5cFNpDc7ii/YYE5fxRIJW3Mz/4hOKeTZP78inZV5+fX34YZD0n50XxO8JIFKahuEor8SVYA/e2y5ohK5WYASix9hqqB6dvmEyRspULqUQEszdt86SasRPyKR7tnQk+36hg8HFfCJ5KHpdqyd+FXzCnCPqes51HwdCVoMTDPV8t9Zkd9BLQ1a/KRb+Y3LBs9ylL/fq5ujHUjmA7QwMye6G3nl7KNOH6tpUoSMZiQMbY2NOCTxICqbhtTnULnVVcIoobhb+Qi5SUtGptvHtkIgNX8qtt/f+hyXHI4KWSH3U2PXtOH40+KrxC4X8LVJWSs7cu29GcmmsEG3lKtJ3kbS7WNlcwc70paq6H6OjFqjPh/bIJc3o6Ov3yyfrbzpAA2C8Fbq6LQUa7LVLWDtuY/0vKzX/EorbSy7rEhEGr3X9/EYkZTOhmUdk/WbRMgE908U3sNbeaAkDag67Sfq+LGW5+kBviLS4cyziMG3YFshC7haikxb7BUBrHRnRP0T/U8ots31oj+bukQvBJc1+Gxg2mc6RcuSj8GnaIfM98pzlvcs8tmm07HIA2aQxHI7ptO3QKAyBZh7pD2hmpeVkRNKLEw41abaavn+9m560ILIbx3tJtHfi0ebd7T+fDBH6vwf7atDHmgPAvIHRsAP841CEAACoObn439UU3e6KjL+e5gaKivVPEyAOiSMQBQrMdLQFsQ3BA3/enk3kn/HkSX/fQlosQScMu9TlKYR7Pk8qLeSZA7oHHm9Mx8BlavFTaBoRXSmdtTIiSyKm5mhjaUEvVF3k3Sbe4xVHJ/XmcXRP7TS1Nq2ZJAKjSyx0ODOhNGCXoGV51xttTZ52IoaYMp87rU96NI2/omieGtHVXOHg0fE54Q0UgDfmgdoooYu+fAUgJkirP3A3beza+Hbq3wrBJjnJjyYFj4VbLp9YXPBEvrHF6CM39wj4FL0H1g/9x8wfJwbtcCS/f1g== X-OriginatorOrg: vaisala.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac2b6d1d-b7de-4f1a-9d80-08dd34b17952 X-MS-Exchange-CrossTenant-AuthSource: AS4PR06MB8447.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2025 15:38:20.6864 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 6d7393e0-41f5-4c2e-9b12-4c2be5da5c57 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mCPcNvTqfEUS70rL9oZEZtWvdgG3qC5qiOnUZMeB/4yUJdcX2HQGLpAg+VWoi0ALZUNozhWvI0udmCJOqw9orw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR06MB9178 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 ; Tue, 14 Jan 2025 15:38:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209805 Allow the method to work also when the user has overridden IMAGE_LINK_NAME value as empty string. Signed-off-by: Niko Mauno --- meta/classes/vex.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/vex.bbclass b/meta/classes/vex.bbclass index c9749d4ceb..3719e5c222 100644 --- a/meta/classes/vex.bbclass +++ b/meta/classes/vex.bbclass @@ -211,13 +211,15 @@ python vex_write_rootfs_manifest () { d.setVar("PN", save_pn) - link_path = os.path.join(deploy_dir, "%s.json" % link_name) manifest_name = d.getVar("CVE_CHECK_MANIFEST_JSON") with open(manifest_name, "w") as f: json.dump(json_data, f, indent=2) - update_symlinks(manifest_name, link_path) + if link_name: + link_path = os.path.join(deploy_dir, "%s.json" % link_name) + update_symlinks(manifest_name, link_path) + bb.plain("Image VEX JSON report stored in: %s" % manifest_name) } From patchwork Tue Jan 14 15:37:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niko Mauno X-Patchwork-Id: 55526 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 2E9BBE77188 for ; Tue, 14 Jan 2025 15:38:36 +0000 (UTC) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (EUR02-AM0-obe.outbound.protection.outlook.com [40.107.247.102]) by mx.groups.io with SMTP id smtpd.web10.48044.1736869106533705878 for ; Tue, 14 Jan 2025 07:38:31 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@vaisala.com header.s=selector1 header.b=A2Thq7xG; spf=permerror, err=parse error for token &{10 18 spf3.vaisala.com}: parse error for token &{10 18 _spf-dc57.sapsf.eu}: limit exceeded (domain: vaisala.com, ip: 40.107.247.102, mailfrom: niko.mauno@vaisala.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=A6XW5LFEIaqrMh4oYSmOndj5v0S0tsYCvKPE45bkqR4visQ4++77VS5u01OQe9U/EzMvQ2QhUaNjwyTqsnrz8PzM0pW9K7RO2j2C2rRyHjfIHNS65VuSIKrlHPceefWtuACfVb2sPRIgNpsR2m2jZqhHxteHL1DeOeTZv34f3P0e4qQfdXHIfYndK5bCSb+OScY+N8G7lJmhJLU22k6h5IjGzHyHyOsMuuz76yWoOuPYWNeU/HbViJFp9NDwcPtvtrDnL7MBnXPr2aaFotxqEGl34A8ZEmCdkLe4YZ+8JkzjWskTWjUGWysMroMWBvX8ORKOhpvoDiQemYK94A/nrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=emK0hbnSmSOOQbUSujsUMa0S5DbstZw66ZM+JEKXR7o=; b=fIC6Rli6+Y34xtyeoVEt6HJJZ+mo+dJGhjzdiyJP6WayFIybKXXLzZJ3mYLLSstlUwJcXCcZRjAnCq5CQ3xexMqOUTy9u0NQ8j+9JijXkkTb2FZ4Jud3YEo3+lRWXDOtO8Ki0xHFDfuK368lGuoIHEW3zKovbtqUGkb7Th2W5/ByofI+gsksV96YQAk/6xtDqpelUjvv386jMClfu84v+YtpFGHoggpKCYyyi5chYtj4/OFS0Guopy0iq077XofSmR/tJfUag+nK5ocEKe8X8IEHkb8UtAByiOs9qNNlSIMo6O2tCmk9alM5Sg1suaqcZJc+whvhgxNrv3w0wim5ww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vaisala.com; dmarc=pass action=none header.from=vaisala.com; dkim=pass header.d=vaisala.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vaisala.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=emK0hbnSmSOOQbUSujsUMa0S5DbstZw66ZM+JEKXR7o=; b=A2Thq7xGk0WWjtpuOemno9qGQNIwhjPVsv1efUOnJk+0cCi5SnBNNSDEc9eGFRuI6cpkcuMPsg9+I0uLukwCly8E+1JEOULH+Sx7i33Jty2DuuAiMHgtu9p+6yjrUu4jZe5vO/sb91GXZ3Uj+Tfqqorhm+ZjWuZ9RBrH/7NPrCZXrt7gsAzK8nTvxCCCiDvsXKfgKk6H3sW+pTCwJ0w4fvv5ki9ZnyHvvi9rUiTtlsnMTtlXW907CRlwgVu+WfIYcGNWA5AvjVa+9+AqXsqS+PE62N/shuwr44fH6DOW8EwLyNTmLj2vv0M4oeSQpgULRI58Zl8yTQ2ZOZGaSkacnA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vaisala.com; Received: from AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) by GVXPR06MB9178.eurprd06.prod.outlook.com (2603:10a6:150:1c2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8335.18; Tue, 14 Jan 2025 15:38:21 +0000 Received: from AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::af93:b150:b886:b2bc]) by AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::af93:b150:b886:b2bc%4]) with mapi id 15.20.8356.010; Tue, 14 Jan 2025 15:38:21 +0000 From: Niko Mauno To: openembedded-core@lists.openembedded.org CC: Niko Mauno Subject: [PATCH 3/5] cve-check.bbclass: Drop redundant import update_symlinks Date: Tue, 14 Jan 2025 15:37:46 +0000 Message-ID: <20250114153748.2358116-3-niko.mauno@vaisala.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250114153748.2358116-1-niko.mauno@vaisala.com> References: <20250114153748.2358116-1-niko.mauno@vaisala.com> X-ClientProxiedBy: AS4P195CA0001.EURP195.PROD.OUTLOOK.COM (2603:10a6:20b:5e2::8) To AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR06MB8447:EE_|GVXPR06MB9178:EE_ X-MS-Office365-Filtering-Correlation-Id: 79a3fa59-d1a2-4e25-fe54-08dd34b17980 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: ey0YFrUf+vpLs9VMVPqccpBEH9DOTDfAgSY4n7BXz7NLhilNckCApCQRrUnTRvb3bLXGSRmExlcwoCeutFPHYK79kDXoI5CwBEOw6cqjLMWm15Z9JZK/hVZ22Z4cPzRCcd2mKHSKQvB3MmQXKnOfHlvgXgPJvB4hSn70srzta+4DDkaMh337yTUsrixE6fUGSCk1rT+SMjVAcjGIk4FDdWZ6+lVxQ8s8QF21MDJuLW8FzqmHTIjgTZGmPYvZ4Pauyk1+co5MsPKvCmtjI/KwsCLCBLTfOVxtQznQvdlv9sw+Uso6SoGAt01P0OLpX82/8lsQaDcPYwe5LHGXtvi742iCNY/F1wWcEaPnQBro26N65iyeULHLF4Mp7L48SoapCn8u603wck4lSmet8kOUCarxGhVOnsFa13qHOVhOkV2PRtZbuW6Mt/NsJLrHDUFmOvW9xdocSX7ec3uIB8gYdHJOBBR4be/7+itydfZnlWLyb5PsOS6q2lNVrUTJ0oURy3LVZPASxBlCpvbXvhFrKoGL7ucGHyJjUbRAtYBjbouBLZUEGlR6foWcdSmvMBDyJMPQN+IrRMo2vC8zpv1WSjmZAvWNKVUJvrr77GPUj3ymVTQOttA1oNn4Oso6WZwqfz/9lSoTlF82oigCp8MlixwG+XAzLApbTAoZHfxBD7MRVD7mwR31JQoxyIcG8V9XFJ6UYVLS8VetJfaPqvCmzz65Gqq0YiK/LozEtr0dDhZOSkb5T9LdI9Pr8FjWGAgw0bzMpDsybSSqNkDQOrESxfWnKV9Cpj1Z4GMBh0mATTa5IWLdWDUoGIObEBCOjszXApTuNFiCRr5/vLKeMXUPKp3b49fmXEnG+z8N8WR/JQaB0ucOolg5Ab3Bs53KbUOg7CdSdW0PwcgiO5I9c/rTiBy/6t3HP4hjVhQifbGLHUydHlBzKCgj38PUQFtnGceutyoHu1AucYPyvX2zq6OV11mmLMoZpidZGUx24LyzI4zKYsiLuRTN1pWJ4NfcJEPKE4gC4PjMtFNG9FN+KeZjYqX+oaiBsY0ZzepOjb3wxiHlzQ6J5Sdiim+xRl2YcHldvMvr0SEg/gRCJ7fIqXcyHl6rnbh3KPMQV5EiVRRLxjIoRh08WjQAXloxmYz7TW5kbt1AWZcfzz6SOOoem0lo/WSzzTBhGV8KJy3HyNqnaT4koRvS54ilGYTaEuxT6S/s35bFL5pNKG7liKOy74BF7cL6qcXcGtD1XG5bofezpAd6IUGO1n3TlFOw6CkqoO8W9JpZ0B2BmsP2BXgHJEdWNs444B41E6DI4pTgnIvciE9qmDqjm+SuexSg1Ue7xUfKdwYhBJ+GEypFMq0VzCORSEETElrSj+AiOtRQa0oPlVnmblyL4vBq+BFlFJSHvcwyHD//3TUKk5j24LGMA0fakm0vAAaxn8r+Z8M6rzcsJADsNkN8HCesmr1jbq46GWf9 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR06MB8447.eurprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(52116014)(376014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bbZW2vH2nfDIdrjDpAdrTcVxZkBbxPbrQE5EZtpgicB8NtM6OLvnbi3nkCuepFzVZyrO1hE8V2EDXgzltPSs1dISRFs5OkFx3MrIxaTWKbcDZD1ki2Vad2DJjqLwAYFPml4edPYv59wnKRjWY5yWkQuHhsoEGPYcTVsFuk7dzWK//cgnmFq2uoJYSMGkgKTznEIMCtE6+4KOmUCmjwHBSLR57iiMbdUOVWR7KPcmO8tifY0fCJkrIhlFX5yccgPUJ5dVQ2/g3SUtPooqjjdg9nMu4hMrVnKkTfIwkqN28dLs/tF7PqjcXaQ85bEw8FRXqiSBjUSqJ4h838YM6QYL8F5jTIiMnlIQd7M83WQT217VzG7NwH5bA6V4+tHnNIrtn+VU4qzQZPaoygxTovpHee/9QhZTf69Tmsc9sLscJcy36FuJk88J5KT/jAQFfFPVTnVWiZ3YMI59EgwzZ5ZfmhXgdSP/Nj7heYW3VpAft+bK2rkI7D+eIeHyPm9/zERdNPkTh4Vxy1DVYHPkRvy+kk2AlZGLLFgVYq/wxmLMOxbXnbaBjyQ7V6mo/rZCc5obzh4SNCh0oKsOOH75iIaM/sK/CaE6YFs7rR4zRoMrRYnASLhz7A+ygsNrDXDJk20Atr10FZvxJSOmLc8fqiC/iAKNMDHf8yCTdh0NZlCYUijiDQFIzIKr/vwD+n1CvGqSJEZnfLx7Fx2HClmgQNTkk6JqsuLzQtRYdkqV7o6xO3lgCBEatPGYtnCt/6g70XumhgXS8G2GQ/AmMcXTMbEaHF+RYw9uBZqSFH9ysl0BLE2je2Y1dvBNxcq5tJU3G8WbaNII+kLBtmfSiDwyeODURksWy0m8jlEQX0HeWuSvl0d8ywTpn5fF7WqC33FXxx/ELjFOpfDTHnvnRxZeqmRYdQ5EYD+XiWEr6UzClJ8vAFsrg52KShEFTJnueUk8LgP0Y+1Kqk4ebIu+vk+ouaWDuGYRP9AZblJqylo5SHipIaqRvHYvtnsiI6H1IPriRo3Z5X5MtElEeVLOiCoeZ1uUnHuvnlpZtbIn/PPnNUxbTdg2h3Qmt3oumJ0ayYZoUQJiZulMY8tgk3fmvziCNhzymDQGw+gdV4gjYejZbstxrYf72WXophFFCF9yNRpVjtaat4KvTUt989OKGu+TQ/Qo79RwCvdJ/pCn9IomZUbIdYDeczN5wNlEgiwy4HDbC5qWQkyx39xAO884NxKBuuF/5XpXlIHa6bzSV+B0NBkZKdV8g5+p99OxlROS47BPbgeg4GYFs4QiPiI8/arFRCqsf0+FZDsy0UJCFjSiVi9qjPfTw9abTQjne/Qn/FcI6H6sXm41S6Cqyqj0Yteg+jgoOt58o7M42nHV1yGKWfnH06tB0t5Xu5299CEpAvefwBFJjLA3x+xTxQE9p3XGsaDIRYmOEhQBRLz1r31xNoouhAQzpnRtoIByvh9SxOT9ivknhFUMqs94fN5fNGXPpkKNy6hS6PahTuEkAW/vTGt6aB2Uf1lhGq4DTqsK44PNgaxwFvEdop0nQSTUD7WnuinnPPP8SMSnoWpX7A5AwYQ9/gV7AoDCQQnYuH5YznQr3eDrIbxsdL6fBsPLyEVkMovbaw== X-OriginatorOrg: vaisala.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79a3fa59-d1a2-4e25-fe54-08dd34b17980 X-MS-Exchange-CrossTenant-AuthSource: AS4PR06MB8447.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2025 15:38:21.0357 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 6d7393e0-41f5-4c2e-9b12-4c2be5da5c57 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 00rz2BxtqHCksb1gSusSYX++PemOPrzzc3/gpzU/Eg6x8/U1mSFjxCwUtF3SjZyrG9B6eSuSozucd34LtObr7w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR06MB9178 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 ; Tue, 14 Jan 2025 15:38:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209806 Remove import from context where it is never used. Signed-off-by: Niko Mauno --- meta/classes/cve-check.bbclass | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 4bd9af4abf..9f0a08becd 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -151,7 +151,6 @@ def generate_json_report(d, out_path, link_path): python cve_save_summary_handler () { import shutil import datetime - from oe.cve_check import update_symlinks cve_summary_name = d.getVar("CVE_CHECK_SUMMARY_FILE_NAME") cvelogpath = d.getVar("CVE_CHECK_SUMMARY_DIR") From patchwork Tue Jan 14 15:37:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niko Mauno X-Patchwork-Id: 55530 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 3608DC02187 for ; Tue, 14 Jan 2025 15:38:36 +0000 (UTC) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (EUR02-AM0-obe.outbound.protection.outlook.com [40.107.247.102]) by mx.groups.io with SMTP id smtpd.web10.48044.1736869106533705878 for ; Tue, 14 Jan 2025 07:38:28 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@vaisala.com header.s=selector1 header.b=z5Tq31NA; spf=permerror, err=parse error for token &{10 18 spf3.vaisala.com}: parse error for token &{10 18 _spf-dc57.sapsf.eu}: limit exceeded (domain: vaisala.com, ip: 40.107.247.102, mailfrom: niko.mauno@vaisala.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nr6gdsifzzJwuRozpnre3HjG2Ii5xchaXW8CGm21kOMS/wdsQZNvVrNxRACoNTvfj/EhaO8ZcLtMCyidciqNuxlBdo0/26p0qXzbSL3+KMybOvTuN7ZYuHr5C5rqJMhS49jexGOdAMHPz/vROld641yx0cwzRGYamrKRhzWxyQ2DRCAC9yzrZg7Gi8DTMYqvjHelUQe3FRWbhwsehhGLntnTfIJIB97/tYJ3xd648P+0qpP6SzeEQhLBxfOaVmun5JseX1npi6iylcSt7xqw4eWuwmLgBWPLbVtUZx2w0ITS7/XlafRMXhB2mpK9orASIgHj20SiA7tlKhz8t9LQDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HDoWuAQIwRNvDo7Ut4Tx+E3vyZGDpp6/msQ4YU61+4s=; b=fXVYfDVpjMQFDona0tcRzXLUP99NqSG2EpWigi42k2/cmM8wvKG50kiZfdvpR0Il0CtZYVsHOuV7GLu3qKWgGu0fuZVvZ9vOl0xHwhEth+anIpFPtNBJ97rVSyyF5uebpBokXyQy/bveQbcnpfFlML5N8gMW+XgWo6yO+MQe28H8Q+9u2l++BWkr++EB/khnF2dmRYZuEBGrmcX7rPa4/vTujHneGH0CVy2Y4BsXElWsXjdKvdZw0uyFA9ruWJjzqODhyHNHmLKbyWR0GUj1MEXq4TtJNBc2rk1Ltkyc6SW1YGyMCsJr6SycssdONZWh8LkXipO6ljFBPQVCjnbXlw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vaisala.com; dmarc=pass action=none header.from=vaisala.com; dkim=pass header.d=vaisala.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vaisala.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HDoWuAQIwRNvDo7Ut4Tx+E3vyZGDpp6/msQ4YU61+4s=; b=z5Tq31NAT88UdJYv+OIe8IWc0jQivAlN/i3uHMpkBHnaHkmMqVtMvH+bZwIF91Kk4bwZDzpeknL/8gNixAL5eIxCItKShYl1e/Bl8whcqAFnFtjooaYiWgbDmWTuETOwp+i6fkUcqr2+9UtSvclS0hFbyG83p8iBhUamOqlFHb3y/0fLNCU16hrxXbrDuua968Zisg0rAu+0O/B/Ynv0L+vdx9XNbAzRcXDzD3z1kx5k48TapVwSBqCkvMYEvDUOYZEmRQk8N3x9NvrkE/lWGTYcz+DdrmQQVzz8UYa8MZM9TDVUozGF48SkZTZQCvjlzILs/Eb9xuXisPlEPa9ikA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vaisala.com; Received: from AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) by GVXPR06MB9178.eurprd06.prod.outlook.com (2603:10a6:150:1c2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8335.18; Tue, 14 Jan 2025 15:38:22 +0000 Received: from AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::af93:b150:b886:b2bc]) by AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::af93:b150:b886:b2bc%4]) with mapi id 15.20.8356.010; Tue, 14 Jan 2025 15:38:22 +0000 From: Niko Mauno To: openembedded-core@lists.openembedded.org CC: Niko Mauno Subject: [PATCH 4/5] cve-check.bbclass: Cease forced symlink creation Date: Tue, 14 Jan 2025 15:37:47 +0000 Message-ID: <20250114153748.2358116-4-niko.mauno@vaisala.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250114153748.2358116-1-niko.mauno@vaisala.com> References: <20250114153748.2358116-1-niko.mauno@vaisala.com> X-ClientProxiedBy: AS4P195CA0001.EURP195.PROD.OUTLOOK.COM (2603:10a6:20b:5e2::8) To AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR06MB8447:EE_|GVXPR06MB9178:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f555386-aa84-4ae8-b5d5-08dd34b179b8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: hR73LFJLg+7v72X1zrezFxJZ8snTKROCATxzsTCboSxHcbNtg+Mcz+h8sPyUD5R/20h5tIZkBXQ/aYDPpq6CcPkaEvBnO4ErBm7wLF8g3HVuSDPTAtNgJx1xhK2Xg3J/8wbIvjGzHBF79dWfnYszPSi582Y+FrSI+VNuFE+jRXsx7/RBtqYLPbbAxMIwgcG5wsSXBdB/QxgqEJmZ+YSbj4gx7iKZe6Vb+Mb5ahpfCBP/aj5RLJHtY7DctDK9cbSOr6VYLqb2/TLj0IyP4jw+lMfqoHLTBiY3jf2rln4SNPaw1qL9oMkARS2vuNR4KCSvR5oagJSn5ypLBuHnZm4SzZrO3XY+sJpq/aY+Ojwjuwu1RmkMoKesncUqSnU0ddL91LbAlv2Wc2eAlwYp9XuLw9JojO5N78VJhVeyVX4QZUBuPlDkUo4TPICN3PNef/+hz+mOlIItgn4pcelXG3hm51Op0vJU3SRE5xYo6NPfPOO9EI9zj5mNpxFi/DDB7+CjtzVNQOD+BRPJwBQesFwCpwpZwlnDogcQIYU35ca+1uQXRARjN6gXFxBofgvUJIhsVBCmpywn3Li/azx/hZjxmWVhPOP7QbwqgPjH6Y21CCWHjAumnTEcUfBOHWnbekx0xHOOQQeWxdjIw4xt+UB5DCTkpyI+HUaTrXENEOTP2LJUf27yFrcHQ0z89w/I88J5yjE8rJA5YtmHOZJ5KI8e3NsK5I62o3IlVz6ubRtsZG5nO123Ckd2WbYKdLI1WaRJRwJGn47BbMXmFmoJZJV8dZ34LkgQDzDnrbitvmqbywcqUOJE9QDpyV8wkcs5WQ37An+y9uL9HDRrijxYLp56+yuE01VvZRJ4bwmH3ZuMnQavGM7F0xn/NPcxaofDSmtEeY+9PGh6ZBVJrcMEfFgYXfrJ+z8+9fM5PJd6Fq8w/N7IfWsCY0Y8wJwYrJ+5S7w4t14Me5ISCrXkziewXW/wSgppKjF4eNIkaupf87lBRIosJ68nTTNdixG7ABBupHnYtrUsfhOissQcZGxZ6A/8d9qU3fGgsAQk1Sb0ylp+t51otbN0wBOCSeiADtjhxlpafWkt5atCbCXJ3PyIjucRLAUw6XBuv36wJJaoL3L5CXH8yCsGXvOq3Lquaiy58PM3pCRqdDhHSFiLf7hAgguWLIudlsj7NJx0av5hKDS1cv+4NeQXuCIafyjo8iMYPeoovRuuPcO0yo6/j8jgWHnntfkoifnPZ6T2TpKZGJQrIqtkQqZ0bTtqFE0DgaL6syyTnz94aiQC+xLauCBuxG0YMJyAANj9eiupzac5uMmyq5ncDBsRf9W4Ixv1W1RwS4JnpOaSt1gJL6LxGqHm+LRvv0xuSBVBWFt2YooggVpwI2sSVB5WiFrjBbgPMcaQLsFDhrWTnzKrxufsBa3gGeAgzcCO0M45Eakgl3TrWkIiYMtajHEUvokVVxcEXbBTfJt1 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR06MB8447.eurprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(52116014)(376014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PKMsI0zR6YBWyAUmuiIrELhO8SWmVymqzoOU4nkZ3OCm05vnd9KEQdTAe6xduJ44jwy1o7LyYcawlxDHtsSK/X5HU+qOsNM6NP3pO7Xgsx5DgnlktSc5uZCzSUaGKJDJ9Af7FFqas5rNAsGrZJ3UMG+6SdMpxopVb0t1I8y43tJXBL2rrFX3d+ezqSvgxkmeZJm6Ns9TZUgD/G3l24PzXr4TWzUYXqlCq2Y/dy2ERCqhhiXr9oHJMhsl16d6CevWptOvKMYVpVj17JgCXyJkEiqx3OUZvsCMresaPE+h7i162dqMrMJB2PksvFaG+QQBv2TPjTO3cbSqKWfAiGHZYj8WCko8fBqwziopmUcjKHCMbVBySz6SZEP4t2bNq4SMIfCQwrATZTHQH3AV17DAxFrrT0Td9yFg9rYRzhw+5Vux1eW62gumeuEssgObvrib4Pu+2gao4eWDk6MzuX36jXs+nNx0zZUJgEJguodF7+nn++DB6TEg3eC4JWnKp/ET1+5YE44/ZM97Fy3bz90xs00AmO7E2OeeRbUgMfsWE7XhmsKWwVir9XXGR517xmzYM48eQv4ejS2V+PccFf1JDmXdsniDzRPcEGdHZ35tP+A6Gg9y7DWUfhjsiFPd+z2elZcuX9aU9IwiVvY5fcxNMrUZePbHK9tmCQ7yRYVgeAYhJZbiZmnFA4QQcYudFOz+we33kxlvdRKIg3vp3Ww6/dmjWVN1X6HPHNkrQ1oLjukk5uNTD9fzRzWLWvCt0cHFXW1TbK2NxQz9RMqllDmfH7qrUzJlE6qfVcAy9QImnJxI9N77peNtVnY2A7Ugze1DGCG2etnNozR+pmgyIXMXpgz7JEVVmNHDGBnfIz5ik1SCMi3Y+pUaaykiebY4kuxPTwykUgE+KrklTHPX6bHnj2wWbDyW9nnJvWGqwjpaRnEiHKK+0EFk/1wYViDQzyhhQWZ3gKxnDmaXLkRljDWBDReRyZ3A8DxeUqePO3RpUjo6fzTWaJ6071Uzzn+jT4DRDwWU8aF1/aMoHzoTIQk0cx/hxNBFBA25JdWyMTLq/pHAptPoiz0l9paw1Sg73BEOl4X3ChNm5Ynn/VmIyFIp3AcrkjoyuNrYUTFNweB5jwY97ylaufgPCboXTqGgtOWVdvWcn3S5laaUPsuY5M17fwJ3/zYEokjJ8FFXV+XAxPpof5uCwQWYJl/QvFDiS+pJVFGs4cWWjnA+APGHLj3eufqYk0seXUIpQsyW9fh3tlNjxuTJxGicjyOUn1afsRqIV3EQMa1gES20ndLngTCZS7M8YyJ84e5G2LdRCFJlpxOqBYQMlutuLpD0r1KYPQAmFvhThKDNb6vbbW803c/SLgVaR3P4O5VtY0Go0TWqIFRyjRUkYpxie7CaLLV72fVeLWOlPe7OUVjwekbXGMuao9TUaZxox1iJXA8u0XwbgIKnDd9MXfe6oICRxriORKoIAff9mILtUDmTzYMmFomOlu09JjrC4D9jAPBJH2Mad6gh8vL+MwwFyBCkI0W4MoQgVQzLb7rjb+q37OrMK8HKGMNNp2CD38PuPlqiuJZ8AXQ47wvbTEbqkegK4YETwAPefvRAiCDlaNJrXpBYwEFEnQ== X-OriginatorOrg: vaisala.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f555386-aa84-4ae8-b5d5-08dd34b179b8 X-MS-Exchange-CrossTenant-AuthSource: AS4PR06MB8447.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2025 15:38:21.3416 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 6d7393e0-41f5-4c2e-9b12-4c2be5da5c57 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pJpFQad/Pm3CGMrgsfm2ak2fRBWRFLlnA4rtMnkFRZtEKgbfGydwHjJH3IE3gXSim274l+yQFfvO4DcUjLB2dg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR06MB9178 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 ; Tue, 14 Jan 2025 15:38:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209802 Allow the method to work also when the user has overridden IMAGE_LINK_NAME value as empty string. Signed-off-by: Niko Mauno --- meta/classes/cve-check.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 9f0a08becd..53f6a94b63 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -252,13 +252,15 @@ python cve_check_write_rootfs_manifest () { if enable_json: manifest_name_suffix = d.getVar("CVE_CHECK_MANIFEST_JSON_SUFFIX") - link_path = os.path.join(deploy_dir, "%s.%s" % (link_name, manifest_name_suffix)) manifest_name = d.getVar("CVE_CHECK_MANIFEST_JSON") with open(manifest_name, "w") as f: json.dump(json_data, f, indent=2) - update_symlinks(manifest_name, link_path) + if link_name: + link_path = os.path.join(deploy_dir, "%s.%s" % (link_name, manifest_name_suffix)) + update_symlinks(manifest_name, link_path) + bb.plain("Image CVE JSON report stored in: %s" % manifest_name) } From patchwork Tue Jan 14 15:37:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niko Mauno X-Patchwork-Id: 55527 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 3D474C02183 for ; Tue, 14 Jan 2025 15:38:36 +0000 (UTC) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (EUR02-AM0-obe.outbound.protection.outlook.com [40.107.247.102]) by mx.groups.io with SMTP id smtpd.web10.48044.1736869106533705878 for ; Tue, 14 Jan 2025 07:38:29 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@vaisala.com header.s=selector1 header.b=TxC3u3fm; spf=permerror, err=parse error for token &{10 18 spf3.vaisala.com}: parse error for token &{10 18 _spf-dc57.sapsf.eu}: limit exceeded (domain: vaisala.com, ip: 40.107.247.102, mailfrom: niko.mauno@vaisala.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=c7Iukn2H+xXvlgzoWcVu5aytCyBIRMj3jyOhUENORqxfbq9rUuv6145xGgNwRuoVVU5MxXeNZza6jjFEiwTypQnK7RZoefyhnKLDl2W9eQgOeU9MTRHmLG2+qjV9o+aWqNkLZtaWUA79r2SI1Fm8N2+/ldWAt13igxF44+0nT3rW5zUecb6CTbD27QHIw46Zu6Oq5mTHadAPCe0IOxeQUq+oSgWpVJHcwkY3AtY8YukVAimtyaeJio4n97KIBXknv678lf7k6iGoryIWFyncccl9q8u81WcKH53HJYquCY3hGJZR0LEUTCMu2FAyleYWZLdCf+LGrIyPdpCstAI+mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=aCFrJcL9xpUasTIGsougPtyXN0z1yscOzw9F0Ht9K68=; b=Hn33X3aX4+/cWB50KuW7CMSKnQ9hQIR4FaS1PXC9XqveNRKRNcOq2rAI8uttjcOmK3JlucXDKX4TIdPHeOkTylq8kNF7Vc7UmMacPkuyJZoDvz+FefXnfhQhWjK62X2kd2KvokHkcNgpbV7lbuAq/yLG5lsSsv6IQooKoPdSXJRdbtywg0xS0ToL8t4vkrFVyF4botpzsC71MKIl6SI8XicA1+Y18FHeTKVT68Bw/lcug5LorbuKzLkhZLkkWyC8h8BBPdDhyuHUCESSoF8jF/KLyJ/m8czzcojoILK3SLQ++g3eVRRATtyLN4IQdh/x1rQiRlbozK29ErwsjemCYA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vaisala.com; dmarc=pass action=none header.from=vaisala.com; dkim=pass header.d=vaisala.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vaisala.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aCFrJcL9xpUasTIGsougPtyXN0z1yscOzw9F0Ht9K68=; b=TxC3u3fm1RIzUqyM+B5ZqzobVMSStLDc78e6AprcYsxgc/JK1vrxXzQK3CEnwFTGzpuGSMkrDhgtX2E/RJhOnKq36LPE+mK+DxrlKKr1CW5BrU645L7gdSLNtMyUTzy8RVYCVfuwJnC2eVsG7537F7wMsVGcSn4icR791kvuDz1jUUr0bEtk4Vbc3Gqxe6XvaOQnysF5R9fpqiCZyqrtUQIRppKUAiRe6disfz2VBvkKzLTqMnKQYaif5oN8VPOCon/eQ5NnwjAhkGtuKvxB/XKpw6owgYSJ+fmeVEL0oBr/Xn+RqT0IYODS2Y3fhrgkplUwOA75rHM+NhMveI0geA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vaisala.com; Received: from AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) by GVXPR06MB9178.eurprd06.prod.outlook.com (2603:10a6:150:1c2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8335.18; Tue, 14 Jan 2025 15:38:22 +0000 Received: from AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::af93:b150:b886:b2bc]) by AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::af93:b150:b886:b2bc%4]) with mapi id 15.20.8356.010; Tue, 14 Jan 2025 15:38:22 +0000 From: Niko Mauno To: openembedded-core@lists.openembedded.org CC: Niko Mauno Subject: [PATCH 5/5] image-artifact-names.bbclass: Decouple from IMAGE_LINK_NAME Date: Tue, 14 Jan 2025 15:37:48 +0000 Message-ID: <20250114153748.2358116-5-niko.mauno@vaisala.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250114153748.2358116-1-niko.mauno@vaisala.com> References: <20250114153748.2358116-1-niko.mauno@vaisala.com> X-ClientProxiedBy: AS4P195CA0001.EURP195.PROD.OUTLOOK.COM (2603:10a6:20b:5e2::8) To AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR06MB8447:EE_|GVXPR06MB9178:EE_ X-MS-Office365-Filtering-Correlation-Id: 0fff1206-2aa7-4b43-a23b-08dd34b179e4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|52116014|376014|38350700014; X-Microsoft-Antispam-Message-Info: VOChDfKM2s/uOkC4198xb0YMC4ogh1gDGwi5VzkYnib+tYRQ17SCh3ryJ8+Kbup+fSlKzp28CMichx50pyeIXTpp7mmjU+aM2LzYdTDJrmB1DDpnbu6Al/0/pZ8+fwb5395daPm1t2IPn3AZWabKRYmEYgENzasiWPXaHKNSa6g6APoAqi1RtyUitV2AURIvPlXksuYjoMbAYatL3/SfY2zgzligRD7lf4JTA54eBboLTthcG5cqrLdWkv0iwsRoZZec6Ujt5HvvbQLJGXEMb7ewMV5e5r+Wdyzez00q7SIVuYdQHUFz033W/V/hiAdeO8HoSrHlJDzjdgjb5BKf1H1I2KomVVO688Qcuy29+yPCNSTqEdtbo1OC5HbichrY+qSZwgbkzHAWKLhC7UC7Q/qp6oaU1SFypw1mIv74pqL1OpjUGXalzz9YN8124povsVtwsvpRKPjFPQO1qum4539KYyvbM0RtjXlVPJccj3UsWve6rpgKQnII7bWuiH5JdtQpYZTaCmL/XwZ8/VdaJ0yKSHpJbJYYqnLc6devpiLg3EGsSJrT8SfXNZGnJ8WFME1Ujom03BSHuqePhiGifH2uEzi91nLJoANMXC8SwHm+lVX0QMX7/gBx9MBNYlofNgTWIxWFeh63ymefWtm7M32R+/2HuOpV2lij+is1jY5kQs39KlIFUcH3hsh7k4ED6CcUfvo76ZWZw/oecF9koJLyRky7oaSkEekmtmCRLT9uFgA55AoMfzmefgXYJjXPNuUBq/2cOfQGQZs8vT8P9dls0tcml1l5UcnyOZ6+eL5fmxCHhsKqjwK/aJSIa4tfMILqUSxY7Dxmscr2brr0WFxzXaRE3irXf5VwO+b0jcKlIMO8A1RG3OwuYFFQWw2/E9tOimSE6uvAqIt+1PQl9qxFDkJ0vtJltSMU4rr/tsj1Lw6vuAEUtb7PMaiMnkeu4Ejth/oJc0t4tXeVK5vVkRbPbsdO+Oac02OWTKGVgB9c9NscgJWJi7OTpQflDqZu1D+jssZKxKPRNayPxiMBSlNz/eCQlRIyiPPfbw7i+tqRR1PzJ3aeqxbYgpgekhfbjMcmNJkeFIatLOK/YzOXrm1HWLfvj8gpDpliL4XYeggE9OqvPhJxcB7STsmQokBpmA3yskE/xUlg/k1Nc7m8XwnlrqNc7aDjb30pDdknFGQnEYqjp0tJjOixdS0NkYi5reTT5x2/sXJ+fU3YCwiOYq4fkj+wh1mzmObZARvkA7fECJhCcsM6HXUmPYM2cmEphF537NspLIu+4XthG64ZDjKOzc9D7YJ88jn2OuYZ6m+Zxfw2w5IbrgRy2pm+sYlwamy0XioPeAhus/QxEz2zXRG81HTD1WQ0er2/p/n5W1u831qmXXZbHPQyFo+9f5xnDniOi9m1kmTKAls9gn9hqgTzRjfvEQgDzuiaY/BlAlyAK+s12Z4x7b5z80BeP9aZ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR06MB8447.eurprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(52116014)(376014)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CrEp3S2d28nnX+SXF77z5aoQu5yDinqqHUZ2vumzghvX+/JTd5FS4gMyPLXxgfVVPTp8Rhpq+R+yIhBfJZA6M0EmDaJzyM1K0w1A2+Cg13F2MLoDc6C8pbOjpjp+R183KdZMGoMq4t2WBFPVEtkmuoTCieiIQkE2xTxvYABYZu5n6UtghMnkxYreVO3edJ/uBxf76WdR0pyIJWI/TnvhbPYHXU9NX0tUBlLyb/dLdxrCqqVPvw0+8WPs0qhv1Oczb8DDvf3lv3FofvznxLpPn8kwCDPGciOBsNK693tkzznMs19lJkFFq9bUjEqyxVrAWVGe2aKf/koiQJf1y4bQ4mHtlG6hNUMSLCxrSyB5yiHYOEMfWSqm5iRG/ock8aNYNdi2Q0Y/zthNtcGkAmxasCqY7vgkNCfAAZ0z5ruo/yDJxwU2CsS/JfU4WPMqYaq/1pnK/3D+TyfwJqG0lbKTp8yOaxkUSAZG4Jua91HFCUhWr9SkpsKb32KxXXQ49ELL8EGb/tuAy+ex9vSjalptvDhSzSEm5E++TtVnSfhErokBmQD6bQD1+75omK9dihw3IwnVFlbqmicTIXGcQjS+Dj1yK9gWMruci8kobsy1NH3UcQEqy9fL9f62m4era3+dFngExkRAbK8oQ8XIwCf4YaK/H8Ip9Ir+6bjyzvtFRnn0ZEDo9uWA7zFaIuEiCR1mXNV1BvNlBcZawwGmTiizLYdvwsAsuagWQ3oi32wCHjyqfQeZdVmfAvV6Etaq/P/zBD+ZwzFg1DUBBI1ZLUZdgKi3Fc5vPe8kHqigVz7NbD7TOFG0qb9NyJXjmkRFu7Alc9eKv5YOvbdOFdXVu8bCuNPPu1EdYNMJYE2RFq860NtlH2U7RovqZMGJTaRbA4rXuSQ923BssH2mJHZra/G87jIQehx+emiXXu2XB1gAWWUx01zSouWwbgGgppFs3U1MJAn9x+ab4m5KitSNAUCunGRF83XsVqcJ9d1EO5ElqCMf3sd7Jfn0a54CTvJu63M2XkVLJCPlWHtKaNVzMyKyRJ08eCAFzDXzfxdUcZdJQUCxLpsXy51BbdscSg1+d2qWpzRQMegWs1Y4Zw5vzgyV7m7chz1Yo4yqRRXuE6IBCtq/U5x+b2ypr3Pv0ArpcpSksA/KH9/EgD8lhxGAuu9hTreowbZGveCwMrcU7pEdIYFTbFo3VMcNBOnmRGRVHDNinJQEvfGVbU8fydlEfwRkG7PUsaD+T0tl0orrdvzceuqPrwjTm+eNfNybQNFTudAcx6Jr7SoLV/rov7d2SLUs85mnoEuwFM8Ue2E2YnREtK1INUCzJZcRJ9kboYNwFVc5aAytUHI8k3J6f6hzOwHRmMb3yu/0v1L6rFKkcvoPRJj/uAu3VtcpQLOzlGFTfTSRkRe5I01R4zVvZ7WPtpURodSzNGwy1LVoWynFt0gtdJWIpoJXmOuij1dRVaUnzTryXplmNpPVq11XyGMTKuxI8h5VNux9ryjbNd2bz48gszwu1fVdCE0m0Xj3vtwGFzgd58/VIB3J+bK+UtZVTJZOoH97Xa+lSDzb9G8ZrxL8NPainIXA08uVfzxvZKKJ4UB5R8ByFiB6d1jXaYmwMc220w== X-OriginatorOrg: vaisala.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0fff1206-2aa7-4b43-a23b-08dd34b179e4 X-MS-Exchange-CrossTenant-AuthSource: AS4PR06MB8447.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jan 2025 15:38:21.6448 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 6d7393e0-41f5-4c2e-9b12-4c2be5da5c57 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: iHEZbkVq9mjGHKgLc6EolbuSfQbot4+HcqDZIT+ygEsXoFW69YkHhgR2ZQTVGl4E+XkvTHWf09cLxT/NHu/c1A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR06MB9178 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 ; Tue, 14 Jan 2025 15:38:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/209804 If the user has wanted to avoid complementary symbolic link creation by setting IMAGE_LINK_NAME value to empty string, then he/she needs to override the value of IMAGE_NAME name as well in order to avoid build breakage. Mitigate the issue by placing the common segment in a separate variable which is referenced in default values of both IMAGE_NAME and IMAGE_LINK_NAME. Signed-off-by: Niko Mauno --- meta/classes-recipe/image-artifact-names.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes-recipe/image-artifact-names.bbclass b/meta/classes-recipe/image-artifact-names.bbclass index bc76ff0e16..8acdc16072 100644 --- a/meta/classes-recipe/image-artifact-names.bbclass +++ b/meta/classes-recipe/image-artifact-names.bbclass @@ -11,8 +11,9 @@ IMAGE_BASENAME ?= "${PN}" IMAGE_VERSION_SUFFIX ?= "-${DATETIME}" IMAGE_VERSION_SUFFIX[vardepsexclude] += "DATETIME SOURCE_DATE_EPOCH" -IMAGE_NAME ?= "${IMAGE_LINK_NAME}${IMAGE_VERSION_SUFFIX}" -IMAGE_LINK_NAME ?= "${IMAGE_BASENAME}${IMAGE_MACHINE_SUFFIX}${IMAGE_NAME_SUFFIX}" +IMAGE_NAME_BASE ?= "${IMAGE_BASENAME}${IMAGE_MACHINE_SUFFIX}${IMAGE_NAME_SUFFIX}" +IMAGE_NAME ?= "${IMAGE_NAME_BASE}${IMAGE_VERSION_SUFFIX}" +IMAGE_LINK_NAME ?= "${IMAGE_NAME_BASE}" # This needs to stay in sync with IMAGE_LINK_NAME, but with INITRAMFS_IMAGE instead of IMAGE_BASENAME # and without ${IMAGE_NAME_SUFFIX} which all initramfs images should set to empty