From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041591381282783232 X-Received: by 2002:a2e:a4aa:: with SMTP id g10mr9345795ljm.529.1639561176323; Wed, 15 Dec 2021 01:39:36 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1320:: with SMTP id x32ls763790lfu.2.gmail; Wed, 15 Dec 2021 01:39:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJwFvWGJzixWkNGm/OGnHYbDfO938usbrZKLjhQGP1wUaYi//T1BtXDK7s1zrguCz0ES/MQu X-Received: by 2002:a19:fc08:: with SMTP id a8mr9192028lfi.645.1639561175231; Wed, 15 Dec 2021 01:39:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639561175; cv=pass; d=google.com; s=arc-20160816; b=urWreRSldJsUr/Sp4m1A7dA/2ZPk6bx8fHcQ3bRTlpPuiUTrsuNDmKF7XO2iUxpUi3 OitCT5AQOsQO+SO4b9Az+zFLabCK1XArDgAFd8WMlmY2pMEOCijvYu5tnA9xOrQGaFEh 3KgaF3jLI5EVHwG+3y6DLwzXwQXO5ByZ9DJXUQ+B8cFDta+jqBcPuSX9SM4WlmcInqLj /5WBsq1whnaVxSS+MtwRl8ouk2l4OUNDdRKSN7u1/pz46zOGru8SkNt1tPiZ0GOnjMub vJR6dmpv12F/OCjfWUiNcok5UKEXBIR8zrPqlk1bGiubHe5K/56Mrv27qipWHTdwWA0n Gt5A== 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=fjs1q//hrvqACGb5HBqeJDl7FoW2ouKtn/zGbSsWsIXDdo5hPSnwyzDgBreHkVWdec GoYqwf0OFk9TrPXgr2fykVYGcOkXj2i69SrSM2xbSpKYUpHeSidbBe1Ye/W6Iu0WBatv Sh+/N5QUIwuzafh4aCSR/QzBclhJySameUduImUy+782GBOaBq+Xfx/c6wQqjqt3ySJ0 We8XtGKNA+rr+LumOifRvxcEL+Xftb4vlGcCwPyculxj9sctE+XEsDW3YXfHKeEV6hbp 4yo71piClXOiqVCDk9U6LysbSmtX2cdoKKHN7T6yVORky5mYj9CZNopor2IDnW19MzYb pdvw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ahyfKUIq; 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.6.45 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 EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60045.outbound.protection.outlook.com. [40.107.6.45]) by gmr-mx.google.com with ESMTPS id r15si44721ljp.1.2021.12.15.01.39.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Dec 2021 01:39:34 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.6.45 as permitted sender) client-ip=40.107.6.45; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ahyfKUIq; 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.6.45 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=XNIkt3oLOIvlRi0E7TwiTnULKE7OAGQRlrzj/m8wx1SvSgSo7MW3z41VXLNFJFzsWr59bevYFEAW9m4KjAmm+uqVQpFfADZt0iA/BTggE+7kkXakCBrp65lls3RkEEM2xitHF7O8bH9bj5uWhN1XIcKIKctjxzX+CnAEsdaeOmQffCyNRB0Gl5FIadpBHqt3xZfUljMly8B4Jsad2wbBgXwk5FJMxY5+l4e59xB1SWFu8Eb4Y8jhCKBVpJkcWlC4vvHW98X+KcMoDHAtRHQMyEXTMK4okur7r/1I6SmlzXGGJi++pFNc8eAiwBAj6b8bVrH64YzSBOnAOD2pXZ0Utg== 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=ahk8T+/ZbvIrwgZJhRiIdONmOkUG68stUQAlHDsCYIL2qsKhXO071/FFCJTXfwdgt6kgK74u1Ca9AJf2pCwv1u1W9jel/+x97lDzt3S6TXJt/U8CRe47by5fVRhVfBVCoxlq0rupusseFN2W47dhNmxQOFqoItOAtEYIPSj3uO0EUB2A5DzY9gv5pAtVmN0KBVCSgAZIhLJPmFkAY4ynx7bj9//Jx0CYIICuaQjmVfIblvt8IknwpKt9o31ZfZ7pn/L75Z/by0QrHPjlTHUyHHl4ZgPZFG/435wfTab5t101CyXtZCMaWpxw849NKT7F9gar7I7KfRuIzQGxFvRxnQ== 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=ahyfKUIqjs4/hYXiNtUTn228Ru84zUEir0wSkb3zDfKnMhvyNAiDRhs7+1tGMaDHSxhfSlPvEyZG0iSGtKYiavuGdwK0f1G0WmqSWg6c0KytO/7fRxsNKCRssWU58KBbq89smSu7vke9d7E6z9TAcPiZJ96b/ZK5dviNTXmbiO+1fBW4Qy8eWkVpB5gm827o2+PIPMHeQkfdMKO7lN7bVr6JzOx8UDvM3S8+ygMxyPLxVNxIhF1Oz4nwcqxjYJPwVZpt+KMKGSF82jQUaYHNR/q3qYn7dRNKLudjZ7rpGfwtzKAwUGAMNstcteuaSAYeo9pUe9Wy1Be0a+pEZu0uPA== Received: from SV0P279CA0062.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:14::13) by AM7PR10MB3733.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:10c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.16; Wed, 15 Dec 2021 09:39:33 +0000 Received: from HE1EUR01FT046.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:14:cafe::ac) by SV0P279CA0062.outlook.office365.com (2603:10a6:f10:14::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.13 via Frontend Transport; Wed, 15 Dec 2021 09:39:32 +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 HE1EUR01FT046.mail.protection.outlook.com (10.152.0.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4778.12 via Frontend Transport; Wed, 15 Dec 2021 09:39:32 +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; Wed, 15 Dec 2021 10:39:27 +0100 Received: from localhost.localdomain (139.22.39.210) 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; Wed, 15 Dec 2021 10:39:27 +0100 From: Henning Schild To: CC: Henning Schild Subject: [PATCH v3 3/7] vm-img: shorten code by using variables we have Date: Wed, 15 Dec 2021 10:39:14 +0100 Message-ID: <20211215093918.32038-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211215093918.32038-1-henning.schild@siemens.com> References: <20211215093918.32038-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.22.39.210] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2d9d2b31-d940-4c59-9558-08d9bfaeccaa X-MS-TrafficTypeDiagnostic: AM7PR10MB3733: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: tPiBo0epBsF2L3dfxFqB+LAxjl3feY5ixqKJzmT2jpz3BaEWS4yYVkHrsKwv6lAkxugB4W9JmtWD1NziX8TcVHoqm9PUpMXRqffSoPhSubMk83h7UgVMS/lKZm0fWXcQ5rgBt8mMHJQ0t3lX1Q0resnWprgjaKFQizuz4UPkL4a66XKvd8+8yI6s7iHVxfQ5DNUSTJX42kc8wiSfHplIvrnqUPQmq40C2cNYcNwfgsfNxxTvfrJjhtcb1yE+3PobuxNkgwYTjP+zL0FY5MkieCdIlO39eBCxl3Bov/217j/pWd4HXSN0ca4SeMNafLo0xrhkDsxgOs8HMmmFgrI3XiuZT9IcY9lHb2pbm5NfyEzKgVljCpK9g8CYZusv4I+HtX1Aa5wJdHUoOnvk862T2qURVLo9kYeRBmw7Gr4FVZhyE0FXW707tJqo//2i32ZoHJxxtq2UyJ+3gt4dhjSB7SGzkvKyR96LvA7pscUNuaplxBF56gz38om5kxUhT81DaxIVYj0BGBN31i6KNetJ5InpCxeL1sotKj4MViwZJCZuNpwiO2/ZGcc0Fa7syotE4O4eIOFzHO50dbze3VVuVLGefKZIHuNMATfd3e0K71LbCXcjZtdnPJglYnRrGdbZ3rLndSxqbGjzK+93nQn7ifc/wvM0yEDjgyyHOqa05pNa75PLhhP+7uvWRgtRP25PVkeRV4KXpPr9DQ7CrjJ3cMC5xV7M7u0+PzXkLahy2MB7b5OpZJiHfo2WyJP9bFI6K9Li/ykMRPILamgOcXl60TQMtjaiqSu1K84P5YMwG1E= 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)(8676002)(8936002)(336012)(956004)(36756003)(2616005)(82960400001)(6916009)(47076005)(86362001)(44832011)(16526019)(70206006)(316002)(186003)(70586007)(1076003)(26005)(82310400004)(508600001)(36860700001)(6666004)(356005)(83380400001)(4326008)(81166007)(2906002)(40460700001)(5660300002)(107886003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 09:39:32.7800 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2d9d2b31-d940-4c59-9558-08d9bfaeccaa 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: HE1EUR01FT046.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3733 X-TUID: gZnDR2NVRJAR 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