From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041591381282783232 X-Received: by 2002:a05:600c:3489:: with SMTP id a9mr47716885wmq.53.1639498254427; Tue, 14 Dec 2021 08:10:54 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:2110:: with SMTP id u16ls1402553wml.0.gmail; Tue, 14 Dec 2021 08:10:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJw2/MwTjfttEGrmdYGaLT3Kl+o61fMu82vvpLCd6q3kCf9GDLEKEvWa0qYhczvcPkV3aRjd X-Received: by 2002:a1c:f609:: with SMTP id w9mr8170798wmc.99.1639498253427; Tue, 14 Dec 2021 08:10:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639498253; cv=pass; d=google.com; s=arc-20160816; b=IRHE/n/+L/j1EmMp6T+wU06YpM+k0Ps37rytqFvV3IiWN84SHRaMDwHACNc7QFuW7Q MHfbBjoQIkLkOqcIRiSpnzgYyyzP/idCIGT15XfQCHvsHFO9AWXHAYbqMdhCDtRHSGMK 5a96jnlpzokWJrXk/sD/HEeVybV6Qqw438t5EgkspEjRdOFaxLnLHNgUGX1LlOZAh2q5 sa7Ixvwcg9ufP5Ja4iheEbmlJNUSi8vdm4ZpkuGYwrbFCbsBmNoHu4RGKvL7I4coethB /rMdibuaSRs1HnEKivCr5Fr+drJKWyNljrcWPUNZs2xCQHWmMh0UKNpn8nwi5TJeZXkH fjXg== 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=wOXrV/k6f7c8gz3Xga8CzByNpvOKfeVMQa4WV4S6fyQZ+8DGCypP/CgUOslWs82da/ zXoCRK3Gv6g188U07Fwl880ZxSSsRUD2UBfQuEyKX8mJMpC3b3NHkPQa4u08KEmSYBhx cygnV7ty0ZtVVhed5yDjrTe4v2oWFKe8t+pjCv6pBM5lS7eRRo9W0Vq/K3MFphWjK3HY DOxN7DtFRKGLEkK2XSGIU5lcTSXbXuDDPHW6QWNuXOf+pKG30JvAIEvaMgu382AJr5a/ qQW2gtwvAXh4vjPkkgbtxRG4ipWFhAeXhoPMJPLgJ+l+zQd3ADGfP+kWmhWGMdbfOIy2 sc9w== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Pso78jTX; 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.56 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-eopbgr60056.outbound.protection.outlook.com. [40.107.6.56]) by gmr-mx.google.com with ESMTPS id l14si10106wrf.2.2021.12.14.08.10.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Dec 2021 08:10:53 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.6.56 as permitted sender) client-ip=40.107.6.56; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Pso78jTX; 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.56 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=L+eoKiGyDCcxJxTrcQqwVfjNVaaD/UaJWVXPNhaVKCxx1UJ1X4pMLMa3VlmO91R1B41S5NSSUd2MIj18SnbSUJ5ADcuYDHGW/V9Ey2ihVq/moI42+nCoMw4LL3OrxQUFmCVUIAV/qP0RbUhJOxKgle6f0naYHATJ95o9xOHAnvAAI8G8+DZb0/L3OTNr7+t+7Gy/VIqJXgLa24FMvNaiR7+8zos/FLXjD5LEBSnTsr4VsmdumvN3JdIiRiev2WjoZ9ry8Yo9+MPqdhWKsY0OZTz+88GiKxycFCesjbFoS1oIL8m6qdoYRiUkskAwCfgVEzrxrs8xBmC9TTmPe3HIcA== 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=gSMlSoojL2MXJrjy19vJWPU/MYNdVkW36cSKo2XoZjWwvauM2Y4CT7E8VaniSessy1UtYBSZIe9ovyU7hcx2OynzuPR36vPShsbOLGEl4ywf5/oJqUtYYFdL0ZLV1ZAleWwmZO2MFtCORzuN4YK9tr+0+UjbYrKP5qHfMDtfqw9aGPI8p3Cqr6Huj9khYnViWphjE8Lg7ejSsmO8fz/Hjh5PA1I32hDIV6UPymDnEaeUn/Jkz1pXnNqvuG29MU1YQ7Ie4C7ng3uny2OCQXiNpSboOSUEi88bfjXIp7X6QGhf9OygBC/INeKL3u8D4SykguLiSQ+43y9vw/QvC64KbQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.70) 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=Pso78jTXymDVFKknt+Pl1m2HBakd6tCCFtnWOK6Fikje4QfGgO0DL6LGvHHEVe1U8Ckkb143LGLSd/N/97YAyutS6URlQYYWYzAbucUH/0RzQ6nFjkso2hnkuuGMlGzPIJQO6z5MADprA0/puFTS30uRqrt1VELm18Xg39hHNA8zJ7Ev0f0Bh5H2ou0bz1tYzxr2mC6zSe5twEeEaq+JbXGIDdFgBdy1aFKg/AoDPoEPxlPuDVFCN06U57rZNHWgp7Nf2XjuEyVn7s7TqyRqrGvpp+RXkXBNewz3xf1+crjQ/82UPqlYbtVvSgtdI3Ter283iHKm7j48K0rSzK3wCw== Received: from AM6PR04CA0067.eurprd04.prod.outlook.com (2603:10a6:20b:f0::44) by VI1PR10MB2015.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:38::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17; Tue, 14 Dec 2021 16:10:52 +0000 Received: from VE1EUR01FT050.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:f0:cafe::99) by AM6PR04CA0067.outlook.office365.com (2603:10a6:20b:f0::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17 via Frontend Transport; Tue, 14 Dec 2021 16:10:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.70) 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.70 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.70; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.70) by VE1EUR01FT050.mail.protection.outlook.com (10.152.3.32) 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:10:52 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) 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:10:50 +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:10:50 +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:10:40 +0100 Message-ID: <20211214161044.5481-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211214161044.5481-1-henning.schild@siemens.com> References: <20211214161044.5481-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: 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: b7a872b0-9754-42aa-53c2-08d9bf1c4cf8 X-MS-TrafficTypeDiagnostic: VI1PR10MB2015: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: QyS5BvmgPK0dgxA0ybnSLW86eJqpBASHFDc59biqUIeICCPb8TInFT82Zyx/hIoW6HxTfc+oMGISkLroB+ApHpWo012KHgY/iYhGy+13+uTDVNVRw+Y+hOhSAAAtrjjRT7rgjl5ZVxEv5No9b2lo9GSAXJpR/xYiswn49n0m84AfXVFzoMKQSo0zz+JZUiucuu9+TXS/Pel2lalNhlyZFxJhmQlHjk6bhNeZb9+E4+Q1Glq3WYmgrnq3okBMj2wWCGeOSHMHHmy9zzkuic9UIlZWWdJ0Rdw6t3Z5ws1I9H9qAJVGHYaISHTOlN8oi7xxuE+ogqD6DkwB5qwiXvvfN+pchANBTE+K/rdNqEzBWBrO7zoZNgdgHu9IHD8qoZ8safDY9wcV+FoJTPdt8/Gd+l+tOIfblkLTDw+pjgawUNN1TUWct4Ux25C1wvVfbVellNHwegRGmpS6uyOm1gfiW/aMVxh9HY5D/UC/ETcx+dzNxC0uMwLuCMbofAHeoYG9oL1JLvSxuFRjkzd8xlCSFhQS7yIKGdzesqHwHsoLhJDQzOG68F+ugeo/Z8+oZnvi4a2VTsBKrxOkcKV4ST82QONKYySo67hHEtLe+K0SXI0lSPBSV5GCtYJZ1Izqks8LD2IByRVyBisDpX03D5hf5faDfPn3VdrChJ8MTZEXWq9BzZ5lXHA1MlJ10I4sL6Oo76g6/FYEU7wsnDikxvzrMLAtnGNWjeK0HjJaH3vSSNI6RBQQCq9O4QjI11kvgho4aaLd9kHpmMMU6N7gq3qcIg== X-Forefront-Antispam-Report: CIP:194.138.21.70;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(4636009)(46966006)(36840700001)(40470700001)(26005)(86362001)(4326008)(2616005)(8676002)(82310400004)(5660300002)(47076005)(8936002)(16526019)(956004)(36860700001)(107886003)(186003)(336012)(70586007)(82960400001)(7596003)(508600001)(6916009)(316002)(40460700001)(1076003)(2906002)(36756003)(70206006)(6666004)(83380400001)(44832011)(7636003)(356005);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2021 16:10:52.0499 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b7a872b0-9754-42aa-53c2-08d9bf1c4cf8 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.70];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT050.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB2015 X-TUID: FT8XZQtgFDXM 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