From patchwork Fri Jun 16 11:06:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2898 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 16 Jun 2023 13:06:35 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f55.google.com (mail-wm1-f55.google.com [209.85.128.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 35GB6Y8p032380 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Jun 2023 13:06:34 +0200 Received: by mail-wm1-f55.google.com with SMTP id 5b1f17b1804b1-3f81f4a7596sf2924495e9.1; Fri, 16 Jun 2023 04:06:34 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1686913589; cv=pass; d=google.com; s=arc-20160816; b=wDXrL4hSwV3hCmpCe04s9l0FFTI8suBzQ4N6Y5nHanfUKBdWJZzWMWbx45f+KfHn9P Is7pGDo1dLpmZbDYo6Mfb4X/L1wv/LGuUdtNnglQQZ5J99Flf+ggNcc4ia7Yxg8yH7al a7PfwkVRGcfBzFHe8hrXRy7m6mr0sryDuuvLneMXTXc500gh5iYbZbhU6yhd3IOot6o+ HvKg47skxMD+AWvJ22igVdsrKT+znv4FaefFTf0T8xW9zJ2rYZPR/3XBPDRV/gs7yphL Cgs04WM94x5jAiyY1F5S94OiGZSAfQzUdzzZz6+bHgp/tuDJHpU5h+eNGGdyaZRqzZCt 5NFQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:mime-version:message-id :date:subject:cc:to:from:dkim-signature; bh=dxOAhYsMfqj7314FjsZjBjthaHV2g59agKZHujn9cYQ=; b=064RQS+7/YkylsqsNkBVxfBMl+e91jdPW8fWTrphn6H6LI1/LlfhKZDwpDzXK3UAiB eJ6c8qLhRkadcUtxHWm4N84RR9RBQ+84l1/aPm4KUhnp/81PKjewUk8K+4alvA+hQYD0 IGlI0GoFv2vZ3SZS6UCj+FtIZZB6nTF2LEr613z0YVwXbUA0fc1/+o5WLb7FJh0NDw4l faCAXC/EcbW6WGlZTaFebagXx9PVdgQP4vdyrMhBLtH/whz4KnALwGgCjh4on7mhCqv9 g/FKtrEAJqjlop5t+tKoscYZEjL1DA/0WVgC4jx5kqJ2tgxfgbXiAITzPCLCgrJl6bSh a8RA== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=rlulQGQl; 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:fe0c::62e as permitted sender) smtp.mailfrom=henning.schild@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=20221208; t=1686913589; x=1689505589; 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 :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dxOAhYsMfqj7314FjsZjBjthaHV2g59agKZHujn9cYQ=; b=YY4JqUPvVaDw3JjUA8nW+K7xOLDck3FRh9AdqSexNQUNiX+jkqbPCo1x98ijWXqn1o ydP6n5mJZwdP/0Ze3xSOT9g+3IaruiqTFFS3c1Fzh57TOLOTF3xVp6tRBDGWmGjddZVb 4ih+zHFE+RFfYG4zllEeZNf5/dpBx0ovjsacsxjy/TZLj/eG0TZFG8hI20V/s7L4zbTW lFqq3L354QK6z7b4b5V7V5p81nmILMKJgPr5X5+ZNmMFRlsY8BdA2VPhwgRpgIQoSDDF sjNOR+pEiSmuJQwFMGQj1R7hlkYR1OpAvzGhLpmgsgtXlkelaL9m6UqNmfIBg5/qOeJq 12ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686913589; x=1689505589; 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 :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=dxOAhYsMfqj7314FjsZjBjthaHV2g59agKZHujn9cYQ=; b=YveEJvgA6j7BH1QnpqQpNK9K4n1HLGuB8Uk/XKQn6ucpwyc1T8yxb7JbPXDwWVw3vD u4JSlm2lFKc/WMjnuMR6N+tgCt26EbMvLSDl++xT799x5BdjZUYXyovaZowx1CKZq8C7 JVfTUo+OEY3nZw8+g+DlY3Jty8Y3tf6Wvvgu7R+1nzZ7AUOLiRQVOqb3b6L0GiPfyq3u b0cK2s8GyaNyEbz82cm56vQPTckqRVQLj9lrSVCwTI2V+NpUeZWtPsfT1136OvneE8De WbfYZY6H4hQjzxjYID2IfaOjm4cQp9W1XkI9AMm5dnWSReQ7UEqZ27o6cRMlUyiJUVtN AS+Q== X-Gm-Message-State: AC+VfDyiRfyO82ubJ10GsPt6glBhbbQTgHXybrnU1eiu90MHr5qw4KTI ahK7CzihKYRltYs/Qr1Q/oY= X-Google-Smtp-Source: ACHHUZ7UF4F60cHaq3NopDCwXfSHt6C4c4M7alhPXmQ+EwXQUZQnw2XStQkul0fPD3YZi+LCqKCmag== X-Received: by 2002:a05:600c:25a:b0:3f7:b1de:f95e with SMTP id 26-20020a05600c025a00b003f7b1def95emr1633445wmj.0.1686913588541; Fri, 16 Jun 2023 04:06:28 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:5189:b0:3f7:3990:93f3 with SMTP id fa9-20020a05600c518900b003f7399093f3ls395102wmb.1.-pod-prod-07-eu; Fri, 16 Jun 2023 04:06:27 -0700 (PDT) X-Received: by 2002:a05:600c:210e:b0:3f6:476:915 with SMTP id u14-20020a05600c210e00b003f604760915mr1556578wml.6.1686913587159; Fri, 16 Jun 2023 04:06:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1686913587; cv=pass; d=google.com; s=arc-20160816; b=PyDpjEYttU8+iEa/PENprvmX9mb9cRwVdHEEqeBaLrJsmCAXPlKiCxHH458GBlANRB 7WKDS3/qbpKZ9FHWHlCU6RFW9IqlM8CTPKfNAZVoCTlY9Eo9/hQUA8LZhjmNguC7uqbc trM+zLn4dI9JZAKZ9pf4FzBO6MVmlBbmLkVMYPE0jayjDPzXqS2HbyLvSXTQS/DUynTZ DkJx+8tGfuCha9OE91MfYuDVFanWK5aXcpYg6v0qet4wTNnmgTT24XueSd27MQfZCZPw t+htOkt95wxBYmtKj93P1yoM+D42QBjQ5hL3dij/3NJMSQIp0orKIkbvASu8iZnseWBb SEAw== 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=h+hpsnd9snZ4eMjvxJN6mHHUOk8rkLXNNKV2450GzaI=; b=D8/zWCwJmYxsVZcX9pANnfK4v+CUN0GExtZxXQNrl196Oo0cpmTgKqbQR0UWcsaXQU +yC1GM4zOH/dLMmR4KIXLGGKqcrTcmF4kxRhfDcEEvCHzgBI8zDc99g7pKmoMiT9URWj AAXHpxODx9+IkCxwdvlsyGuphiNxiOh7UaceAD201Clh21HI1+aDT+TRjHsRSaGddtjD TWXH7AsMB9lvZLkI6pLCUyX2k8ZaxvbOO4sJI9C0eZTQGfgUgoUWX3j9rWGxUBsZHEhY W16jaPfUIih1LjPQbcD9ljaSFHMRM73nXNvQKWG9uAwF4EWeOK43YNowrerbaSVoAIhr l9rg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=rlulQGQl; 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:fe0c::62e as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on062e.outbound.protection.outlook.com. [2a01:111:f400:fe0c::62e]) by gmr-mx.google.com with ESMTPS id e3-20020a05600c4e4300b003f7e7e76d04si89316wmq.0.2023.06.16.04.06.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Jun 2023 04:06:27 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0c::62e as permitted sender) client-ip=2a01:111:f400:fe0c::62e; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aZmJGoYHXlNym7PDiTKG6Oc7P/4a/1oCRkm6e88d/QxnStBwyvlJsVXUWulrbZ1wbZ44nBYwSDndCHuohiFTZUVh40YmBvTfHgOvENyBTUT2K/y3xOy1ezujuBEB5WHn5eX76ij3VLLcOIxVlMt/h0phK9owZMSCEoCaVU1evPqhVHht/qNJZMh0QJVcfI5uqopDLWTsjwIuaY3RY2pEb3NwBrVrO3lje7O/BtXnoG1V0/jWUvk7TFWer2lg+1dWCsOLQkeGotSvkhJFqHsbvBuF2ULH1I9Smw7ozzQ9DMjD6CtDRdvw65DCHb1jFRIapAqY3Zf4pJd2KSr/USHCcw== 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=h+hpsnd9snZ4eMjvxJN6mHHUOk8rkLXNNKV2450GzaI=; b=W2pa4HmaR4tDCcUE704D16UfqhOl5L8dx9nZGoPUYVBTSL2QEeHta7z8yIjM0Xi0lWAmw4s2MmGdig54SORy4a/x5Yimx328sZcZZWYdCfTHEZIi4gzwQNoJoeCfjaZfwDcbcw9hJl6sSpVeNA1r01PZD30iQBo0f1bftHZ6dT1uiwSyNmGIrz8PS9EBaZ+ytaLaHeI3Baskg7jFYuRCd6+lsYk1I5QxL7p0ps7ODVDaHqT1IQeSAvenzxQT99lwuQ7psgz/vCd5uzVGCIn/V1xwzXgWuv7jtM+ivh7YguuRgzVARk0Q9+OLMcHP8x5Acdn+nHrFq3z8ISxQ+eeLKQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.76) 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 Received: from DB6P18901CA0005.EURP189.PROD.OUTLOOK.COM (2603:10a6:4:16::15) by AS8PR10MB7229.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:61b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.25; Fri, 16 Jun 2023 11:06:25 +0000 Received: from DB5EUR01FT082.eop-EUR01.prod.protection.outlook.com (2603:10a6:4:16:cafe::b8) by DB6P18901CA0005.outlook.office365.com (2603:10a6:4:16::15) 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:06:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.76) 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.76 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.76; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.76) by DB5EUR01FT082.mail.protection.outlook.com (10.152.5.169) 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:06:25 +0000 Received: from DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) by DEMCHDC8VSA.ad011.siemens.net (194.138.21.76) 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:06:24 +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:06:24 +0200 X-Patchwork-Original-From: "'Henning Schild' via isar-users" From: Henning Schild To: CC: Felix Moessbauer , Adriaan Schmidt , Henning Schild , Clara Kowalsky Subject: [PATCH v2] vm-img: move templates from meta-isar to meta again Date: Fri, 16 Jun 2023 13:06:15 +0200 Message-ID: <20230616110615.25091-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 X-Originating-IP: [139.25.69.222] X-ClientProxiedBy: DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) To DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB5EUR01FT082:EE_|AS8PR10MB7229:EE_ X-MS-Office365-Filtering-Correlation-Id: fcd6c028-a2e2-45cf-1dc7-08db6e59ba04 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UzSOUR61LWgkLTLybyEJYP2VFe8NYDpMJ8X4EiyPbV00xLmhXGX92/aS0hmZnEw0V+ax86b336JhnGMa84akNJ+Hq3EuIy8jZZSQ9Ihz9Zfk4SDuWON+9iRI0YWHnTZ58MXmXG+9lBIDlrge3G1Mb+wI5YFoF9RHcq5hk3B2XfyCK8GJjuKDqaQV3GcOnPis3g0vUdnl0PDurC7vXTWcMl99yudv/qPvko3Tjjx6EkYqwJ1eFHVGDYQLRiB9UmDvqDHL+b7jNwTX+JMh3HoJcqKBQ9dZCdBn305Pu+IlB6wevokeEFfKmiWqKBm66U52H4+IIlpebHGy9P3vMVEYcg1xIMdYJIxsgymlHTPnQiDg4gOu2xlrDcJIH3yinDEIIANFaV2twE5UHZ3gJ+oK1p6zHDvj3/m8fTWr8NI6ktrq7Na8AR9FEePoJGeA2GK2GgvhA9vYwOIGNF74GpgJPYeeZpWD7MLhyof0FuBRvtxMIJyK6bqJSQrLV6LID9EkQRHD+E/GRIugDfjJu99JfatDvGrGX1OU+rJHFM/TpSdMNV86MqU5InWIoP866J+WpzFJjoNIn+oocDyRdYfSM+JBa04VPfUNZ43tpiXF5+ycxzDcVEIDF5mvm7nserhEhdaYLxXR1yJ/ubymudXaGbQws8yGWCQW7fpdU054iRIYBLgCkNEJMLd3hnZKGh3zZdAXgCuNC0iOffdbyq+n9+v1lZ5/Aw4Jvzj+jEyt3m8esfIo7pp0sL81yZSy9P5p2QwkYABcI5ZaUR+PNWzFgQ== X-Forefront-Antispam-Report: CIP:194.138.21.76;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(346002)(396003)(376002)(39860400002)(136003)(451199021)(36840700001)(40470700004)(46966006)(81166007)(356005)(82310400005)(86362001)(82740400003)(5660300002)(82960400001)(316002)(8936002)(41300700001)(8676002)(44832011)(6916009)(4326008)(70206006)(70586007)(36860700001)(47076005)(54906003)(336012)(83380400001)(956004)(2616005)(186003)(1076003)(478600001)(16526019)(36756003)(26005)(107886003)(40460700003)(2906002)(6666004)(40480700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 11:06:25.4252 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fcd6c028-a2e2-45cf-1dc7-08db6e59ba04 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.76];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT082.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB7229 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=rlulQGQl; 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:fe0c::62e as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Henning Schild Reply-To: Henning Schild 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=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 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 | 1 + .../recipes-core/images/virtualbox/vm-img-virtualbox.ovf.tmpl | 0 .../recipes-core/images/vmware/vm-img-vmware.ovf.tmpl | 0 3 files changed, 1 insertion(+) 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 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