From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7071266692367646720 X-Received: by 2002:a5d:64c2:0:b0:203:951c:17f2 with SMTP id f2-20020a5d64c2000000b00203951c17f2mr23669441wri.518.1647967552143; Tue, 22 Mar 2022 09:45:52 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:6d8d:0:b0:203:dadb:4a0c with SMTP id l13-20020a5d6d8d000000b00203dadb4a0cls968504wrs.1.gmail; Tue, 22 Mar 2022 09:45:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXDb0LG+gdxhHmx1GGZ/ZcfpVlGgSGbUl0kSFeJLzR8ZVpLsoesfXQG7Mf2vIJVHNIAOUR X-Received: by 2002:a5d:51c5:0:b0:203:decf:8fbf with SMTP id n5-20020a5d51c5000000b00203decf8fbfmr22796222wrv.440.1647967551322; Tue, 22 Mar 2022 09:45:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1647967551; cv=pass; d=google.com; s=arc-20160816; b=EJLmDadXj6O8ybBq6kpdI/BLpRKtOnP57Cn8EX6zT+0PSfI6LKN5e2fbrjAn/Rul8K kscStyWoZC8kBm/6m6YQNw+zLug1JTbubHiaGKm+PHey6FPzqi3y2FHM5hs9+vM9tZfq RBKeE4Ty8ecWbNiFXajPi+D2V7t7cntdbNsqT4re/DFChBp7SISDTzXfEKPl2cVEpq1p pdA3nmZWLlAehVO6VZDVxRaWRZgWQ8xWM/lWONhyRnjrDAS2EhZYhC8TAYb7YsLdOfZL JT1UDOpe8eIdGBmdNBxmJ6lPaAWbxNoAvKisHZn9EFDQy89gbo8moPe7MPoGXY1Ioci4 zHZQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=JISH+WCWlQedf1/I60zgKnMiDHRTUE3Sgh5WLgyTDkA=; b=Z8BPAvGkoH5YCCIgJl9euEZoJkZmF//+VGqGUrQ2ZiLvb/mzL+WvMbJmcbfzsY+T65 ijKFBrHz0s4mlHeA7cX7/dBUCKac/Srzphqdt7fe5BQiuwMoumnsw0XdAE2tE/N/nzMg Zz37pei7yGkINDXn4HVgCtVltV6LzVwoLUTbARMXR9XRhw0rvsamIug82MZJDW2/yfh+ +6u0FNizq+TCC1xJN6NaHxpI9+smX3I9rB5ga0Qoo0fEw9N1PIpiUIHEJxIoczDidcOW ocgjQiCBBFAHw9JIHirgfx47KKXI7AmpYKtldi2VyvEqC0KNMCoKmE9hhG7iaRTfUSYI 5blg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=LlWA6EbD; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:fe1f::602 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0602.outbound.protection.outlook.com. [2a01:111:f400:fe1f::602]) by gmr-mx.google.com with ESMTPS id o13-20020a05600002cd00b002041c300239si330703wry.2.2022.03.22.09.45.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Mar 2022 09:45:51 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:fe1f::602 as permitted sender) client-ip=2a01:111:f400:fe1f::602; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=LlWA6EbD; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:fe1f::602 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Okx8kXtGxQcyUWlSjDnZS1K3bN9NccWwVGT9J0JBFmByxXa5sDa82QLJFiqPBJcS2hvEARkNLEqy+DtsogkSrNGAHdHFxBVXoRZXmxTrQ+EailiR6caV+TIBoreb/UJOkXWP0PgIVsks4oaAr8hocCM+TX02jntS45hvam8sb2VgsVD4xClzIaQ+hgwUwzuSMS2e2yGa40p99b7d0USlnXTfHLACPVdcdgPsjC+YomzZiygeTfFlPI8ewUB4ZTe+pobpL2H5U55/VuJKpAwKvEqJsVy3xANtO94kPwMoRYPy2MgkBOwUNAKJF/6bW5iyTLjOwyeeTrgarbyCF57XiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=JISH+WCWlQedf1/I60zgKnMiDHRTUE3Sgh5WLgyTDkA=; b=e4q14CaltWM/8rsU3cb2qB+EebgC4RjRXSUslBwErW1v5D5EuISvEahmRuoKIN1gIqH5pFpzkRwCuktFpgN+o+32FkfYrIIlErkVKdLiIjgPSOXbixDjL2UyJ4hltoWK0aEHX2X/to53aoMq/9tnLB3EOEj34F1EduhDF9Gh1C6o9LoR+ekRlFG0Mg6x9MSHFJgpPZ6Ha3II0a+UzwkmFyCnoA5x84qT5d9lJmLrmfX3iXPy0uMo9rslhE5e9aBDavVBpx3SSLD8XbiLDixrWgEJ9m6MGVmlKD4jczk4C/5Ie/KMIdHuf9VIN15tTqA9U4U2oecA4bGznmjgxX3jpg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.72) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JISH+WCWlQedf1/I60zgKnMiDHRTUE3Sgh5WLgyTDkA=; b=LlWA6EbD7I+sHMM12qXR3vwhxqYb7BIIpWQNBHGoRudbaTJgLFKdGguialkQk/9GGj8T6CqZzvXVo0cFt3HzKjXCEviDag/Afwd7TrNbi/BmO7PC3EGu6HQpadsK++3zYcJ9Mxovm8Ba/nItt4guVfPE34DPng4pUmeYwjMjJ2FrEsUJTMZ1nBoYqAVKcWk3zt2NWTde/BTjtr9sKvN6Ch6h6abaS7pBYoKspKCEES8AHwi+mgvnWIwfJJhF2y2+Eruckf044snZAjaZMPv79wiyS5/FqhfOnzBHWJZBkHmQffV8oFWYjXmKph+cWw7SfWACFynNiC3fI2ZZ4+odBA== Received: from SV0P279CA0005.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:11::10) by VI1PR1001MB0973.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:800:6f::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.18; Tue, 22 Mar 2022 16:45:50 +0000 Received: from HE1EUR01FT013.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:11:cafe::59) by SV0P279CA0005.outlook.office365.com (2603:10a6:f10:11::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.23 via Frontend Transport; Tue, 22 Mar 2022 16:45:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.72) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.72 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.72; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.72) by HE1EUR01FT013.mail.protection.outlook.com (10.152.0.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5081.15 via Frontend Transport; Tue, 22 Mar 2022 16:45:49 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SMA.ad011.siemens.net (194.138.21.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 22 Mar 2022 17:45:48 +0100 Received: from felix-dev.test (139.21.146.185) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Tue, 22 Mar 2022 17:45:48 +0100 From: Felix Moessbauer To: CC: , , , , Felix Moessbauer Subject: [PATCH v3 2/7] Add ISAR version of biosplusefi WIC plugin Date: Tue, 22 Mar 2022 17:45:20 +0100 Message-ID: <20220322164525.3950970-3-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220322164525.3950970-1-felix.moessbauer@siemens.com> References: <20220322164525.3950970-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: felix.moessbauer@siemens.com X-Originating-IP: [139.21.146.185] X-ClientProxiedBy: DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--10.092600-8.000000 X-TMASE-MatchedRID: eMziMEFr0/F4FTWzKCjc1ak6qOsVfipQhITmAPI2KIqAwosDBeuPwWWf aLPCK8n6XV0AWGPq5jyD3F7iC1Qm2jbFTipGrMywVNzhnQBnMrp1iVo4TLgcHMeuFL5UpINxNkk nTRICN7A4WKr1PmPdtaGnrT7qNXMhuySd4CQzkyyAUraeY8ICeR8TzIzimOwPur1QVFMnSQrEQd G7H66TyH4gKq42LRYkLYbrCZIK/79VgTGuMXAzEGjFyuOAMdFKs000I+al9L1+3BndfXUhXQ== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--10.092600-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 7AD75B7201CDB128D2CD0EDF6B08F62293BAD89C7CA584287AAA9F2AC9113A2C2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 602a81ff-fb19-4416-955f-08da0c236b9b X-MS-TrafficTypeDiagnostic: VI1PR1001MB0973:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W7dYvmjpgw/dclocx6ZrB8f9l8nmr0ALOVoRsu1lHdDUYSDO7v6IboXM2AtuEKwj5ploM6qIUrvizADYYLmsIuj44vEBcewmZYZ85rhxUZ9L3Q+w6DGqnM7t1BS3qHHwPb2M7i4WXr2mv8DsFfqUxousR65AgSDJ+FeeKshXZJPSIONr40MX7kOQ6gGC57zpbvkN+f/oTtP495CWmdVdfcmRr+2Zj8NE5bPZIGnhWyYL1DybCOupgxQwWMiWjJ5mzvRAUO6NMoirzP5zRV29R9RGHyISxx9XucFttRJSkehSo4XZbrYmKaJ/c24QKLsEapvd/rH22GN+USPMUYoamSMkTCGdIiJfAr0dg4SBnAGA4PgBoNrBecwyXkYrJuUY9/pablju2NoQkYHktml9pstg2wF9caRvAUt78kbIqw/Q0OxuzCjzR6i4/dbJskZbPje/fSN+xzO9AARlgzai21GiUGTTjBWzp+P2ofVj2EYdqzR45w8y6PzlgfxSrCQEz3nnnEu1eoP8a99mZOhB9uogmQ6lcpfVWslzHVDV2VvHNaPSugyT0n/JDed3D82+nGPnCOU0KmGcDC3F7wB7hjDqxilLI8lMdE4janPrm3HjGo/FEDuIae07pCeaCDl1qw7b/Q61y5MZNLjSCB5krNNnAlLiRHYjiyTsVMI3UUk/xsQwc75H/zrlPAFF+zy/JZ/K3OCkwgtUGr/jjGAG/w== X-Forefront-Antispam-Report: CIP:194.138.21.72;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(46966006)(40470700004)(86362001)(336012)(2906002)(47076005)(6666004)(6916009)(316002)(4326008)(36756003)(70586007)(70206006)(8676002)(54906003)(1076003)(82960400001)(356005)(36860700001)(508600001)(8936002)(5660300002)(44832011)(82310400004)(40460700003)(2616005)(186003)(956004)(83380400001)(16526019)(81166007)(107886003)(26005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2022 16:45:49.4156 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 602a81ff-fb19-4416-955f-08da0c236b9b X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.72];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT013.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR1001MB0973 X-TUID: 0Fv0Wvw1+jdL This patch adds support to create a disk image that works with both EFI and legacy bios. The biosplusefi-isar is based on the original biosplusefi WIC plugin that internally calls the bootimg-pcbios and bootimg-efi. By that, code duplication can be avoided. The generated image can be booted with EFI or legacy pcbios. Signed-off-by: Felix Moessbauer --- .../lib/wic/plugins/source/bootimg-biosplusefi-isar.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-biosplusefi-isar.py b/meta/scripts/lib/wic/plugins/source/bootimg-biosplusefi-isar.py index 5bd73906..fb6b7fcc 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-biosplusefi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-biosplusefi-isar.py @@ -75,10 +75,10 @@ class BootimgBiosPlusEFIPlugin(SourcePlugin): --ondisk sda --label os_boot --active --align 1024 --use-uuid """ - name = 'bootimg-biosplusefi' + name = 'bootimg-biosplusefi-isar' - __PCBIOS_MODULE_NAME = "bootimg-pcbios" - __EFI_MODULE_NAME = "bootimg-efi" + __PCBIOS_MODULE_NAME = "bootimg-pcbios-isar" + __EFI_MODULE_NAME = "bootimg-efi-isar" __imgEFIObj = None __imgBiosObj = None @@ -106,7 +106,7 @@ class BootimgBiosPlusEFIPlugin(SourcePlugin): loader = SourceFileLoader(cls.__PCBIOS_MODULE_NAME, modulePath) mod = types.ModuleType(loader.name) loader.exec_module(mod) - cls.__imgBiosObj = mod.BootimgPcbiosPlugin() + cls.__imgBiosObj = mod.BootimgPcbiosIsarPlugin() # Import bootimg-efi (class name "BootimgEFIPlugin") modulePath = os.path.join(os.path.dirname(os.path.realpath(__file__)), -- 2.30.2