From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041956804245323776 X-Received: by 2002:a2e:aa14:: with SMTP id bf20mr10727857ljb.169.1639583345287; Wed, 15 Dec 2021 07:49:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3b9c:: with SMTP id g28ls424052lfv.3.gmail; Wed, 15 Dec 2021 07:49:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJwZEFoIYK933Ryuwemz/kkKB7rkANb99VBB7wqBUKuFHCKSyd+8Q29AoYZGRHxdyDHH6eOU X-Received: by 2002:a05:6512:a8d:: with SMTP id m13mr10223723lfu.664.1639583344160; Wed, 15 Dec 2021 07:49:04 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639583344; cv=pass; d=google.com; s=arc-20160816; b=G3k/tY0l+4/EKq+l7OdSbGpiVbPf+DddvL5J5NEeTiEQN7AMiS/dFo6igX1ubww+sX V5gHfhTiWGQW7FV4qW2k6roKfuVbKs3Y9dZp0dMb38kZB6wr+yC3xziquXO5e8zvYMAb lI00mqFlObKWrEZ1ZXt/NiHpdn235D8yAFg1JRE59pmh4JosDC25+JGwEzuGBjuiGsyx rpragGKhtCHRJV3Q28yA90vHtNwI0IjZ6sPuS4o5PLEc4lfayNDa6mU2kDKAqMvndbRN DPCWOFpdMjiHHC6WbISldADo3YV1WkTz3xIUWrhjBV6fwadWEwzFnDkM0SDOMmqXJg7f KWJQ== 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=sdp2DTIjmoQAzBxnZDnCDFPqy3VyK0YQv7GWPtr632g=; b=1C7Ek7h+tXdZ2zYlM5UILy15unI3e8WBdjE/ICl8dn42pHwNxCle3o4sv530xOS5G8 i1+iL3svXpJHtINsHq5Jec4M87rZCS1vCFKkyEbxrT8du88NdSoktBzZxPi8+Zkj/2ee lC0b1G85yQ8O34ai3mECDMvR6GB3n0lIPiZccHx9peFTdhtfqA4W/l2Myl8D5GzlU06c D91vEAgJIgnr3mg/eUMN5Ux8vYEqh8JyzLCBUOwMzwgF3o0fPV+8yHEd5tUpZwXKk4Lo h2asI3JsEw81KI43350RxJWRMTbi4njrYJGRaNMa9lRBtRLlXlIbITTeA1/3uS1R3/s5 N1KQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=yjAcNdTA; 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:fe08::614 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 EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on0614.outbound.protection.outlook.com. [2a01:111:f400:fe08::614]) by gmr-mx.google.com with ESMTPS id r15si72810ljp.1.2021.12.15.07.49.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Dec 2021 07:49:04 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe08::614 as permitted sender) client-ip=2a01:111:f400:fe08::614; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=yjAcNdTA; 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:fe08::614 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=iQjVZ8J72r65X00HDVdd9dks7M1vbCpsVA9vLouYqmOBVLsTaz/QKtgdPGyFVVX2FWK3C7wwM0LF16eG2jQNGyzhW+IuvXX6f3RIlb4VPvX9tbiHOiZeHV1WHlMhZq7cC1aIYI7W9/k6ozArNMkoMA+9+ogMJhvdySSX6k7gvMgYaDTHrfMqosJPo9OEAKNPN2JDyFSkcdYr3WooCMxxu3kRHx5l7G4m5hvJymMfKsASrwQsvq0WpISWjnkSAp2XRKmWiPY/3lm4hNO6tka+mOHuMoehdRvvp2Glr/e3Y9SLuPfBUzQNOsl7reB3GhQsoaiZN4l0XW8UGgZNrNx5Lw== 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=sdp2DTIjmoQAzBxnZDnCDFPqy3VyK0YQv7GWPtr632g=; b=LchgD9J3zOIiGGh0j4hQ/F6a/8iS9yxRUyWmG3FVgHPLVrBWK8GbvoT6iaUXoxaHFA4t5xgoq6QRwvhkUXdR81Yt/Ar+JljZf90mWOJxllJu0SFMvXZPtWsHKYIV6gBiMs32McXpAaWM1w11z0H/AThp6QHjyNjERCjNUygLr610ZQBDcT8IdV2JP+PJ0O3DPPsHB73MsNOJG8y9OT20g7O8Sl3/6x39h5lvoY9H2EBAQLf0uQIt43x29+RiY5S12y8SKaBALFvLU/5fYrFkmH4zG7jATqNunFMLOdM9vv3Wrk5mTrBjijvHSsfOLJL3uu7RT6W/+enGRYKr27QWoQ== 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=sdp2DTIjmoQAzBxnZDnCDFPqy3VyK0YQv7GWPtr632g=; b=yjAcNdTA1h1i+T0L1rovKwOxn2lv7Ca65Vi28A9z3TukYVQIgD9Ot447zJp0o1kCwVhgh0nBnoFC1XLUHg6oxW69aoGEYy2zsU4zQ3U5T11B6fNaU9Xis9DaHKKPbDxqB2aKZPTKDLQx7lAu/etP9zwZI4VhcAHyQ5qlhpHOUTj+KsOTPFWUkqhezhCCACly/sQWS9EzDcfbAAtN8ATLIo0kY58GuFb8hyI8a1rPKQzICr+ZUAJxgvHPZPUF86pk67gD5IbYdQqAfXoGwjyFZ+dux3JvfLg4holbMpHUh+ApiqrlmLQNpmMmk4InGLNWUMreWOmARqkqPLLiD/KxIA== Received: from SV0P279CA0058.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:14::9) by VI1PR10MB2285.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:88::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17; Wed, 15 Dec 2021 15:49:02 +0000 Received: from HE1EUR01FT020.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:14:cafe::a2) by SV0P279CA0058.outlook.office365.com (2603:10a6:f10:14::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.14 via Frontend Transport; Wed, 15 Dec 2021 15:49:02 +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 HE1EUR01FT020.mail.protection.outlook.com (10.152.0.171) 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 15:49:02 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) 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.17; Wed, 15 Dec 2021 16:49:02 +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 16:49:01 +0100 From: Henning Schild To: CC: Henning Schild Subject: [PATCH v4 3/7] vm-img: Shorten code by using variables we have. Date: Wed, 15 Dec 2021 16:48:40 +0100 Message-ID: <20211215154844.1495-4-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211215154844.1495-1-henning.schild@siemens.com> References: <20211215154844.1495-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: DEMCHDC89YA.ad011.siemens.net (139.25.226.104) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 25fea7bb-58c7-4895-6039-08d9bfe26ae2 X-MS-TrafficTypeDiagnostic: VI1PR10MB2285: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: HesHTTMW8gRMRnanFXpE1sQHn3Rw7/UpsPjBjn/4ppW9dNi8v5KJuhRdiGy3v6vQxahGlKbo4EZzDU7bWKlKTtG87miejEy8SP8kZ0pf/RRkETdgC8RvqwMVaJ/deXjZxoQ0/86U4VdPD/YWpKdssXKSwgPR0SoT7ewbgR2yBkFut6g0hcQ0gS/oxDUIzn8SFT145ZU/KKdak48t9f8B7I/3C6pm/XEYcmuzGDWIdF0N9HOSYUs2ZPZHY5tlpi0uhhp+++JpgGVLl/AfDH3ao5GycNAUgcRNSGakqGMzpu8x72+fPK2M52Xj2GHvSRrQ9zcE9T3BrnCpqpkoPvPANgSVA8SxMAzOEXrW7HNj+7bHQUZpUqbUkUshcOkT2IlPnX0OygCqrdbgnbCSi9xUK0pVbVKMOkl9NwM2naCs/crjCfMlAg3uF1orkICcqTTaKz6E9FFRWxhPwdXu2ihVMSMXPm1bBLCkIWG3gQafIfJsaBbvitI9b4BKSVThTY3iGLIgE32u43UvKDpUtjdqnAgDHhUHQqj/52OWwFznX5+Ey4VEi48o6MMDo8QXSrfqVvLvAIw4G5u+vi3rielXarAaSl2tNSpe/77iB7/uOPeQ3lfBeN4Yp2zYsP+7iqIJx3xO5QxvAl5LSNo8oVLPlPj2pk3X9IMbYrV9xUBuw7pa5cQ/oFFiDXSUa2IKAhAdwJ6GSybfB/c6P330bW2DRypNBqjv1wPxCdQmPAKDFg2jDrqXpLPxqdrs24ydU3YxTVxgEb+9B1+v1f89QdmGkcT74794aboHPa3mrw3lRW8= 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:(4636009)(36840700001)(46966006)(40470700001)(36860700001)(956004)(81166007)(2616005)(82310400004)(36756003)(82960400001)(40460700001)(8676002)(508600001)(336012)(26005)(16526019)(5660300002)(44832011)(2906002)(86362001)(107886003)(6666004)(186003)(356005)(6916009)(70206006)(83380400001)(4326008)(1076003)(8936002)(70586007)(316002)(47076005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 15:49:02.5589 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 25fea7bb-58c7-4895-6039-08d9bfe26ae2 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: HE1EUR01FT020.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB2285 X-TUID: cpa/Ig+v8psH 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 d8f7fdf2c580..6dad708fe32c 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