From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7071266692367646720 X-Received: by 2002:adf:e342:0:b0:1f0:648f:c32b with SMTP id n2-20020adfe342000000b001f0648fc32bmr4377344wrj.204.1646407585549; Fri, 04 Mar 2022 07:26:25 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1f0b:b0:37b:e8d3:90a1 with SMTP id bd11-20020a05600c1f0b00b0037be8d390a1ls6278282wmb.0.canary-gmail; Fri, 04 Mar 2022 07:26:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJxOdz11v76BAj0KJ/WUZkOgF0P4t4rBjOJ/Ab/1dHMOCQ2x9bcCOwQlpeTExdk7Kgik/Qeu X-Received: by 2002:a05:600c:384e:b0:389:7355:a821 with SMTP id s14-20020a05600c384e00b003897355a821mr4684841wmr.141.1646407584669; Fri, 04 Mar 2022 07:26:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1646407584; cv=pass; d=google.com; s=arc-20160816; b=nDA18aqcC1JSsKDyiUD/nkz0sMn2rdvYmkeR93rtgPr04lT256em7i4L4/UcLflv9N mGSCmKFzBG06rRkXTVBSNBM3w0gZY7NbKxznx0b0FUhcWpvIXgXzfC7BrNOjuBpyGCHm 5RDAGVFQaC+WVGOOpdtCy0bZLDnL5XgxurMm5aEVQRG1QTQfmmBUIxFmHbV+AweX6DmE LZleQC4bAgfbiAMoDMmNsI1UNKzU6OnuTs9XplIfXT1ksB08ooGirDIQadiS+1xNV/F+ hFNITyiQD0KqAqhzXQEtKcBj8rZNny/PextebsvE9gtVqSXoe3HGsUizDF9y3xvv+7/k VjdQ== 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=/zaHYza/hdBvxjRp/3wD9ouymfScbNBmJ7zH5s1Xz30=; b=ES1sumC1GuqUgs7u4sHmK8b9I7aXw93BVCoOZEdv6BI34/H8/H6JNTUiJCaD6ZoumR zaHGmezB9dHMNsun6VSGAzvwcWLJbpZRD0JHUakx0vxW1k+87QLCGIqmw//ZEivHksps VZh1QTJDgVnF/e25czvteWBmzSsaUi9YETmqnx4QZW9YhK8oWfXBGSgKmBkcJDhZmXlK tUZa8IrR8LlqZlOdkECH4Bx5CJ1BzulobEz2LICq0N72cI59fBtkA3eo9wYxzONMyNoX KqHQoOGoDmL1JQ0OsYamJxyR2jfC1Qp24ogD2DLT1W1uTbPqcDtf3i/fC19PiGBmo0Bj imgg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=RwwfV6mw; 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:7e1a::624 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 EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20624.outbound.protection.outlook.com. [2a01:111:f400:7e1a::624]) by gmr-mx.google.com with ESMTPS id w15-20020a1cf60f000000b003497ca2a0f8si624895wmc.1.2022.03.04.07.26.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Mar 2022 07:26:24 -0800 (PST) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f400:7e1a::624 as permitted sender) client-ip=2a01:111:f400:7e1a::624; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=RwwfV6mw; 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:7e1a::624 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=IndLkMeTwscA+f4mC42jM5uKeXriP/yoH1wrVRJZ1NoaBXkQBEQngWoyPCm3f4wmxkyjTuQYI3U6bQALJE9grGDvQXPs7DBYY/kQwgMMu1z+uVNjJf3yR7IyPX+EOBsnNRtUUGIkFc7ZXDefaWJTWMFgdFNKGtuaLVXCja+tsX1ilwT+lTgdlqotnS7zk+7haz80b77tSekvZ2kGBVKd4rMKcFPrxOo/2S8WJ1GLV9LYnRaRm89RcvRj/vSYXeKbF5jyMx+ok/hE+Le18bqg8G4HZACcM8McyBPENd0YUyTuV1pt7dG7ow4ae636NmJwMhSl+qlkpj5c7abDZl/RzQ== 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=/zaHYza/hdBvxjRp/3wD9ouymfScbNBmJ7zH5s1Xz30=; b=DGgd3xPqpppaM3ZnSpSA9FGEp+wKoeLSmyYyQbqxvMkYLjC26tVB7JAgliefktGqKBdoWYc00tXfc97hRUVNOylh72pGxHccieiGdGj+e6HOYFFD7MON59S30723na0of+jEYCPvw4gYYffv9gIHmh2Z79klESEiqp4oGAmJn9C+xt7SSsvT9WIig0KuMku52+M26uaVQdiboqpWAicprAz4CFs3ZOVMNNyE8CRANimemg6t7FK2c+nCpV532KIFDO8C9sZMcB8zO+xyptHrI2MK7cD2vNDlnAO5+gnnNKixxyXgSLpXql57AMcwTsBvavtJ0COTH1cCuRLPjQ2FMQ== 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=/zaHYza/hdBvxjRp/3wD9ouymfScbNBmJ7zH5s1Xz30=; b=RwwfV6mwMHaP4zNgGTwxrJcp4lY2VR/GTeAQ4KgOv02eHoMZPkPXlkH3fGSq7whqFHkB0ePpqF3OPM9pO6ohDDXP0YRQnGJhUZFrHsPkWvF/9sxR/GF78ZxxpUlmcauyM7bNepa4QikFTT6jUcr8lk3ft5nzEBgsptbwbAgnweYScIWwmw76Pgs8Bbh0yQugwQ7VgTqvDYEYcFELZSh/rzlVPkQW7ZElO6snBB2HzjRbr6hFa8It6pHdKlf/eq3q7rW7oedlt1MrPKYSNra2JTULqn9UMMTkp7LAvV0DXlHbiYAz8dWVlWa6ERZbPWFIEE1wEmcXPYrvUKVDfQ2KSg== Received: from SV0P279CA0040.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::9) by VI1PR10MB2510.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:7e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.26; Fri, 4 Mar 2022 15:26:23 +0000 Received: from HE1EUR01FT054.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::5c) by SV0P279CA0040.outlook.office365.com (2603:10a6:f10:13::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5038.14 via Frontend Transport; Fri, 4 Mar 2022 15:26:22 +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 HE1EUR01FT054.mail.protection.outlook.com (10.152.1.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5038.14 via Frontend Transport; Fri, 4 Mar 2022 15:26:22 +0000 Received: from DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) 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.18; Fri, 4 Mar 2022 16:26:22 +0100 Received: from felix-dev.test (139.21.146.184) by DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Fri, 4 Mar 2022 16:26:21 +0100 From: Felix Moessbauer To: CC: , , , Felix Moessbauer Subject: [PATCH 2/4] Add ISAR version of biosplusefi WIC plugin Date: Fri, 4 Mar 2022 16:25:51 +0100 Message-ID: <20220304152553.584534-3-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220304152553.584534-1-felix.moessbauer@siemens.com> References: <20220304152553.584534-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.184] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC8A1A.ad011.siemens.net (139.25.226.107) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a3394dbf-43ce-43b1-7e90-08d9fdf356ef X-MS-TrafficTypeDiagnostic: VI1PR10MB2510: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: PnZXcYZjgvdEZ39Yam8yx1EwOKE3JKoF4rIm37p74kQqv94RwJs1Gfq+1pbhQ3Aq0uNKNjFezHCQb0ACZp+S8DbgTREQQsZi2It6CKPXFTeJmQ4PzNqbyD/Sfy98ZLIK37nsBKB1PpoMyCwjgj/oBgDQeO0PHvrsCWjE0Cc+R6GGf5tOyCYJu3gNsIAeKmy1yLgdD8kzhqLNTaCbjK36w/+0jLeJTVsYs1PnllAf19ZrIu9aXcwogCd7BUvgDagPqM2tdTFl+SsobRtWdOEoCpuIp4eV4PJ26ItPLo62rGLyPBNfg4LT4nCjApiKh/vyuYgoqFJvypLrF8XwTTfaZ+KgXScHFEe1FtxsHH5mAMxdNGyQa7/czLbckJE/RSJsRehT7tPwmf4069avds8bkrPLCKgesHRH9XmempMVxDlG6AEJaYOuKBpjWEZmtM6fVg6b7IhHKLmVpnkuGGvrPusfsL+rf4k3GV0wMY0F5yf4+ONc5qDFAMVR1D57GzthWRuQejWdZC64aLT3EjOe+a8l/hf7a9XskkAUe2UqUFNzAB04whFx6vGOksMmPWdRnTtKqgMiyRRvK6bij5AX9cwhC3pjLDYRX8r0Q+8SSlVnaPSh7jPz2ebWnte9DGk40AGekxXo7kF2lAdO2qpd5gAxDS2bZ+Dt1b30J+Qw9a0vDRjZz/9xA0HnqIe4VJnNcIe1IofK1xvlbnzUofULUSYemY9d+OAIPj7Sm8Yqnuc= 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)(40470700004)(36840700001)(46966006)(336012)(86362001)(186003)(956004)(1076003)(107886003)(36756003)(2616005)(36860700001)(8936002)(44832011)(82960400001)(5660300002)(26005)(82310400004)(4326008)(356005)(70586007)(40460700003)(70206006)(83380400001)(16526019)(8676002)(54906003)(508600001)(2906002)(81166007)(6666004)(6916009)(316002)(47076005)(2004002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2022 15:26:22.6270 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a3394dbf-43ce-43b1-7e90-08d9fdf356ef 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: HE1EUR01FT054.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB2510 X-TUID: Z2rTz8BrT6cO 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 --- .../source/bootimg-biosplusefi-isar.py | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 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..6bb15cd9 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-biosplusefi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-biosplusefi-isar.py @@ -1,22 +1,14 @@ # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. +# Imported from openembedded-core # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# SPDX-License-Identifier: GPL-2.0-only # # DESCRIPTION -# This implements the 'bootimg-biosplusefi' source plugin class for 'wic' +# This implements the 'bootimg-biosplusefi-isar' source plugin class for 'wic' # # AUTHORS # William Bourque +# Felix Moessbauer import types @@ -75,10 +67,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 +98,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