From patchwork Fri Mar 20 16:53:12 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 4969 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 20 Mar 2026 17:53:36 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-pl1-f183.google.com (mail-pl1-f183.google.com [209.85.214.183]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 62KGrYb5014077 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 20 Mar 2026 17:53:35 +0100 Received: by mail-pl1-f183.google.com with SMTP id d9443c01a7336-2b06395b7a7sf27579515ad.2 for ; Fri, 20 Mar 2026 09:53:35 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1774025609; cv=pass; d=google.com; s=arc-20240605; b=N2ZxhSWKyn4IyDvi6tZm+w1daR/IEFGS1sTxawXPcu1x+0PIUIj9SJCZx5l5VD4vPv r9EJ+w+TT+vWCfWC8+pU7ZU5tCLHwar9F7JXPftyyA9UwdTKzBhlnG/EOi/lIe258JOU a7yb2lxN6BHuW9ObLiLD8H9s5IRlYvl5TFuwqEGJJRQz0nowZJvHDqFoYDENtBBdiyxG B4KTkSHPKlICkZkFhIv2PV+y8Yh90XC2RZfBLytgULjykJBKcWNS89VHlkyUBRhdxZhF 3HZsF40JubimvTCgXMyUekFKEdq0y68jxXfxEs6dyim/c7f3n+1IHRRQpVdS0BBcQIdw jvKA== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=jVMFdPnLpmqzgJEnXJbX+oU5dzV5JLAWWgoUhP4q8XM=; fh=gu1cVzWZ48o+oOuPhM3RHBvpHGz+7i26kVdZYSYQlLo=; b=ZOjGVeG3U1/LS4vMCqE3cpZhuq2FzSMiC2DfNdg3604RG7cHkUDMO26nIBEftgmfHa 0P3LYW2I0h8AMfNySmMMY0QVdAFHdjEgCVzCfa0p3c8xOnlgjzsCH3YRCCHKkhHCM0nb J6b4WC9VJlDBO28MUgQHK4BQqAkK2EgSOBrbrFSh1qJDeAUva4g7IUwBkiGlB+V9I6r0 HqLEhqw3aiaNGvRw9AKN+8NJUryJ4GBTefj0I8CaT3txbyi0THxDo6u2Nxwwa7XtG/oz HhGlM2SMMko1N2LHmrQYLSvm3vNgLUyVrU3xaDXnCL2dLJDTdKwwuGeRvGqsTARB7fFs VwxA==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=GNo3t7HB; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c200::1 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20251104; t=1774025609; x=1774630409; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=jVMFdPnLpmqzgJEnXJbX+oU5dzV5JLAWWgoUhP4q8XM=; b=Cn+EovYYiNXk60TiB/Jna3XD+Mo04wOyRZA3VVrnDLSW1mqzWVOm8CPr7j1MVWwvFS RYW8AhLDSoDMLhiCgsEooUv91/3g3NCiwbdKOALG7LQYetZR1lhg5sctFdjlKs2EbvoK ChFcO2KIQAfbrVwj1J0PHftF4hmiTqJdRsMRmPuxEoF7UOvxL3t1iKQSGP51ir67DLOh g0HYqVEg44oUcLo2FCVsTA4X7HblwqjeGyBqT7+uYgtCfQD6mF/8USXhmri9wDpoTbxU Ks9zlvSgQ1zgGmkxcK+qMdXVmaH0+vCPdUD6draZ60JZa7J07zWY5WBMLrhLMwrwLalH ApFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774025609; x=1774630409; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jVMFdPnLpmqzgJEnXJbX+oU5dzV5JLAWWgoUhP4q8XM=; b=Uz3SGGxdOp+PXY15mSdoTIaMxrFkxon5059g+RZ8QILK03NbXvIZHBZIu4td2HQeBG 5/BvygzIqHrzf5YJT36JK2ozP6nwHzF6y2wGuusJEIPBcI6UXH7ZMvEROHyiY1lUctOd fScn10wrxHxqbdSkyugJK/dsTGZlyzbTB648dcXrarpsNJeXz1ochs5X2VjEWc3Uistq ZBodpuQgbbHTq4JEoOT1Y80KD5rRV1PGPN6D8UWC1sqMG1SBraE74jwFdrdtlRZJOOCt +VGgn7wDjm0MEsvQrp/BQ99IukdLY9sh+53sZfqb67DpHpPEBDixYy9iqC5dd7HtHWWw At4w== X-Forwarded-Encrypted: i=3; AJvYcCX1zEiZQZfTIH4MaBzQkIeW4nC0EIu9KmlIelOoZVONOzc/UGRPcC3NBMSDa3aYlrZxp6T6Fsw=@isar-build.org X-Gm-Message-State: AOJu0Yy+SHWdwi2/4cyyCEqeG6flS+Ft5KdiGbjLmb51hBj9tgqppqcB Y+x6pUEvNwX+888axEMugBY5R0Lwh+EKu6kPyeNy3z6JlvG92227WN/o X-Received: by 2002:a17:903:244d:b0:2ae:ceb0:d5f0 with SMTP id d9443c01a7336-2b08280221bmr31511085ad.47.1774025608722; Fri, 20 Mar 2026 09:53:28 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+EgZFxO/4s2mqXPJEhttiYfU+pJi3rB9wKmmeERZGpymA==" Received: by 2002:a17:902:e745:b0:2ae:5853:a9fb with SMTP id d9443c01a7336-2b0786a3453ls25125925ad.1.-pod-prod-01-us; Fri, 20 Mar 2026 09:53:27 -0700 (PDT) X-Received: by 2002:a05:6a20:244b:b0:398:c0ef:e15a with SMTP id adf61e73a8af0-39bce97befdmr3511307637.13.1774025607142; Fri, 20 Mar 2026 09:53:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1774025607; cv=pass; d=google.com; s=arc-20240605; b=j43Y/yBXojZLSKZt4I2Yjf0MR6kOtq25Hs62cfQzlmstxRNNgeNHrTtsz5FxTk7xtn IP8p/84BDoUqKAO3Kek1myY6XtE5a1AQ0ezRJ61flOhxYApQs8qHTWy4BS3NnfzVyfHG EdTfB0Qk5Vg0aTozgAr7QSNHotC3TKKsemzGbqcw+B9iCDu6WlFUZrzyk/adupOKtLl6 q+vY86nWIiYtIvA3Mm61zf6lZZfhKR/QcrJiFErS/omEK5E8vUxVKoCnL45JuE/tVEY+ jVkptGXGcFxHQgk5obWixfs/dtSjqTnEjCUGCoedO8CKaOG+ueKeeRIUkoJIKw0gEMf0 tGkg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=bb9p48QvOKPlj3Cz5v9SoAmTbUcYmR2bPHh5fBjZEsA=; fh=y4Q4sSo60XIDMfQl4kOzeqW/gQkja1RlhaZM6hZs/O8=; b=NWSAZBKGiVV6ZmudfKrfOrBzeesgNzfftSmI+64Is3jiF/ZHl1Q27n5jVKzw8L29Ti DBSSJYW02FlGb6Ll7beT6Z4XmTg3QlcQx8RwSXF2tkVSqW4kpQABNbFnYACWqtOrvyj2 b6HSPnm8HO9fU8TpLOgrhDyx3drUIefu3FTwvXgEHvc627HADLSIkPFuusNCaH/uL+5M JNEFxdbmTy5n132PCLMLRzfT63D+PGoY+a0MQP0fZmwk8hfCI7e953ryi9bZg/FmX6Zx GxRiDtIDGWygkdzvAGawk3No5UbQdZAb7qoG5fOmOjdFnarS/P0aCaEtNjWpSrPd8EQ8 z/GQ==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=GNo3t7HB; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c200::1 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from DB3PR0202CU003.outbound.protection.outlook.com (mail-northeuropeazlp170100001.outbound.protection.outlook.com. [2a01:111:f403:c200::1]) by gmr-mx.google.com with ESMTPS id d2e1a72fcca58-82b03ffdbdasi82450b3a.5.2026.03.20.09.53.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 09:53:27 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c200::1 as permitted sender) client-ip=2a01:111:f403:c200::1; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=T/GDYs6ewbYg+xljiCtoKulg5EDQdG6K/jtComwSQBnnWIRr1fc7f0uf0EFYoBDFPn7YvTSdGYHO33L2En4n5bv69yUEaScKMAyuEhRkOkyZNttGXYj1UBr1I+9zdMqXw5DKtV3ztyX4j6K+zulw1IX32PdpQkKI/T2QP3jPOsscz1wbRgccYhshPkgKB5vO4WNShLjjI8pQGP/OSAoLMET7xlIKNOqlFUNyAlzp71ZYkcQBgnWdrLBFGXGR/LXp0wNwN3IZQLiopT9rH4KMFoHDjTp7FI++maNbGjXs3Ue16jS3kOYUny2PhzxAQGxDAEFFW1umb70D5h1ZcHxXcg== 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=bb9p48QvOKPlj3Cz5v9SoAmTbUcYmR2bPHh5fBjZEsA=; b=s+vtjcFZYGvwbILBN/tPsVssLIcB0mMkoO2kfCLFgb5/GqGgXSJvq4ByHeOETzuLMrrqQXYrtMP+dCNd9UhBCatJrXc2Wm6TlpQhRvA3NTKshhLTtvqZBf1c7/HleyV3T8HA3Yihe126/GVn3EpQBFUL/yLp/rienBp4+3g4BVt6dhtksYy1dAERiF7o6tr689ucDMik3oXBMrD94kw0wq1RmFnn/CAlz9EvMvyeZyHmRTsepw3ae7QDk41LJz5DWYQDqWnaKY5hBEKA9UdP1OpIrowYqlsWA7HNNn1dD/1eRe92nbh7CUIIYhvT6UFpIFNcvv1RPuvVmHqGjTrRQQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none Received: from DU0PR10MB6828.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:47f::13) by VI1PR10MB3149.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:12e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9723.23; Fri, 20 Mar 2026 16:53:24 +0000 Received: from DU0PR10MB6828.EURPRD10.PROD.OUTLOOK.COM ([fe80::9412:cd7f:3f72:92ab]) by DU0PR10MB6828.EURPRD10.PROD.OUTLOOK.COM ([fe80::9412:cd7f:3f72:92ab%3]) with mapi id 15.20.9723.018; Fri, 20 Mar 2026 16:53:23 +0000 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: Felix Moessbauer To: isar-users@googlegroups.com Cc: Felix Moessbauer Subject: [PATCH 2/2] merge_wic_sbom: fix name of initrd sbom file when merging Date: Fri, 20 Mar 2026 17:53:12 +0100 Message-ID: <20260320165312.88046-2-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260320165312.88046-1-felix.moessbauer@siemens.com> References: <20260320165312.88046-1-felix.moessbauer@siemens.com> X-ClientProxiedBy: FRYP281CA0003.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10::13) To DU0PR10MB6828.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:47f::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR10MB6828:EE_|VI1PR10MB3149:EE_ X-MS-Office365-Filtering-Correlation-Id: cfdb3ea1-dc0e-4269-807f-08de86a13303 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|366016|10070799003|22082099003|18002099003|56012099003|55112099003; X-Microsoft-Antispam-Message-Info: WPmV0HoERJQi2XJOI2rq8+FyFo3OGMvSbXprDfcUlsj7G+PK6k35HJdGkTQX4UnP5ABwpWsLSVbTT8ONC3RA+gsi0CRFibi+aIIMeRiwnyKtrDc3bMzWSQXDB9v4Ch8gyqH7s9ur9qNRnmvzhDhRwJxuXo7C0awm2qa01Qel4Ue6OT4WMqWt3QDcGY4jP94R7HtLziTvCVZup7MucNgZJmngoXUks92XD7GmwH55krRcfBBeHMHb4P+0DmgH5rUvWferY6gQKoncclpk+NDl+nNyCiNl2oElQzFzu2M6N/EcEULoKP7c4+u1NX665NlUt+/MWUREtbGu8pZyR6JYJxhnJk/45GD17gh1XbtiWVOpkgPdT+Ys8leo9ZXGAVRzJtyWNA1JGOH/jPUsr0sWls8MSrn82zkD2wzyT3su4vd4dncz+E6aNRrqdiK8vQttUtbpQoJE5AtfInSL9NZAVW0nlUH3f9DkPWznlH1vlxGeCmnvkRn6FV932V8IiCH3vsBD3NTc7TZUWyuql3CxippmPLhKEYiAXQscPN8ONUV6NOE9gI6x4+xKXZTY6Vnd3N5UgoCRukROB+ag8wDCMDxVqQBWOcp5vVEDpYFUjIbp7OLZFprEEY47I62yZ5+neue8pQqf536a2VsRTCBt1UMTXkmOfJjkGUYUfCQiKBZ9tZ89M/6qn3kebB4IwehLrFL6QxKSZBa9bf0NN7A9jLWledguL/3RQG6t15Qx4kg= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR10MB6828.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(366016)(10070799003)(22082099003)(18002099003)(56012099003)(55112099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: tVGkDXNmULXpoF4Oq8hZ/+pnUd2Y4ne+A3ZMG6TOlRZ+RUzpH7i5qysHZchXNkgK6JbR/HYlxC5cHYFG2FV+rxZYj0G6PPFFgoV6plPbKHXcF2PcovfAvhSiFJ0R+r+RERtw5AVJPKz1K6vqSYSZSYmrdF8EjhPXYabz4Cwx0qWf+I1IauZKWj8Y3sjItMGYreBbnr8wuqiZBlTXDeVMLbdIAVbazYaj+zvfpQTrJwKPlMiNU+JSvTwedBqDXYluWo8FyhqAD8KHKoSwO7isG4UBCwwEawip5L8P77kTAXRH7DGcs6la51UYc8XGjsB9XUAWznywysgzyD7IST0IzkVqueJa1+NHwTpgIoy68n1DaB7I3FYzjUc/rsT2AvKaxlmHOzwhI0Q2lEzPCJHeVFWvAZizUtzRKK057egcOjWd+mi+BNVjK7u1W6gqPyRcyjKNJjUTGYAmBhJM4nXVhSRzIoKfDBQKMJxhelNz4DyXXMYC91gRjNq5ovS9QoxCa9whtTc/Ydk/gciuKmsXppeiMx+GKB4/ytVG3CssapHp9PWp7WdpLOf1ZdqCqMuBuG2d4cneF297kigqf2wHf4xDYGUiAA+O437nevDgl1ISLLWM5uFNehEVQg/Wogpz3TEjqHb6mL4TOZKfsmGV/c+8SW4+xmCsqIO8h9sduPDgLONQytkEBkZ3XySslqtPGeWUjkxBOzNEJ6e1br8l1wCXXIoPweLrCNGNuqfj+ZWEeyP44aHcxkPZx1RNiW1odupdufrKJAaG3VCTOhBIESaA+9v3DN8BlsDpxnPcNqNKFE4doAZzbrulVNtmF6PZFB3VsPfWar7bRMkhKHQu4FPkZ4utRW2fWz37PgvPq0dfcts4L7/Cdj5xsBsR41qDE+2B/F5bCsGNaURM3THdwouyTjGE5nvs6NFklO+eYKt/P438LVBvEhb+UbQ3VPgInzPrYdoVBgH3g32gMMsf2kmuNEjmb7G023jLHR9lt1BzocwSPVS4kD65b1MEMZXEr2YPi3qn88eytpyoEiUxS34/cCqH344kKwbhDdD2UzwK9XRxOVVL8FTRPILGwbg2de35Z5kEd+nQBcqQ+g3/0FpXEdgK1tx5HqUGDVNQUwwjNDLT+ybfawvWWDjHMfWrrvIygcwBaqNfQWk4aJmoltvIFX++mkyZ/BOmu/ptfp3wKBHI8gH/hlhap4ad7lI2DGWLSzqHKIvxmZKQlfHNNziTdSnbnGlDHJYmbrL7TLRe+s4epYj4qHCOt8RfIPpkjEhAFLIzFy69gNYs4nZ5tMU+giVmDd6gt5B+1HUkesD6CIYb2Y1IPvNmBUkiibX3Pt2vSmt6NBP4SpUgw92Cu1FdtQtS0vtD99QxQrPb0WwEcMc6QsVQpVCarMoIqSBQqdcW4b83vKrsI/j5RgEatbSI1snMtnl+aawKbXUoYf+Ror0pIjywiEsMtrUTwESGLyQ6WlxzZrav1ecWOe053M2IVsywXl0aqdqiueZPXFzw49oMl4cfHmpiTMFrSQj5rMDXp9RDUVaA7Sq5BldHGWWU7bn1IP5mKeNMr+5wfeNMFTEi1xYX3sCmLzq3tXBD8k3dU5hMAOY0CjJIBksTQiZ0Rgi4zammQwwoUZURY2zDtc9Fw7BORNA0GXzQvXIwEQwyfOv89li2aPycDmgdVxZzirAaTKzuLxvhpD5ITnEGu0hOo5BGmrAIVMEgNBONaUepY4PE5NfPiJvrA5QhoQ3Da8rIzCHC8TDtmPoHqI+2rX4pPtO1kyeOlZpGFOVGci0cBexz X-MS-Exchange-AntiSpam-MessageData-1: v5mXIuuKE8rqUjoy0EyyvPln/OmHJ5LnhRg= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: cfdb3ea1-dc0e-4269-807f-08de86a13303 X-MS-Exchange-CrossTenant-AuthSource: DU0PR10MB6828.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2026 16:53:23.8613 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zI5uf3TUUCk/rH4KCd4E6twY3hBF+15ZN2hc+8iPtUkH1sO3G+3UFG/N4CmVILF9QJ8MMtqRgcluQN9E2ySiSpyDCNfa4G82mZlH3yzEMeA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB3149 X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=GNo3t7HB; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c200::1 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= In merge_wic_sbom the rootfs, initrd and imager SBOM ar merged. However, the initrd one was never included, as it was accessed by an incorrect name. As there is no common ancestor of the initramfs and image recipe, the name of the initrd that is generated is only coincidally coupled with the one that is imaged. By that, we need to derive the INITRAMFS_FULLNAME variable (set in initramfs.bbclass) from the INITRD_DEPLOY_FILE variable which points to the initrd that is imaged. Fixes: 174dd3e4 ("wic: create uniform SBOM describing all image ...") Signed-off-by: Felix Moessbauer --- meta/classes-recipe/imagetypes_wic.bbclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/classes-recipe/imagetypes_wic.bbclass b/meta/classes-recipe/imagetypes_wic.bbclass index 5adea149..231fecde 100644 --- a/meta/classes-recipe/imagetypes_wic.bbclass +++ b/meta/classes-recipe/imagetypes_wic.bbclass @@ -212,10 +212,15 @@ EOIMAGER merge_wic_sbom() { BOMTYPE="$1" TIMESTAMP=$(date --iso-8601=s -d @${SOURCE_DATE_EPOCH}) + # As there is no common ancestor of the initramfs and image recipe, the name of the + # initrd that is generated is only coincidally coupled with the one that is imaged. + # By that, we need to derive the INITRAMFS_FULLNAME variable (set in initramfs.bbclass) + # from the INITRD_DEPLOY_FILE variable which points to the initrd that is imaged. + INITRAMFS_FULLNAME="${@ d.getVar('INITRD_DEPLOY_FILE').removesuffix('-initrd.img') }" sbom_document_uuid="${@d.getVar('SBOM_DOCUMENT_UUID') or generate_document_uuid(d, False)}" cat ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.$BOMTYPE.json \ - ${DEPLOY_DIR_IMAGE}/${INITRD_DEPLOY_FILE}.$BOMTYPE.json \ + ${DEPLOY_DIR_IMAGE}/$INITRAMFS_FULLNAME.$BOMTYPE.json \ ${WORKDIR}/imager.$BOMTYPE.json 2>/dev/null | \ bwrap \ --unshare-user \