From patchwork Mon Mar 23 10:31:25 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 4984 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 23 Mar 2026 11:31:48 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oo1-f58.google.com (mail-oo1-f58.google.com [209.85.161.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 62NAVkvp030615 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 23 Mar 2026 11:31:47 +0100 Received: by mail-oo1-f58.google.com with SMTP id 006d021491bc7-67de3f8988csf32916748eaf.1 for ; Mon, 23 Mar 2026 03:31:47 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1774261900; cv=pass; d=google.com; s=arc-20240605; b=Va5rEu9Kl/uogeu9SIR92Z9+/gw5qnOuMxPWKKWW5F+3fTljPUFrgpaZP/MkM5iaRp MHKLTlr2jr9TJRDo6UrDEPcX/qygwrhltL+5EgbkoHyeUMOtRYt3KQlXNh1rGEiHIWAx WLiJCxuF0ud8Jk0orjj8ZnMHUT2hB2aNPeHPBCQRuOk6d8OEuGpJmX3dLevSj0tP07Iy jrbZtr4KjkpdMIW6KQPKzQi/rEDAJzdzI9HG0eL6xX72dl+idEL8+0OJ/FHBRPxUHAsH wN3fwhgqQ1Z0WXCCt14B/eKzrzm2u1Kvq8+Lf6W8P53WIJ43/u3naV1t1XRMdAhEZnHx aUbg== 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=3aSh+Om0HPQlqj53erjNCBWFaYrnRiPBRVg5y1tLc58=; fh=aXO410C1ak6a3XUtHbBGQUxCTKJvztS1g2YfIdtPi4E=; b=RJwi3v1lHTX4xirQ2kqSCRSuRxgjGZLaGBT2zamZYAvzupebRTrKO9Ro5zmZmFfZJI /GTdvjxXEQzipaPOTNChgdWREAD+QxHndWZzRKvzVl/bm6eWJNQdFDv67SHUjSn51ASt +ue9Aobz7BjiQ4DGdjUYoUDP5wghnL12aqFGyqhXR9aLoYYbxDYKEI9dO5RiA1gokcgt r05sPf0okaPgtwHPY4rMn9JbZEFUbhQJnirWffp7aGJWoR29lNeG+x8tzmzC0sqUobsG JgPg+3Vs11xAWl/PZVNfTmYyRrkugaTSQoPQ3NKSn+9VWxeqDMQ12Y97wuzUkJkEZeAt u3mQ==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=jSfh9g3N; 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:c207::3 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=1774261900; x=1774866700; 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=3aSh+Om0HPQlqj53erjNCBWFaYrnRiPBRVg5y1tLc58=; b=DKNhRAvFJbnN8F+RtGFucFQ2FeSK7y4ytP2fxGAckEx0qUq9xlA+xvW/+/8hAGWgW3 nBikq5I32sAZJxHAhvj2E9O4kSkKjGVUQnwMSwM0j5y5mTxQiO1N+dD0NvKxV1ZXwk9V sHOCLjtLB0zsw88c/vV+1ztFb+QMWtVy17pn9OE3FGn1H64z+TYEy6hqWHUfG5e+ET99 6/yayOmDwjCHAsFeuQj/Te1615nXkoamtWL9Q298lNcV0B1HF1cJyeaMMPrvfhwZCzX4 +EXU+eoyT6nqwLd5G3DHUyyIvzgPy2qpwlz5VAnPmFkwYzjvigjLBOA/kUfQi7hHGEu4 7oIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774261900; x=1774866700; 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=3aSh+Om0HPQlqj53erjNCBWFaYrnRiPBRVg5y1tLc58=; b=OsTiQGXHUqGxLAClrBFUp0MKEPGbPQiFU+Waj4iKM8dhf97/xoFVN1yHsTomO14e9y IMJd99hu2vhTlFnn/oAljtqChfbvwCwFMeKN3Yq4AvgVm6Pxu/5zXAZGqPmmnM19IwfY oTFPpuMToMNNsAG9tr9MqRwBVVhf3jQS074yZKvsBHDRIV4+gkgCXnKRB/1v9lMnNYAD 4BLnHsGxI12GS6UsbE8Ge7aXE+luS9rVW53o+2fF2/67mRpZzofEsLYQB3Q+enwI958J IpOq5Q0YMuy/ZbxG0VxBJeZNIRGwf2Uy8gTTGf7ADSuMQtmJJVHNG06CbEONhCfh/keQ M8PQ== X-Forwarded-Encrypted: i=3; AJvYcCU0ppr64RkZYuj3Uje7R1lbNcJnvAC8NrrUYfQ6ushF9d0lTpqWmsvEzQyMT0k2fyOiAeDE61s=@isar-build.org X-Gm-Message-State: AOJu0YxJZ9Cu8yQrHuTZj8Pl1cMzdRxwYuQOR0CB/jBV46e0clTgiSlp fqySwYFNev4e22gnAqMA6uBiPx5eAFD6GoXsXIW5+40jUKdVkNN9nLqm X-Received: by 2002:a05:6820:624:b0:67c:2c0b:d5ed with SMTP id 006d021491bc7-67c2c0bd908mr6296405eaf.71.1774261900200; Mon, 23 Mar 2026 03:31:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+EfuIKl92irr9pekYSXMqMiW9B79+N8tlNPkIWMSvtNqQ==" Received: by 2002:a05:6820:2212:b0:67c:25be:7576 with SMTP id 006d021491bc7-67c25be7656ls2027910eaf.2.-pod-prod-05-us; Mon, 23 Mar 2026 03:31:39 -0700 (PDT) X-Received: by 2002:a05:6830:43aa:b0:7d7:d673:c1c with SMTP id 46e09a7af769-7d7eb011282mr7566624a34.33.1774261899451; Mon, 23 Mar 2026 03:31:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1774261899; cv=pass; d=google.com; s=arc-20240605; b=D2p0rdY8S73tSLCXvzNxrpz5QlK7luwSZHa1IoZhq4nDA8PA1nbUrsWeogZgOOD9TY Jr8ddhId8XgPj/DQzYuyp1TYl6mZ8ue92FHH2C220IndLl4AGYi1Ryt9YbQAXDt47IpU wHRjJlp1gCSgcpggD8nAmGgQaJ31cXfu6l7y8hd3ENgRHNhtnHiA/U1OsV92z66WnMoA KLaDZ//qfLfgjYBXqcxj6dUdc8vnGIebntcjnN1hPwzGMBHmmtLodKqIQceSVBLkqmYV pGAvIlMuPugByB8MwP51Ftif4RnGl3bXAGtmpKl6VgMRiNDuSeR/4S/XS4htnAmylkha 6FzA== 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=oIY0mENlSwbrVqbPYRZEqZso/tYd4qCBY2MuhzrOaf8=; fh=MAR4IrvAhd3sEKpd2rMZmD1A3RZ1HgCziLJco30Znng=; b=B+wXVqfXNGbK/3330TihU5b4Gl0UizeGkk1CTRe/pgBSaWkbLKhICYTBkPkHDXZJB8 jQ67gdm/YZom3HHFEf/0RGbnKE6svJmHMBja/r6ay/106bYCwgxNoQPgPWHy5BKCq1YD /uuwwqSJtAQSfUnZ4PduVJCCqLoip4rzM1DIeFDgS1dMka59oQ9y9CD0HeNy1FWQe492 DSeYVZGvrCRBViPE+1J52r35LDQyIVj9JjuuIqKJ4XlbbkWTSk1WUfXUpomzfIHekj6l vjHSbKrtxQZEygw5H1/hJ/wruzhBoWSTwV/7cpD+x0JxdB+XG160Qib27GpJDOoS3PQY gArg==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=jSfh9g3N; 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:c207::3 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from MRWPR03CU001.outbound.protection.outlook.com (mail-francesouthazlp170110003.outbound.protection.outlook.com. [2a01:111:f403:c207::3]) by gmr-mx.google.com with ESMTPS id 46e09a7af769-7d7fc691c98si231649a34.7.2026.03.23.03.31.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2026 03:31:39 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c207::3 as permitted sender) client-ip=2a01:111:f403:c207::3; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fg6kvMGALvPKlkR8u+c9retg2Av7ftvHLUkBxan8qxgnkh47JUF6z+rq6FjPvSg5D34NeZO2ZlGftASoe+mI5If2KHjAO287tVUuCzb2CBnT2rGYISC50ftKd5tugbp10g97/GR5c8982hzCZ8I/CWXxFyXXF0HQza937G5N/K72khIITyEwoYZhrorVaWE2qcsAiyBqN+/Cj8tCAvJvuNPEooxiVS12icldIykRCWp8hAjEgbfVmVCkKXehhtQGwTPAcyCey7R2OU1tIHWq9dfHK0Vq+8t1lR0hYW3W1S6CJ05R3NLXs5eRfabeclcjyuf0GzU4r/noBy2k8oT2cg== 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=oIY0mENlSwbrVqbPYRZEqZso/tYd4qCBY2MuhzrOaf8=; b=PeVPk0146H3FP4IOnU8LQT8pISMLFdCfgJ4I/yqehcp6CU9sHlkOCmzryIb5fuIqAetDkoBKqtkeqMlvYuISTrijzcb9deC5TydrE+7xL7eEYe9vGVhvP/UzP+OGkC3GtDJUKqaHEX9T9F5NG4yAK+uDHY9YeTXlcm+Aif8uY12LXaBkkMMdTEEDKrN8f0VtxsqdE3Be8zqLEwx0fVRhShsb0TNzc4DLC0mKRDrEuDt0m5Sk9Nxc4pLpNf7JifQcOfjr/EpXU7tqX8+o1j7JlysCmF+mQwhuE1i/RUghh1JXc0dCXoufOD16mZOxHUKQKEOGbeZxsUAKaZD2m/uGYg== 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 DU4PR10MB9808.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:632::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9723.31; Mon, 23 Mar 2026 10:31:37 +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.030; Mon, 23 Mar 2026 10:31:36 +0000 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: "MOESSBAUER, Felix" To: isar-users@googlegroups.com Cc: christoph.steiger@siemens.com, Felix Moessbauer Subject: [PATCH v2 2/3] merge_wic_sbom: fix name of initrd sbom file when merging Date: Mon, 23 Mar 2026 11:31:25 +0100 Message-ID: <20260323103126.962344-3-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323103126.962344-1-felix.moessbauer@siemens.com> References: <20260323103126.962344-1-felix.moessbauer@siemens.com> X-ClientProxiedBy: FR4P281CA0180.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b7::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_|DU4PR10MB9808:EE_ X-MS-Office365-Filtering-Correlation-Id: e0bc5101-594d-4f97-d2f0-08de88c75cae X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|366016|376014|1800799024|18002099003|22082099003|56012099003|55112099003; X-Microsoft-Antispam-Message-Info: BebxiHajxTsdCN6Mdmog5sqcuI0T119GyuYbDdLcYSrBQwlLfj/HAdCrd/ZdGl9X2+5TmsuLC8j7JDQfHMUrf55gjJrdlOTFRPt18K+9BgZBEan7uzuPmG26lbT/sGYCMKVf0NMZsWKks4cCUohnqnLZ10YG4zIjDZMxGYnf5kFKZlWKdzGEJBiaXZ1hCYN4j+gM/2RhwuL8okFR59TeDvZIojCOLea5FgZz/gJ2tMOYvVioJMZr4kTJJTpop/ViwLWjzwkwExe3LEjvc4NyDAp4mLrWWhWVHCrkQT7XJDCOkhH4XLnxDkfp9ljv+V39JoOjI6kf3r52hSMkkWvbbGdeswwkbyVjy4gbnLqFRBBJQQcSjM0ayi4m3IBKMjV/ANd8yX30VxRm//QwEcVMMYPOIw5J9DexnEBIhIIazp2auJkE/I3o9SIxV2jVPJXtQIxVZhMcmfXKWQz7wA9e7VejzuKMT1iJh9CyIOt9zK0hrTpvnSlOwnQjFoXwqjroU1MuWZDi004qqnHgHjyH060Gux44nMgnzmNpSuuRW5gkHCwzGaRdvGAjZ66JtRQy3QvdRtCeZjYiOjtzWvQi0mXPF3XHe6KAkymuP3XcAiB8Zy/GXYSAewIu/+e9b292MnxYyqFMS/G7V83DO3ohZN+TcmJp1cSvAYdKNB9wcxZtA+8NQet5MfwJdEzf+KDDFush0Q2+fI1JmnbRBDhnZB/Q6m8xyD/0Qn9parp2F+8= 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)(10070799003)(366016)(376014)(1800799024)(18002099003)(22082099003)(56012099003)(55112099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: Igq/Vh25fltlAFAGkw4pdsA90raDIsdiG7uwfx3bQq5fBlBeujnttzbdEmS01V0IMrSS+HrdTtX7WtRv3TE2Nu9QpAIV75EEEkFWGyTJeIGypJAlnsQq9Yd6vfQQM31S1T73TaWoRxR5Lom84fUfFJnVCiaZDGcGi0LC5XFlX7Uny+vsTtRA7gOgqI8Pwm/O8Cy6qBxcsPmE5tOKDDrrDPMAiypnQWC0PCTpuwME2sSAJ5BxPBOqbsFfwfHCXBdme+0lkH0U5hx8LZqwtzCs5RF+Zmi50sdo6JbB+sCPl5zZX8ynLoP2vSaU/focPircYpUYRZLzj1t/YwQLD3ujpXypBDMmm0kagQkOeIJmhyoRv4AbhGm9JDl2pYmmpE+CRl0yRfMXx4u0sRw+kUZ+5eFgIfNgpRloUCcPzR4pcpVlg1OO0deocMuYjcfE97dwWUnopJirOx26SGwJw1A0CDkDg36vOa94okGDIO+FI99Z0kO+Mv9JeG+a8bLXPkyOU3zRRfHoMK2VQixL4Ist6bba8K/Th8WFPn7wyiPAeM2KFL4c2x5Ze1tF/iCAGBalllGmrkxPvAHR/3NqGznpUjfvw53pVD2YHRCwOzsZ9oxFytjS6raklG9eo1pa538/ao9BH/WepnTMikYW1PPGgHgslBMgoI4hfu1zqK8s4eU4u3TNMYDyeKeoisKUoufQS0QUTKFUfUiQtbMh5phML2dcw1uhrPDCVmz5ub+bk0hqq+GX7DqC4G4uGOXoMCxJM9i+TBCXwfL4FElx1zeO8B5DJ/vhjXxpO/P72IJSeYI126i1el1Ur6a5YhMbT3oWsTfjyazrvE1BmHT8oyqY033X2mc0RI+4+pppl6MxSZ+bBxJZsQIr95djaumNcnW2GFwIH2wm2/kgAlBROFEHGPGIWwkrKkIaDV9i2smUQd2nf4ge8Cn6dFDJsf8JivY74KGABfuI+XlF1SY/dTFOSOwEr1GaPQfWDvr9tsxEIlN24whMseYZY05lauIy3u2KeMoS1+bD4w6hlhUtToaPWGh6/PiBx87hvWZT5Dh4rCL5Jn/T3ccmRSmaAXT+D64jAcQvRvNwYUOX78kW5HSMcpNFfMJDKIqWs5TSS1szbYrpfbhfr9la/TWTTgD32Vpamj9EK0+XJfYAhe4c/vTHj8hiqXk+VNyKY141refnLvvfYkmW5Rkx1/u6MHkC5BOCLW7bFelgl2zsynIrL+BsRoFSea9jSBK0GS9yVuUxWT9IZtZlQU94yB3FJVZlBU4r8iK5J6qffLoX89ww9yzXjCbyUMmpuD+TBq6G/QS8MENMIaUKEKhclR4LLLLhihXp4aJ1JILY4hKzjkP66CpUhuRkUHXWtTTUjlLCOHqTlMv62fCVYUXVXL5/dze/o7nLmJAR9bBOQCGV/VOjRSQkykWrzbvxTeR/jfVAIE4d/vtUMqnErYo3zKBWdczNrzmPm+h5VsQ4uRTCoO8la+sfZPx/VSNxI8VSxxhkH1Lwc+kttKAwFBV6La9rs6N0gOckEO4j4s3GzS9Fv8GoFMvbTzdMvasrsy4a3Nbv7l9uP6HGtzITmhnQk4a2/SjhYUSZoC5EJohFDzEeJ+D+xmdNQrNIzYy80K50kbknu6Ujnm8J4Mqp/H5AFkOdxVp5k1K+Q3k/s9h+SSCFq6fcJMOgQYZri9Jy8iLXlxaSRMXDwnkRG6ef0oLbY+1mTTyMCTFuu6Bb+Ska88jYQcIEOVN0dqgEaNg2ET8iHmx+hn89xEWWtFf59JRpKXzI+2Hwfu3/2vhULOEZ X-MS-Exchange-AntiSpam-MessageData-1: t6HN5DM/uq+kiCfhAqfpGuVrifssUSD9UvA= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0bc5101-594d-4f97-d2f0-08de88c75cae X-MS-Exchange-CrossTenant-AuthSource: DU0PR10MB6828.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2026 10:31:36.9426 (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: 7A2MfInZpkBd+davxT+1zwyZkABf69uK9hhhpW8sXE2PhoeMBHXv0yhZOrI+oaCV43KjmMsAKrI7+nNcK4oyVK40wDO2O/+hhzUlSZT4v5Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU4PR10MB9808 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=jSfh9g3N; 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:c207::3 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..f31ea61f 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' if d.getVar('IMAGE_INITRD') else '' } \ ${WORKDIR}/imager.$BOMTYPE.json 2>/dev/null | \ bwrap \ --unshare-user \