From patchwork Mon Mar 23 10:31:24 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 4983 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:47 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oi1-f189.google.com (mail-oi1-f189.google.com [209.85.167.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 62NAVjx4030604 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 23 Mar 2026 11:31:46 +0100 Received: by mail-oi1-f189.google.com with SMTP id 5614622812f47-467dc3431cbsf14540177b6e.0 for ; Mon, 23 Mar 2026 03:31:46 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1774261900; cv=pass; d=google.com; s=arc-20240605; b=AAu5nVCSVKhYMt7Zs7t7jQftGRpxk2N62mPo9kppLs8TeQRujEgTK8A0FzizNArc9j g0BINVMc18gw22aeocFitxPpD/Jwrmp0qLdD93JGILvAC+wxJE+nkUVgnKkHGrBnD2RF bEaGrkbJxC4QmbAf+3P7nOChTi0CdXVqQEhQBpiHK8tbn12Dk+HKGDPC0bNtJ0z2AlNv 7MFpxIgTRfEKknRfSZaN69AbUVhMfsGydmwhftUb5mJuScn9w+9LpQ9AtpNu8glvXIMh yggu2iEXvHgWGCwO8glTaMUbx62OM1MQyg+te+2zmG1IBV41YmCXQ4qWPinROgL96T9r hCSQ== 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=DryvNWHe9xN724tf33h69XmSrc6UZZSsIBCZK2TOvD8=; fh=2xVDl7XmvbVhc4yUe/uqCIhVFRDs1gpxKcvNBZ4jRQ4=; b=OXJM3wvjRiDWWh8vc9y2APO7hHd5kDUMhRQheEjlBD3S0zuM9vzquOg18zhMbY6dkU c6yRATqPInFcKhWkhm9nWBYk26se1jc25xW9P5MvTOtEzsG+iVeDZvck/7J75JSQRQvV ZaBLwcEBoeb0XQv4x/zljNzG/i6DaOp5I+r9MPziNnhEUgh+K8fiABVUv03DwGJXplV0 +YTwgJfPRoJFHvGxJP2nekwiaomddX4YcIdSKQn9Q3OJ56q2P7R0dBh1FwgkvXGx/aV2 +3wHEEkuq3OBp0QT0UiIzU+X7m/f5r4/BLyaoC1mJEePFELD28YasbZXyqt0dsdp1zYS KOFg==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="C/qlVlX5"; 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=DryvNWHe9xN724tf33h69XmSrc6UZZSsIBCZK2TOvD8=; b=GeT58Ii8Cs5dCrSBfZleU6gkqtY3yCOyfnPqzCfRmLaB4f8EIWofKon4ET9gJUjyKw 0Eu23CG88FWoveh//SZ/6yXL6b8OL7EGJ/RVAVkdqbgdIqNGx9tq452kKRkkPgyZNDFR K8/msndtZoGEOiZZiTMiUzDD8PxDxrKmiRSRoldh84PgyIuFIBTFWy49ld0LtbPkrk+M 2VgjkHb5dae4VpnhPB3ufISLPTLFnaU3Vvy+ZSfeDg7vTYwd0ZzFxnzSP5UugpJ+qIFc d8BviAiXHhLIOqZRPEJkVdEYh7/mzH+k7zcBloUGwZ4aXDFVZVTyFzOzwhDaBdfopnZM G+hQ== 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=DryvNWHe9xN724tf33h69XmSrc6UZZSsIBCZK2TOvD8=; b=Y2zSwiCW2ATokO3qiHCG3BSfd7h6SzDRmOevchBONMayt764OUP7o60Sm1JG+29uOB +6f/mFxypSn4zc15fZWv2epZ8dbjcLzYjmVxTNgRBOJB/9R/C/+XNZRbb9kh/wbWUJkA r5dxWX/p3F+MfgRqjh2MWJj4eLwg2+cjKFt66A2nhWM2CMkbRl9eeWe0Hyb4mGIFTMDY 37p4dLOO1xBYFClMzO65w2bt8GFYVTECFIob04QpgcyvvKshBFkCelZn6TAbmEItHPjc i+jczC1Rhb1yPQgOok00Oe0GRqxp4mS/WFuvmTs4zEf6zcFujtRZanIpyTUX1NTXzirB XmGg== X-Forwarded-Encrypted: i=3; AJvYcCUhG84vuz8GXgnpNrKU549qobQJK6h5Ware+0UmJzPkoX83w8RdhnTkS+fE2TFwICZgLtOuYJY=@isar-build.org X-Gm-Message-State: AOJu0Yw2yEpW4M4yJAwO7WJTL1zqHYfW62VLQUeCDWRHHB78Pq4j32gc 7GUshyU/uOKO8+ErmyHuoiCuacym+lSlL7PKOG6cNbZ8oBQqaGNu0MwS X-Received: by 2002:a05:6820:1350:b0:662:fef7:4db9 with SMTP id 006d021491bc7-67c22bc6cdemr8964794eaf.5.1774261899766; Mon, 23 Mar 2026 03:31:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+Gf8VvlYtGqG0+jPQjbi6idklgZOGEx6bZhfvo4TGcGOQ==" Received: by 2002:a05:6820:827:b0:679:927b:fe1e with SMTP id 006d021491bc7-67c18d5dbb1ls1696823eaf.1.-pod-prod-02-us; Mon, 23 Mar 2026 03:31:38 -0700 (PDT) X-Received: by 2002:a05:6830:410f:b0:7d7:419a:7ac8 with SMTP id 46e09a7af769-7d7eaecf232mr8942417a34.15.1774261898826; Mon, 23 Mar 2026 03:31:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1774261898; cv=pass; d=google.com; s=arc-20240605; b=D40lUgi1BOhtjK04jTQWejxvcCeEOLbU5pfWZR5n6IFO3L+wHUpQyPWL3ju1fBHBFe 7rP5sfFVbbcV/R7nf+N9U8W+pB5IsdgCkLumykWngfvUrI+w3y/akKKvv4aYzpEfyCs1 8jHhUIt4isCcUvTadnWfRgTE6hoUknVjojtHMrSSs+8aKI68nvuG9Q98q9mztn41V6hc QjUQlNRmDMIKc/wZ2821wTunCK3HgBKYdmCIQzJZCOIe8trf4kmLQeksVLprsj5Tzs/b fDiDH+A9QoaFE3mMp6v7n5bpn5n2hM0GIXdYsgeZhD1ADUmO7tFiyKt3cGOpKZPr5xO3 +klg== 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=6tAkYvFw9ZtNrIaNmgxuI+nZsic6ou9SQ7yoEjsNGuI=; fh=MAR4IrvAhd3sEKpd2rMZmD1A3RZ1HgCziLJco30Znng=; b=MBlNH1n+aYHhnmBfQ9vTsdWyi7kv8sBTME1KhIQW0g9z59si7uh7b3HnFQSdaZsq85 rfWIdfkZiaaDkly8KYev89KKEkthKly+EcawgccWAYXKV0g0Ocy+gNZevarLsmC0F3yT +6KHydM1W6aazy8fUDs2W81pkCOKiTS+4fO6itY+3e5OwKTxr6632sknbah5SZfiJx27 KtE19AnD+FicDxREzIy+8CxouUulttGNHXr0Zl/m7+ZMXS0EqK2ETbrNCsMR0NgHBWlG vDoB5dwiiaBjiIhaCwjgoHAKF9G7pXZQapM04PvQ9g5A7EFTWxFpZM2fMZLvbG0pi6XB vN6g==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="C/qlVlX5"; 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.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2026 03:31:38 -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=A+2J33FnFUd9jSvCFHQTzZSCHIyoWlZzKwBewH6NSFGe4Nc7xwr8byOI40442YaX01YUFvRGp1Zsd0HURgfeaPe1sLpokRguk8h5Xq2Qt1FevzWdT3ovIveAikSyCsh+R2qL39bxxovEFLLzLcPl0wI0YeMgynwLYgCHxfHlSSVRiIGLe/sHAChCBR4J/miXRSwOAevosBrzaPnosU0gnvG02J5RJNJ8hZFhne0ySSBkkWRSkzSgvTsE5Y8+v4vxQB5h4e60NxkGIi2adpJYHZoaUBlYYSEh6w4CQxNnHPVBaisfRlrZrgrq1uT73+mJ+p8boF3qb125AZJDvf3qiA== 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=6tAkYvFw9ZtNrIaNmgxuI+nZsic6ou9SQ7yoEjsNGuI=; b=BpIC48jzVPUs7rfHvuQOO2A72CVFfaaIUS+55qAzdc06CSCzmGuHxuSE5hXRZES/70rNhctqAVUsSbKkUwwGcW8ZKWtV+5jWiOCaFtU9MoA9pKyUK+eRTe2W2Q4dayXmOjvRxBrMQCICq4544LCzTDbcLDnDzZeoL1FVxMw5WW+s9s+e7xVhGz+2ZP107rOo4BaOeJ64YkJcWLQ85HDnnFMvaPTm6HKv9QQP2E+SfD6rCDh/gBdWJmKM7e7rID8L7KxvMCEPLapEmYcunw8WZynZCvbAqFUTw5NejXrJ0rOdtIuSQq4wFk/uMFkFjstpDvV9QDOQ3Dv+eozekRrGjw== 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:36 +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 1/3] merge_wic_sbom: use local variable instead of global one Date: Mon, 23 Mar 2026 11:31:24 +0100 Message-ID: <20260323103126.962344-2-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: 8feb8d8d-5c50-46e1-aef3-08de88c75c31 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: TR4bjehU0V6GUvB96ew/LkR4yJ+COlxNi711pKsr9KxJ+giNFFLpCTO3RenplQ5DkUFv+ml5jkCOeQQQ2H99TIag1W3IEt+Tw6BZWu1YcanHftKE2VKfRAJ9/CLkOI+6Js9nmYfzdTmoeOcZBPYEW/UCThHc3G6tGKCqyMRSy2yMIvOWeNbKiOWSy2Acm9vEEWqVrxGWiI/M2GUGg9Vc1Dr4iPpxUOjVRisqMCAuDE1p+z1eKASiKlQQ08pDx2syvzGmIFakoSglt/wLQQXRpa/w+9bUTqPtlkE2t5HH2gr/MXkAZwA52i2VejRZeC5C07rrZveSKb99A6bOoK5EWdQP36Bt8Et8C0H8axOhz6YFOFFIHgZhsmPE7+2RqYMHLl3YZz6GqwTpVuC2jxNRyTnIXTIlSoeJiHJhmd9ZgyZcsyzPq11grbBvXLiFAXiduVZwf/sRCb/C6vbNwm+pSrEYj03e4TSrpP+GYxiktM6ZSIAYrepHZBo8aT+1tD6C+fLJP5u/B7RpKctNCjXU7X3pDVGCiiPqHaFzlUgRFEJ3jJBi2AZA74blqxuGfFNVDdgF8Fj/lVTqQ/zhQhlcctTW4Zl8QQpzD+56WCpD+hYubSmNE+SV7pmolU1SMCcqZFeV1cALo5mmDioy9tZ1vpvqh9JSfw7W9h1NxkeMrEVI6axSQ4r2iUizjMir/UkFso98VgApz5LwCRXIqLwkJXH8AT+tJN0MQHjznFRUQZo= 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: gk+iGh96XnKxVqzHhZT1m0jpYidsOAG60ZlrfLDnssMLq0vftKfwOp0tRIdPbP2+gmDO9aMwsj8dCdkiYhApVWL05cdXVKsSeFgOjzdYrdDuNTAkMlo/tjtZr1MHBzmKKTFWHOus4++wiH32rsTcHptHqGIoFC7JxQvrSTohWa3op+uKFThJcKQwr75v4+Batpw2eukJ00IqXhyl+59BjcTU1Ba+6XkvStWlGN8lpZ0lO5zVWxri9cKtwSVrkjxUbUetOcSnzC4Dc7nR+i8b24py64jCYHAf1Gih2jwq4rSHUjnHXtFiKHoK/hWAzMXF9Mn98P9IkGOQzguQMaUF2MEOWPrQkynKmHUN0pmDkz1UFueUMWygNOoCEk/FXrPVSSTYGF1ajbsugHE4q2zTGRKGJ/vbAPs/yW4PszPHZSl5oXt13/xeKOwfcOcZFPbeNpqMGRgfUZYxMpgyFo7JnN+hL+cmlalasE9Bvh+emew9GWSy6XoS0PhAREO6rtqBdjW4coGT1HiuSyHWbNeFCUN+OdVTf4ZRHUiGA9KRWYQhJbcbSsSFwCZ52l+EkJEMvsmEACcQzSuyMTyzPNUrxmVSFlNtYfky+RcVrtWjawPkPEVMH8dUthtBpYd97V4JsLzfDL6QraORW83/664rZWjNhbf5XSJxjTZxyojPa0UpoVqnQEItA//ahyoKz2DgxXL2dh95vUF8v/5xH8eewimuXAtPsRyVBj08m8LzJGP90ooRx/NavUC8+EH2rJOl4gCcV8CI186kHzVvtXoyGC8wmfdBfBt7qw0DH9P1KRFgkdAGY4u30yB9nSKXMxoCBUGrOWlfRRC/84YLPwHD7+30HNZIBdPItYB7IAq0NcQLmIZE83XCuMubwEQ8fjsGOT588KlWM3ip7DLUWzY+0piDqaklXd65hZ2ZRpQUvGIRfZp6tJHopHe/9Qhmy/ICrGYvTkgtGksKELiFafnsqaQ+6BWPsD/fsVmeAg3EaWby23mnjNcJEtw4Bwc1eTvA4LBMOCAPUD9VURMmqNsxo/Nm+/2tpBtKOi/p+j8bFOta4OQQAkhCizZhdLAoP62cPQ7vjk/5n/iopvELiCQUorJH+1lsb8vcbmspKT3EALWQxhWFosR72NY1PrwWQggYTY7dvVHt7SGNlJFXGx4UoBWFUJTVyztHOCL3StJv4CmDGs/s5sYZ+KvwNCaxfKy2/51SCbOnzkkXy5o1g8Oo/8b6+ScnyvlPc8dGLvkKoadq5sqhV1fa4ogBYQtq7DqjPIO563HiOenyFlgTccmLqCxGQ/M4cYy5avER9eBLOmv5b25lGsrsV4IsP0MC610TapIEgYkERcSATAWpux62IEpfKzX/cuiOK4ZO0R+ob895AEsMrP1tvbKKaQlPVTjN4G61e4k3vuH6EaoQTnjPCAqyMulxcp4v87rPErpN7JwIPoCdJfsxvuVA7cQYFCVEzDUjuRHguryEXQQs3IQM/Z/340Q99WDJO1VEWG/YgOCTKv678Vz34kxXaKMs1H9l4MtK0+SCXP1/hse78fJWi+Z1HqfjllckbGOqvjOa7X6xq62fI2DbehpPXse1ao8M+Bt1WbAJt3rSiIFYnMRUPksnnwjMWotXQg21af1uXjOa7+dellAj0FjdBYXGJMQuCP0ot/t1ss8R3wqD3ANnfGLksu9d2LyqCMyDdPeFRNlkBwvQG7Xf7WtihEC3SsYzmZFvtCK3P5ohgNFFxNHftZrGNEmPIB5NcjLu9rGHEtYLJLA+N6uZ4dD0PPf3o43dYsHasqIX X-MS-Exchange-AntiSpam-MessageData-1: EepdKdMlSwtTRFcwvL1UkEGdaFhiH9ewVcM= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8feb8d8d-5c50-46e1-aef3-08de88c75c31 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.1411 (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: CAuPDo8uisX7eyNRnJC1yVCmVIbY6C8U2gq0YLWQpigeQgYbF1PRwMu9raOlc4GiOwMLbDnVXRLi8hcIpbotXg42Fps+eEIcpu6aHqErsA4= 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="C/qlVlX5"; 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_H2,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?= The merge_wic_sbom function is called per SBOM type (spdx and cdx). While the function takes the type as first parameter and assigns it to a (local) variable, we previously used the parent variable to access the value. We now clean up this inconsistency. Signed-off-by: Felix Moessbauer --- meta/classes-recipe/imagetypes_wic.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes-recipe/imagetypes_wic.bbclass b/meta/classes-recipe/imagetypes_wic.bbclass index 6b82add3..5adea149 100644 --- a/meta/classes-recipe/imagetypes_wic.bbclass +++ b/meta/classes-recipe/imagetypes_wic.bbclass @@ -214,9 +214,9 @@ merge_wic_sbom() { TIMESTAMP=$(date --iso-8601=s -d @${SOURCE_DATE_EPOCH}) 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 \ - ${WORKDIR}/imager.${bomtype}.json 2>/dev/null | \ + cat ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.$BOMTYPE.json \ + ${DEPLOY_DIR_IMAGE}/${INITRD_DEPLOY_FILE}.$BOMTYPE.json \ + ${WORKDIR}/imager.$BOMTYPE.json 2>/dev/null | \ bwrap \ --unshare-user \ --unshare-pid \ @@ -227,5 +227,5 @@ merge_wic_sbom() { --cdx-serialnumber $sbom_document_uuid \ --spdx-namespace '${SBOM_SPDX_NAMESPACE_PREFIX}'-$sbom_document_uuid \ --timestamp $TIMESTAMP - -o - \ - > ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic.$bomtype.json + > ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic.$BOMTYPE.json }