From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041591381282783232 X-Received: by 2002:a05:6512:3052:: with SMTP id b18mr5666554lfb.424.1639498694991; Tue, 14 Dec 2021 08:18:14 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3d9e:: with SMTP id k30ls982848lfv.1.gmail; Tue, 14 Dec 2021 08:18:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJyMq1RGheuO3VWioNzPAHjZRKiU5wGENzvLAgQ6iPVS66rwzs8uJBf8wfiZnixiK32kWJy5 X-Received: by 2002:ac2:5233:: with SMTP id i19mr5586794lfl.592.1639498693972; Tue, 14 Dec 2021 08:18:13 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639498693; cv=pass; d=google.com; s=arc-20160816; b=aqgBkVPpD+NWwwZq1Kv4ZVGSRYAUOj3a7+MQ+2YgfkwB4JDmRQCF5LrT+DhieMzh0q AIvrK5PlPAVHmxuIZ5BEjOxeOvs6GzzYpEUW1/PULH8g6nUgja8Ti++JaGNX4nMGiyLq 2vI182Lu73Q4tfv2nI04JDB0sdR6eqMIh8ABvF6YR5rmBqMgNytmnY4nxYKGZ/Hd0BEU PQY4xOwr6Ol6g8Tlwa/+J0i2PjWaTztgG+8Z6AaNOcExqbmyeYFodAI9ayrkOUcOmO0e qlCIOuQOwTmcvWOMdflMy+ONztGhYccbNYVAC+MZdolxf97jrgdzG1UIxQGmb4kbGHBS kZiw== 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=uPzFky2KLTOWAg4l8gdHIjE/yP+MgBNlHWLBPb5hLQ4=; b=aCBHArSmWjyMLdhfkNnMfvHek3mGY/XLHWssHrb6wLZzfZDm77/u6f9D6kW6ixeBWG 9IS//A8NR7UXgK1LbJpnZ6rlqgzLNQ3XBesl4iU5Ip6+3tPQPp8kT2Xg2wnn+4AqiNpZ Uxv4xdi55NJppHWG7Dv2TyPRv+le+hBxiyfVh3xR4+s+bgwuDLKxR8Rg/MWy+mWfQqJn cztaAQmY+GlDI1cXKwtg6HMJH+aSXk73iET5cH7GwkYBUV8c04BVUwsRY53G71UjjQbI Sqo3xx38KJ+Egt+UqRnbFK7/N5JikNVN6OR8OpSId2hBrm5IgvX0JITnUEw2mGhiSaHG DWNw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="Vrm1M/Dm"; 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 40.107.13.80 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130080.outbound.protection.outlook.com. [40.107.13.80]) by gmr-mx.google.com with ESMTPS id u19si15137ljl.5.2021.12.14.08.18.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Dec 2021 08:18:13 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.13.80 as permitted sender) client-ip=40.107.13.80; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="Vrm1M/Dm"; 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 40.107.13.80 as permitted sender) smtp.mailfrom=henning.schild@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=OQaULaShthffigXAc8Rmp3AfAOro6BSiLHERrD47Ej1ru2BfiMg0uG9ZWjswm3qcS0hW27+NOEHsTVFA7cqBE6dhJsprRNEJFPEwZY7WwPEYLLGUY0CTwesZdhjJXzgQ2LdygueP6ChQXzXu9jwyfQBILllTbx7rYU5Ww3NSdHBLIgFz9x0mdbveazdDoIAh7lbkPHTFLSbMeVGV7M5HM+7Y9si+EC+KjlYN6ZM2pBIFJipcOV2ijKB7fMr6CUDIOtqxmtfdIW1VV+ZybA3RHM5D8USdoiMf8QQCSW4HTIFW+8V2Rh+KWrFdjJWdZRFRLqAQoSdUKv+sBD2x++Viqg== 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=uPzFky2KLTOWAg4l8gdHIjE/yP+MgBNlHWLBPb5hLQ4=; b=bqLgkIlEepMhjhh68oTnYISWmwbAkBZpK06Dnt7/2mAYNd+i+H8+iPanXDeVsQBdJJVGlbzCNCUKMWBrtvZ/uwoAhYvg3BXHRoqmEa+XeJs8eta9un2DYrsMt5oniJFJRgVOM0XzYsv0UYOb8iDWFkw9NUStfLPNkpzvZHcFpFe5MvB6wjKzyxKZOLj0EFUHFFoCaY3Sw9nbx5vDptBViHzPy16jAdgtwR8BCLr5JnkATbmYcaFP4DgcCA4M4cK6O9AvXSr5WLPkSHmOCcEX+0x3zLK5rmHRCZzfYf2s0nAF2FYPZStPbCLjk+vqATwya3+FkYeQTe8M3jlJyusDVQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) 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=uPzFky2KLTOWAg4l8gdHIjE/yP+MgBNlHWLBPb5hLQ4=; b=Vrm1M/DmC/+OzxLq6t0jTXwww7csTZTmHXWgxLHDgQVXs3JnTwliDA6ABtJ1SxZAoKiQmgKnPqXUUpWzvLiMl6TT2vrvZ1SQbYn74zx16ftdqBGLlEn/eOciltJeJuVrCbbpWj/Zsowcg3P5q4HfBnIeGUzVXmQ6BVjcIcncX3BNRIAXAS1QnspwaZPtTacoVZ+FWw0KAqN51NNeg60cesSB+jpx3FENYJ8paUwZ6lF1+INQkhwKZOKDn6iOGSKO3rFdy5DEI8dVgE1gxqmEcjvfBq22HzqnNRmkxhf6JzsQ6Nov6jDbF7y9Bsc9pEAsGHJMA/jK+fhfR41dQzc37w== Received: from DB6PR1001CA0027.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:55::13) by DB8PR10MB2953.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:e4::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.20; Tue, 14 Dec 2021 16:18:12 +0000 Received: from DB5EUR01FT049.eop-EUR01.prod.protection.outlook.com (2603:10a6:4:55:cafe::ed) by DB6PR1001CA0027.outlook.office365.com (2603:10a6:4:55::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.15 via Frontend Transport; Tue, 14 Dec 2021 16:18:12 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) 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.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by DB5EUR01FT049.mail.protection.outlook.com (10.152.5.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4778.12 via Frontend Transport; Tue, 14 Dec 2021 16:18:12 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Tue, 14 Dec 2021 17:18:11 +0100 Received: from md1za8fc.ad001.siemens.net (139.25.69.80) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Tue, 14 Dec 2021 17:18:11 +0100 From: Henning Schild To: CC: Henning Schild Subject: [PATCH v2 3/7] vm-img: shorten code by using variables we have Date: Tue, 14 Dec 2021 17:18:00 +0100 Message-ID: <20211214161804.5789-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211214161804.5789-1-henning.schild@siemens.com> References: <20211214161804.5789-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: henning.schild@siemens.com X-Originating-IP: [139.25.69.80] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7b93793e-c362-45c2-7103-08d9bf1d538c X-MS-TrafficTypeDiagnostic: DB8PR10MB2953:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:147; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ne1NnwzJvX8/XqUuC9RbQuvjiSUBeYYnP1apXRqKjfrn7Rndnghf+P6kJNcGgDs6b8dxU7pJ7+GfQxAwZ+h6eKdCCcVZI4K6a2gHMNQh2vKSmZ7MpjcuxKpuRc56VfXjRZWK+iY+yTag9ovmMExss4+u3L+Zt1HqhgGggYR+6RW7msCUf8ZxkTk/IfwLXWYQaAGssrkOGAkGcf2Jz3MKHHiOj8rb9JSCyX2ASYfu5SzuHs9b0oHmUP4yv3vR3rjJ5FYn1KjkKwaLFt/CRHbLH1WRtEAp8tvsXZ6TEL4+Kdz2pS4GPJf6bG5wfmULFr/XMz9bknMQuzZg3a5lq4oSi7/Qh6DiT9Yq1xwrsVPT9Jn/gkwJc2WuUA0POeAUJBHVXlBUZvzcexMAIVQ/g0OiYcga/ZyN9JxhP3Y/kwi0KRk8N5SHszc9BRqRPZ9oM30rIz/ohDX9xy0LCvM0s7YV7gmSnNFxWVeF/B3gy42An4D+R7tQD9S+5ExhAbRBrZZ9ox1r5ksVehIM89SBWQSZw/qhKXmbuBJ0l1ExuLpLk6rep/XneCm75OrQ1a4yfWZZrLZzFyggdsrwa3U/HhkIQkXur8vNSQgj3CEng+UCRjv8pzwN67AVjsuPLpbj1Y5jNB9qyCtMQ5KPs4X9ubJ9HsL1YWWCiJIrMJv24n989fdVESdHyj5S6nZ8ZfN9IhEzs4Y+sX7w8mNwJzoFNeEPtOqEhHp6gKmFJvxOaX4fPCza8YFJ0UlJ/B/PYXuPvF29yAJJ0la8oOjtxTxOk4pvQ+7stlIUCNiCg14/TmmXp6k= X-Forefront-Antispam-Report: CIP:194.138.21.73;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(4636009)(46966006)(36840700001)(40470700001)(4326008)(16526019)(316002)(356005)(8936002)(6916009)(6666004)(83380400001)(508600001)(1076003)(86362001)(2906002)(186003)(26005)(44832011)(5660300002)(2616005)(107886003)(82960400001)(956004)(47076005)(36860700001)(82310400004)(70206006)(81166007)(36756003)(8676002)(336012)(70586007)(40460700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2021 16:18:12.5524 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7b93793e-c362-45c2-7103-08d9bf1d538c 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.73];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT049.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB2953 X-TUID: 9HQq7vtugCC2 this is a purely cosmetic change making use of shorthands we have Signed-off-by: Henning Schild --- meta/classes/vm-img.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/vm-img.bbclass b/meta/classes/vm-img.bbclass index debdf3b2fdf8..e94b6de2d799 100644 --- a/meta/classes/vm-img.bbclass +++ b/meta/classes/vm-img.bbclass @@ -37,10 +37,10 @@ CONVERSION_OPTIONS = "${@set_convert_options(d)}" do_convert_wic() { rm -f '${DEPLOY_DIR_IMAGE}/${VIRTUAL_MACHINE_IMAGE_FILE}' image_do_mounts - bbnote "Creating ${VIRTUAL_MACHINE_IMAGE_FILE} from ${WIC_IMAGE_FILE}" + bbnote "Creating ${VIRTUAL_MACHINE_IMAGE_FILE} from ${SOURCE_IMAGE_FILE}" sudo -E chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \ /usr/bin/qemu-img convert -f raw -O ${VIRTUAL_MACHINE_IMAGE_TYPE} ${CONVERSION_OPTIONS} \ - '${PP_DEPLOY}/${SOURCE_IMAGE_FILE}' '${PP_DEPLOY}/${VIRTUAL_MACHINE_IMAGE_FILE}' + '${PP_DEPLOY}/${SOURCE_IMAGE_FILE}' '${VIRTUAL_MACHINE_DISK}' } addtask convert_wic before do_build after do_wic_image do_copy_boot_files do_install_imager_deps do_transform_template -- 2.32.0