From patchwork Wed Apr 27 22:06:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1719 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Thu, 28 Apr 2022 08:06:45 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f58.google.com (mail-ej1-f58.google.com [209.85.218.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23S66iCi005792 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 28 Apr 2022 08:06:44 +0200 Received: by mail-ej1-f58.google.com with SMTP id nd34-20020a17090762a200b006e0ef16745csf2334562ejc.20 for ; Wed, 27 Apr 2022 23:06:44 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1651125999; cv=pass; d=google.com; s=arc-20160816; b=NSkz2EZHbYvaG+yFLERYQtEtD0sdZoOWSZogU550SsLFVrgLrh0e5WjXJ5e+zf3g44 RSMIhSm7DQHGksizqWJ1lHVSmSQLiRXCtl33Z2ofEin3Wtv8TZS67uHZJdeM1E9H0GJX hJUOEVyTQ/nQrJTbTIunu3tVYr493H1AjrThIiaUi8Yc1GWOFHB2ffNUVAsO+qrWUtgZ JSM5M9bLzCB7RbhNb2syjWKOpEejnD0OuaXthf7TpM9tERV0C6+GHfdtQqaWRGaEK7pX V1gWYuIzIXjJhmqzleY5KLVNTn9yOWfPPtNsJP1LbgUmNfOzLo7ezODlOmF8AWeUQRU1 Yv4A== 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=t1+un2BcLWbNaiCBYI3egyIlvdomjmq24INeJo+0JZk=; b=0OAml73pswZovGvTEaFsVWOdSHUC75yh1M0n7XSY1LYJ+JGDwXH6GNbGzOzOivrM1u rFf+3rKSMHzDpTdqEtbwLwUC5mrF+HSy/nu0RcmH/ocJJqePJnXdwnddwN2kzUyON+Pw wtSu0ar76Wm2IKTZDPnTNpLH1POhfaFQ5GaG4tmU5mxgCa6yGabTw+6GfJh5CaEilpAU b8Qyr4MqM5hmfn3tVdeMiIcevPAI2G59m2MYxIfjYGYz9ImZofaunBd/d+nxMrbHpNoY zQyAmtPV6Kxnnf1qUA0aikq1kvo2QAgwO64f+II0JuA+offS8rexZMeWgmO3K/Xj1hPu wHvg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=oz+p5+xL; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7d00::610 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=t1+un2BcLWbNaiCBYI3egyIlvdomjmq24INeJo+0JZk=; b=Avq6bao3JR3TVjgfkgVz14I1zpg576LxzVCRgMvehy7M0LKsgYKrpCNjPVqZK/5B1U CLKZRjXzLKPMIKZLkpPaNudPj60ccbQHq4mfvOYgrQ4cXehlxr2AefHgWh65EU4VajPG mL+To4rfYUT69jOtKtStoS1FoXoN+i0+LtTUjoGdKQOzeutvFg30+ih66V8PTjAwwjzJ T3TXLhIqyPV1IjbWD3Z9M78tkH0Sc+zHNevd0bd6+r9u2v0sc2nzvC5xBesd1izKmGWs vyHMW14Y+8MVd+9AW3dqb89Hb3hZx2BQftgIogGZY2V2AhDLDVRmz6wRiESE+/jNVpuh XJhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=t1+un2BcLWbNaiCBYI3egyIlvdomjmq24INeJo+0JZk=; b=2Bnej3/eXUMgsZZaIEXM+qIGI5SjxcbIFB+p9x3tgLJoblxYoqRh73SSC8Ecjf9Dw8 AXEvStvzAZkegzMjVRucFQ/redjkzzVfN3pLtDG4VHEBPiflYyF5WUkTRxLyj3FEHGkt BkHyaql+1f37XgX8UGaCGVscok0Q0aB3S6HMGEGbyf/A8A8s0jv2RjTxAJVzIGX1Ft6P oAZgBm7LCntcPaolAHg/gCFfXBllv1dkHwh4WaIlnelbqFlY8JeCP1ILMHH5FglC1WS3 R2ggQ1lixqCqU3d6gNairs4x6SVToMa6VSlhQt3QDV4LI78CnRGSdpoyHmmqS7pdoFZO qA+A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5302GqTK+7ZiidbhmvD0AuVu3lxEd7pFoIEDa7grLyiUEUkJnWn3 A0TE6rS4FVMD+0F1m4puIAE= X-Google-Smtp-Source: ABdhPJwkUmTuFThRcDV+e4AfV5WpQ57ei49mCKkkfmeUur1Lict0ESHBKrfyOdQV2Ym9NZO7FoON1Q== X-Received: by 2002:a17:907:62a9:b0:6da:7953:4df0 with SMTP id nd41-20020a17090762a900b006da79534df0mr30177821ejc.316.1651125998721; Wed, 27 Apr 2022 23:06:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:430e:b0:425:f7f0:fb74 with SMTP id m14-20020a056402430e00b00425f7f0fb74ls506285edc.0.gmail; Wed, 27 Apr 2022 23:06:37 -0700 (PDT) X-Received: by 2002:a05:6402:238f:b0:426:1ac0:12d2 with SMTP id j15-20020a056402238f00b004261ac012d2mr5672464eda.62.1651125997756; Wed, 27 Apr 2022 23:06:37 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1651125997; cv=pass; d=google.com; s=arc-20160816; b=0aI7GSR6fyD/ySkJW5h7lJhpPiwX6dTEAyQo0htKSWOiK0mjGylxAxRdU+unLt2PO1 DsDe/rqYfwJBUUBfkoHfpnDJQQiaRMA3FK67E7AofUtW0bGX7lyGyEsnPqXfkQx1yxWk 5eXRabR5s5yyUuVBzoGj4SdzZbdgfTwrywEUAyGHlrJ5LhzqhtWQXQQDi4ZY+wnnHTrr qoEPLHnPZFTjES+mAosW76p1T38FLlZAEu1ghKsZT5xRM1nmLGrBZazu+5oLIOJkPt9c i77247DHArUEaq/jaZkOUSi/SyQYSGT5oPSbrT7udAGlkgVcOTRv/4uo46FEswojTxMw 73cw== 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=syFuZ0B5uFvO1pWxbghq5kTavzJr4vx4tqdhAcnCgFA=; b=V673wFiy+4FCXz4T8V0c+L/LxFcLT6AADpjmUXfq0F8/8OvWN+MmYc008B48UtuYZd Mamzs2ST3YgZ+9VMz/u47l0rtZSRL0mGLfYyHRwuc+BZoWuy9P8xFAWnGy4S2owZT6C9 BmcSGA+HgT2YQAoWLITZ3WCRru7+d47bz4gpZvwT+gPyFB3t7muJzHIWTl9xM6fG2Kij P6TUKm2J55ooKX4nISaNx9RDeKmhOzFTI3bqn6wPufYXXcADxHxy5eMR+j4/CUM/wwSA Ty1Cbat7pNFay7UjVgiAe6M5MiQ2z7qC//wDFzrP3Dr1jNIHcOQV2WmgwuqcTY9b0/7l Cp7Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=oz+p5+xL; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7d00::610 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20610.outbound.protection.outlook.com. [2a01:111:f400:7d00::610]) by gmr-mx.google.com with ESMTPS id ho14-20020a1709070e8e00b006f3e70bb5f1si18713ejc.2.2022.04.27.23.06.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Apr 2022 23:06:37 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7d00::610 as permitted sender) client-ip=2a01:111:f400:7d00::610; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W661yf3bi6X7UJDxQy5lIxnpwjnCc2rNT2lO0C9015fDJiVbNJSPfOePEdEGfnDU75/SSra5h48i4vP31bgD5kt+07LwNFVVSXQ9yQmT2aVmqF6l14YyQdTYVQjKj5riNVKGRjhe9sIH8RSKY02xiCUyoTv2eE8OrrYMd+L1x/NJLFCT6C92eNc6s1rQv+MmgsSIlgtMpJTRVLRJyereRUSGOBcxvvJU2LLo4jLmYA/CVR/7bTVZWT3mtiLrMc6y3SUw3mJPYuRAJ0HRmgeM5f2XRZs6t4LHVzfRe71nDhhbeoAh/uGRx1uK7sUCA+VyBTBBY29RiGEkeU8RVAjxqg== 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=syFuZ0B5uFvO1pWxbghq5kTavzJr4vx4tqdhAcnCgFA=; b=Vq42g/fB9q5zCVwYgmjqqYUCm2Q0SZaalA7GORd14gf0fEnIvCUxbKFKAElZvBnZ93lEdYaX1esuuCMNwR30sBYljFWvVGkZpXfkdlg/1oALN1l9L2I6/4f8gdQh8ASZzcaLKsvQZRsmyirszzGLwufSE85RRYInvDevmB4HyGP+4jsAWVW72Mgqn+kmu1EHB3+G+c9evqg5gW8kDjmtPEY2XIU0dOj1fBlCXCjpsMustLAmR1p3vqhc4+qG/a2IB3Tn0BRNfRg7KbdII8FiplPpMRof0VI4gVhHdrNJ7QG7EE94Gh4sboDeklBXPRq8EXtOndlL44ZVGMddvT04Hg== 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 Received: from DU2P250CA0003.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:231::8) by VI1PR10MB3133.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:134::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Thu, 28 Apr 2022 06:06:36 +0000 Received: from DB5EUR01FT085.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:231:cafe::40) by DU2P250CA0003.outlook.office365.com (2603:10a6:10:231::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14 via Frontend Transport; Thu, 28 Apr 2022 06:06:36 +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 DB5EUR01FT085.mail.protection.outlook.com (10.152.5.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5206.12 via Frontend Transport; Thu, 28 Apr 2022 06:06:35 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) 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.24; Thu, 28 Apr 2022 08:06:35 +0200 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 28 Apr 2022 08:06:34 +0200 From: Adriaan Schmidt To: CC: Anton Mikanovich Subject: [PATCH v4 8/8] start_vm: update image types checking Date: Thu, 28 Apr 2022 08:06:15 +0200 Message-ID: <20220428060615.986332-9-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220428060615.986332-1-adriaan.schmidt@siemens.com> References: <20220428060615.986332-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.25.68.25] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--12.861100-8.000000 X-TMASE-MatchedRID: HKR1H9L53+gaWLbof1VKrBSJb5GcA+vRuGH8gro7lJEC4mcWVH6HR7qo FakaELIgBph69XjMbdlAHOg8qEtqyG2haNW3VghmWepptKQeL7oXBhtco0Njgd5x7RpGJf1a9e5 am3m57X0ELMPQNzyJS4ntzGO179KY/3WCZWNVrmILTIKt4AqqFRwC2WjWJzck3ObAp+dZLrPjLr HqvAiSy+y9vsxhLmzelWD5kixb3rqrcT+YJB7Y0Zu74XJZgEpKHxPMjOKY7A8LbigRnpKlKSPzR lrdFGDw3oxHtkvPdMnPkdd/ZpY2UYUDC6VbdWAAT722qPwOeozeRFiRBvGwVg== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--12.861100-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 68554990115356190E23606CF94D14CEDDF87A4FF6E8439729F1008B0BFEE9652000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 28f86160-87a5-4f98-419a-08da28dd4071 X-MS-TrafficTypeDiagnostic: VI1PR10MB3133:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PwM2h+D3rvn0yD8T0CH7pZb/ceftAXNQR3v02TAXGNo/HXRUfPDrg33ymxCZMAh6vfKUsGVmBFoWmKJleM0NN1keue+qZp2l4fkTp6PDqEYWSy56/yr1YB98bP1KXuaQRNA3g8xLmRanaJGDktYby0b8v6fPsZFF3xzubwpDgxHzfmS8DZpEegaIWBL9CEpzG28gIlfLrUEGxD96IjnSiPwMA3mJM7byhPF2FYeSjTmv7cNC6o5MRrE4ov6uQVvBAJFya/kcO7ezJiEm2d9SeQMwxdTwJTkWIjqW2hv6w4ojZlcdzqBeJJEK3YGhAgqafuk1nYtrocmCdwCK22jnCodGGiqBiKhCZsEd4lwmXOHpTOyuBC5XImRPH8shKO+UYJ58/ySZFbn/ybJ7CdQw59TId5XPuA4uILkms3jOLIRIB62RXjLWedwqKWoxc3cwqt2SFzdu3NeP3s7u67I2S7TpF9T5o4WknCJmkVRf8IQzx55PusXbOf3h8g9IV5xDMUXxHM92vhY9h0KbCug0xULYh7NvQ3dLCAJc7MHBT3YoLF9YNKadpTgbHSYqNybKSw9GT+Qp2ncND/OmHr0WJjEgrENj5cfxo0nTAYIN2UYrdcs+JHtbHXz7TeaiklA9nCHMtMo8wNCxZuEsRI2BnXpTM2ODBDFJDyfMioAwtfUCmxsNgovdJNtGYSwu1J9D7d2DC8t6a1+aWoQR+WlbDqRU/pgcGsyqVmn56z8DLt6vf0D+sWWEBN7ZsNxiwyrx 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:(13230001)(4636009)(40470700004)(46966006)(36840700001)(47076005)(86362001)(83380400001)(70586007)(82310400005)(5660300002)(2616005)(70206006)(26005)(2906002)(336012)(8676002)(36860700001)(1076003)(4326008)(956004)(16526019)(36756003)(186003)(316002)(6916009)(15650500001)(508600001)(356005)(81166007)(82960400001)(40460700003)(6666004)(44832011)(8936002)(403724002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 06:06:35.9612 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 28f86160-87a5-4f98-419a-08da28dd4071 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: DB5EUR01FT085.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB3133 X-Original-Sender: adriaan.schmidt@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=oz+p5+xL; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7d00::610 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com 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=-0.8 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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: INBOX From: Anton Mikanovich Image types checking in start_vm should be aligned with code updates. Signed-off-by: Anton Mikanovich --- scripts/start_vm | 8 ++++---- testsuite/start_vm.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/start_vm b/scripts/start_vm index c114d864..8876e538 100755 --- a/scripts/start_vm +++ b/scripts/start_vm @@ -113,8 +113,8 @@ eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "\(^IMAGE_FSTYPES= # Take first image type for VM if there are several defined IMAGE_FSTYPES=$(echo "$IMAGE_FSTYPES" | awk '{print $1}') case "$IMAGE_FSTYPES" in - ext4-img) - readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.ext4.img + ext4) + readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.ext4 eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^KERNEL_IMAGE=") eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^INITRD_IMAGE=") @@ -130,8 +130,8 @@ case "$IMAGE_FSTYPES" in -initrd $QINITRD" KARGS="console=$MACHINE_SERIAL root=/dev/$QEMU_ROOTFS_DEV rw $QEMU_KARGS" ;; - wic-img) - readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.wic.img + wic) + readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.wic EXTRA_ARGS="$EXTRA_ARGS -snapshot" ;; *) diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py index 708520f7..f761a8bd 100755 --- a/testsuite/start_vm.py +++ b/testsuite/start_vm.py @@ -31,8 +31,8 @@ def format_qemu_cmdline(arch, build, distro, out, pid, enforce_pcbios=False): image_type = get_bitbake_var(bb_output, 'IMAGE_FSTYPES').split()[0] deploy_dir_image = get_bitbake_var(bb_output, 'DEPLOY_DIR_IMAGE') base = 'ubuntu' if distro in ['focal', 'bionic'] else 'debian' - if image_type == 'ext4-img': - rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.ext4.img' + if image_type == 'ext4': + rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.ext4' kernel_image = deploy_dir_image + '/' + get_bitbake_var(bb_output, 'KERNEL_IMAGE') initrd_image = get_bitbake_var(bb_output, 'INITRD_IMAGE') @@ -47,8 +47,8 @@ def format_qemu_cmdline(arch, build, distro, out, pid, enforce_pcbios=False): extra_args = ['-kernel', kernel_image, '-initrd', initrd_image] extra_args.extend(kargs) - elif image_type == 'wic-img': - rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.wic.img' + elif image_type == 'wic': + rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.wic' extra_args = ['-snapshot'] else: raise ValueError('Invalid image type: ' + str(image_type))