From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7245237195775148032 X-Received: by 2002:a2e:8859:0:b0:2b4:48c5:5261 with SMTP id z25-20020a2e8859000000b002b448c55261mr1604466ljj.35.1686913239171; Fri, 16 Jun 2023 04:00:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:220c:b0:2b4:4777:c06a with SMTP id y12-20020a05651c220c00b002b44777c06als568277ljq.0.-pod-prod-05-eu; Fri, 16 Jun 2023 04:00:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4lJMbvOrCaD4B0Otl7QqC/jmKg4o8ZAzjXIxIt5vLjc2l1z7O5mN8TrWpS+rnB59tlR6Sx X-Received: by 2002:a2e:9808:0:b0:2b4:4a0b:8fb8 with SMTP id a8-20020a2e9808000000b002b44a0b8fb8mr1435502ljj.53.1686913237502; Fri, 16 Jun 2023 04:00:37 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1686913237; cv=pass; d=google.com; s=arc-20160816; b=yLGQrHbcsIa2kN9GV+K69y6fIrBHU5gW0HxsTAUwjALE77ks4PFvs5VCdWnmMYjovH N+g7Vpxh5AEsdIPDRcWN5gZO9ZeowhJhrlH7qP+xeuEbYuUubf9KJzMuiubT8TTz5caH 6ocVfV6A6WLoRKi+A+idPU/3vjpfK+A7HUsbgADEyveIXY8OpIGJb5iQPCf2vr0s4ptW RWouH6qGE5+8dYROL8MseLTyGGCZUVa9h/eT33xqcI/szz2W7LDueaeisLAD4IYfrTyg E5s4WMvrUpi120Y6U0LpdX4yT7/AG6jL5+wz9NcBA9Nu8uspCcV1zcUZyEJEUr4rr9Zg UAAg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=OoWcyPfQRIDWNP3zuCMFvqlxutIUvjlE42BVYDyRsgk=; b=XkTQ+sSPYYkJk3UMYlMjMl0xVNTb2jI52q90nBVJXarGQa8js+pQlyskfS5wIBysAg dLbROOJY+vgMAr0mAnDIW6ThSoCVVFqlwKN2BAi+NhjAuAOLK9dZfXPr/ItcDAU0DRKs I8gvTr73+CEP7ET08LmVH3TtGMBi76tbvabD6DO31vD6OJFNV7Fgk/2AgiSsSZFCuxLQ g06D7pdbSv4D+YxYohzS357It/xKXZynGeLta9ksRZ21QAy26N3Xo/wFEWBnyfGVWFEN zg/Cna7UfLims7j6mFSA6aq2A2dEE3GLYAonC4jHXRrWq+M/UsaJM+cECP8Suq0NXD+O vhqA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Lo3UfZ4a; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe1f::622 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0622.outbound.protection.outlook.com. [2a01:111:f400:fe1f::622]) by gmr-mx.google.com with ESMTPS id i22-20020a2e8656000000b002a77f4969bdsi1230718ljj.5.2023.06.16.04.00.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Jun 2023 04:00:37 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe1f::622 as permitted sender) client-ip=2a01:111:f400:fe1f::622; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Lo3UfZ4a; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe1f::622 as permitted sender) smtp.mailfrom=henning.schild@siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nBp/RC/N0CiREQs9Hd01IZ0YYtSHWD7T0+AZfM8ASv4F2Ww4Yz3hGKdx0eSR1z1YqppX0KaU8Cw9/VK6roJWTci/DJE2oFsSHfh+Ucx+jDbZvXh9yhWzxY8CTnyu3AbIEMGj3OX0ojMV+PrFqNIushR3YeVaTp7skvhfahuSrA0ioeXXE4bW3D0zSId/zfIFCv0Cgcgho0ICtzveVLcP121NzYiJjCE77NzCYynzXWOFg6PfI4GqFlrCL4Yg2XMu8dcoWEVoqUAtMsiBXG6aXGy3dDeaFfYnEQJH4H+dfJIVXD1YkG73oq5H4JAalFEBgHiOiTfMzk7e7moOZ4cEcg== 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=OoWcyPfQRIDWNP3zuCMFvqlxutIUvjlE42BVYDyRsgk=; b=Iz0lwuJKuEFdMY5r6Kjw5cvw0jNh9KEsflJqksfgYahLa9kLpY2Gzo6uYONsy00/F1dWd0Gq1Wwr80nPmSKHVSm1+RAbYA+qVxSHz6IlwgDIiSKKwQ+KM/x9xFBG/mGcSn3sPTeOrG/TO872UdzBo7MMYAHGK2y7sIxQKqUEXac6An+kMwdyb2Mz06Mc6JAFRHG5L2AEq+r0biK3Xl2E1aKeaCOODxNGWDUqtGhVztdjd3PxI1bMXEErzGsbQbXW7dxHCjnCq3AtsA110eF9c+h9kZOWAXKngIMphfS98syPcQ5CRTPAodEneXpOF9QsbM6JczkJEFEHDl3LvT7sWA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.75) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=reject sp=reject 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=OoWcyPfQRIDWNP3zuCMFvqlxutIUvjlE42BVYDyRsgk=; b=Lo3UfZ4aPsH7klr/zUoN+NQ73ktj9zItjCiMLx4uunNvHNquf2xu3tbBn29o+I/ONg0JOZmJk4kOQ+h5X86B70stqa4OK4ynojbEMEWjVX06twS3i7pmmgoSy301elr7IgtyEKC6lwz5bcRSQ4yMSuj9UwQ5JmpEBbxLccr1ioGwOj6L/7cy1KG3DYnYThgcnK/Qr5s90KY61Cc/lJZqo5k2g+siCo+6lr6Ko+3QWPB6TI5zkjIKZBPM77MioAoms8qpSuCCPuAzzTtLSQ4a2ovPdPNQrDP/Q8AOUGieiIg5hiX67QWeXTuEgphDebYmsgU4J8eBDdCS2WItp1T7lg== Received: from BE1P281CA0454.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:7f::29) by AS8PR10MB6055.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:570::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.35; Fri, 16 Jun 2023 11:00:35 +0000 Received: from VE1EUR01FT102.eop-EUR01.prod.protection.outlook.com (2603:10a6:b10:7f:cafe::d0) by BE1P281CA0454.outlook.office365.com (2603:10a6:b10:7f::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.19 via Frontend Transport; Fri, 16 Jun 2023 11:00:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.75) 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.75 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.75; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.75) by VE1EUR01FT102.mail.protection.outlook.com (10.152.3.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.25 via Frontend Transport; Fri, 16 Jun 2023 11:00:35 +0000 Received: from DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) by DEMCHDC8VRA.ad011.siemens.net (194.138.21.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.25; Fri, 16 Jun 2023 13:00:35 +0200 Received: from md1za8fc.ppmd.siemens.net (139.25.69.222) by DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.25; Fri, 16 Jun 2023 13:00:35 +0200 From: Henning Schild To: CC: Felix Moessbauer , Adriaan Schmidt , Henning Schild , Clara Kowalsky Subject: [PATCH] vm-img: move templates from meta-isar to meta again Date: Fri, 16 Jun 2023 13:00:24 +0200 Message-ID: <20230616110024.24291-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: henning.schild@siemens.com X-Originating-IP: [139.25.69.222] X-ClientProxiedBy: DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) To DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VE1EUR01FT102:EE_|AS8PR10MB6055:EE_ X-MS-Office365-Filtering-Correlation-Id: 8eaf7b52-2aa2-47b6-fae1-08db6e58e991 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n0/PwZHzvNL5sWiMljF6d0ce6TOiejD4junZSMSRfzBkjde5umpuQ0vEAjJFj9fxBVWfF7ZiPy45a2T76t6h9bR+tIKpHyE5tAaj4s2e23Ue6Lomygd6qLGnGKHc2mBZ1Tx6CblJeLs0ay2aSQzOuPFEczrv2xiq6AJKE7RMZI+yC8Cv/t/aCoaP7hVf4X8Sg+bAxUa7fDCOooF5EcYEHj5dCOIuHkl70RORw719MCtBqNzwU120FBI1SbnAAxrpl9zIPAJQEPjO37fQgsGmiv59XSABeVRJ0fJODKYm8Y9f7wTFrhcUrVYYYH4xD8DI7oG16TIVkvSSWtcdbPnJJ8CznF1zazq1MgVefEfsNTQtibSEwu79znuGniqC8FthSJ6j7v4Gxm3wt5aa89jBo7EgixiPfZlRvL941pGe1kl/ph5feSY5z0EXEroXZqRx5zjLPbao2q7gm6wHd/nltlwJWdKvJEUbUzC2TQG0/qvDeCgSypMBpGkus92qWWL7G937jvLQN5guPtWwX36fvlKtync/LT3GgaNVQb3sgSR5lJLjMjG3ldvQ8hcfdjHd8StNyqGJRDNTgyh53+XzFjvGAn0KbPmmaEj0vem0wvvFsB96G5zm7U4CI0bDCkolCs1SL604xATtuwsJgCM9e9g85dHYiW3SFOtU1YsJldoVybuL3zdK2gNR/Xd8yOW3tzFKOz5Rptqu1z7KsbJWdjM81hGr5OXDnnXgWNJ0KgdxrM2R69Oz3JK7NCeomaxE3vmAMFRpm8vCwoJJLM3ZpA== X-Forefront-Antispam-Report: CIP:194.138.21.75;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(396003)(136003)(346002)(376002)(39860400002)(451199021)(46966006)(40470700004)(36840700001)(16526019)(107886003)(40460700003)(6666004)(83380400001)(36756003)(47076005)(336012)(956004)(82960400001)(2616005)(36860700001)(82310400005)(356005)(81166007)(82740400003)(1076003)(26005)(86362001)(40480700001)(186003)(2906002)(8676002)(54906003)(5660300002)(316002)(44832011)(41300700001)(8936002)(6916009)(4326008)(70586007)(70206006)(478600001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 11:00:35.7424 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8eaf7b52-2aa2-47b6-fae1-08db6e58e991 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.75];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT102.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB6055 X-TUID: +qwomUhVLa9g The vm image class needs these templates to work in cases where people do not have their own copies in their layers. Having them in meta-isar means that layers using the class with the default templates would have to use that example layer as well. Fixes: 3ac61204e1ed ("replace custom OVA logic with imagetype logic") Signed-off-by: Henning Schild Reported-by: Clara Kowalsky --- meta/classes/.imagetypes_vm.bbclass.swn | Bin 0 -> 16384 bytes meta/classes/imagetypes_vm.bbclass | 1 + .../virtualbox/vm-img-virtualbox.ovf.tmpl | 0 .../images/vmware/vm-img-vmware.ovf.tmpl | 0 4 files changed, 1 insertion(+) create mode 100644 meta/classes/.imagetypes_vm.bbclass.swn rename {meta-isar => meta}/recipes-core/images/virtualbox/vm-img-virtualbox.ovf.tmpl (100%) rename {meta-isar => meta}/recipes-core/images/vmware/vm-img-vmware.ovf.tmpl (100%) diff --git a/meta/classes/.imagetypes_vm.bbclass.swn b/meta/classes/.imagetypes_vm.bbclass.swn new file mode 100644 index 0000000000000000000000000000000000000000..88cdc4380ce74795279686cd6bb71c428157ecf9 GIT binary patch literal 16384 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 TO^EmUp>?JczV|%lr`3M}a;f;3 literal 0 HcmV?d00001 diff --git a/meta/classes/imagetypes_vm.bbclass b/meta/classes/imagetypes_vm.bbclass index 41f2af067331..cd56d31b0fe0 100644 --- a/meta/classes/imagetypes_vm.bbclass +++ b/meta/classes/imagetypes_vm.bbclass @@ -6,6 +6,7 @@ inherit buildchroot +FILESEXTRAPATHS:prepend = "${LAYERDIR_core}/recipes-core/images:" OVF_TEMPLATE_FILE ?= "vm-img-virtualbox.ovf.tmpl" IMAGE_SRC_URI:ova = "file://${OVF_TEMPLATE_FILE}" diff --git a/meta-isar/recipes-core/images/virtualbox/vm-img-virtualbox.ovf.tmpl b/meta/recipes-core/images/virtualbox/vm-img-virtualbox.ovf.tmpl similarity index 100% rename from meta-isar/recipes-core/images/virtualbox/vm-img-virtualbox.ovf.tmpl rename to meta/recipes-core/images/virtualbox/vm-img-virtualbox.ovf.tmpl diff --git a/meta-isar/recipes-core/images/vmware/vm-img-vmware.ovf.tmpl b/meta/recipes-core/images/vmware/vm-img-vmware.ovf.tmpl similarity index 100% rename from meta-isar/recipes-core/images/vmware/vm-img-vmware.ovf.tmpl rename to meta/recipes-core/images/vmware/vm-img-vmware.ovf.tmpl -- 2.39.3