From patchwork Mon Feb 14 15:45:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 3588 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 780D6C433F5 for ; Mon, 14 Feb 2022 15:45:52 +0000 (UTC) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (EUR03-AM5-obe.outbound.protection.outlook.com [40.107.3.73]) by mx.groups.io with SMTP id smtpd.web09.35815.1644853549364030977 for ; Mon, 14 Feb 2022 07:45:52 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=BvJSJdY3; spf=pass (domain: weidmueller.com, ip: 40.107.3.73, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L+skTnAvDr/cEda+Ol/Vz5FAOaE925KkGbi6QNB2evItWQsKgpmZ7GB6gjIU8svEgJiPB2eZ/zKIzr3QW+54/TnKSngj1cfUM8wYuW/5JvFEPCvzko80s9Eyub+nd6hf+v+sezhM1z7XKIBIUtO9zmbYd9MwsXVBJpbogmLKuzEHDMZkztXgxEUtzCaRWZ6q1SJFOYvLjbZclzTyKRbXKPYGvBr1bONS4S4tjsBfNGQjHNnQAmNcUsbAxKkkyPo+3TAe+cBPz2DO2Ap28jmnmpTcyp2vgEOE2ae8lt3GOmyTECNjQivZAlfPxXqFEJ6oaNPTdVXbKZO4L4QHo6oVbA== 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=BwtRa/N7AW+KHmFJLYofEZjP+jm4Jfq2y7RRgeeN2XM=; b=HH6K9nq2r+m3gxqDDVEc6v+9mnSE9WGH42rg7qRJ/wZ/q8zDXDEECeSojHOA1xAN1BIs/KJMRlT5JgtrzuKQNI38Kg5NZiCT+dYimhR3Ir5URwJMxeSeQhRdveguUU/i3VSoCYManEc5zMshRpG14UslmN25/OwXeDRPMdDjOYHb7UsGiDJ5ncgwBJI5AeykZfitPEUfjaoqIiyQecFLTiCHCDc/7aBAXYRj0ixJVXrba14xjdF3+PjvzUUxkprBgU+ht6rMa8h8EU+emkY6hWmqRdfElmixi4hfcgrZO6tpMzI0P2MEhA6DENkPuV08b9dGEGiSBaOPX4gNtVPUVA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BwtRa/N7AW+KHmFJLYofEZjP+jm4Jfq2y7RRgeeN2XM=; b=BvJSJdY3xLYtxQxwI5m5M0yGFFdLSN2czZUieIawAFGmDNTZ6CFUogN5vB4olgn4KsSWewZ8FAq0aHDj3VxHQIvuudl6mB31qSty5/NqMzWdAScL/svs4nAjxJFbeM0nVVj31Rebc7FXpFwzEYIysTY6kgrVObPhtnIPDvEzSFY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by DB8PR08MB3929.eurprd08.prod.outlook.com (2603:10a6:10:ae::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.17; Mon, 14 Feb 2022 15:45:45 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::245e:139f:5d4d:1dc2]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::245e:139f:5d4d:1dc2%4]) with mapi id 15.20.4975.018; Mon, 14 Feb 2022 15:45:45 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH v2 1/5] wic: partition: Support valueless keys in sourceparams Date: Mon, 14 Feb 2022 16:45:17 +0100 Message-ID: <20220214154521.26905-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: AS9PR06CA0257.eurprd06.prod.outlook.com (2603:10a6:20b:45f::11) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9b6b7a22-d5b7-406b-edce-08d9efd1103c X-MS-TrafficTypeDiagnostic: DB8PR08MB3929:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GvSnddXHVs4vs6MZol5bp9UEo5yQngcaH+htKCtrL8/qII5EeqwmngCsXSVjzu3a7/cnX2IDeGoBIrj7HRhWQaDKMWxHdyeNEYNeTOp1qqzbpGOBJsoVsqIvraQMFCa5BXfdHf2iGfPB/fiWgFYxOhck/d//ENpEN5mTSoR99O9p6XM2Q3IDVvrL+fj04pB65FquJ/y9h6yXZaI0GUceq2za8uPq5AxxiGNWHt8hxqL2y3mGt/DWCn9TdeM+Vcm6bdZpfXxwDJwe6FPQpE2xvlmZdvIP20ibxiS8NYwqrn9kQziO7NiDnEKnp7UxFuhcVVPqvr3nboW9uURD56PmiVJCiPOSuPAz900DcLVJlEHO+B1CwKemnU4xRX9AyZuwcVYrkLmf2rHjI6UqV3WA3zICajcY7u4lsufvOb7P+aRgGPBgy29fXvj06ygJCYIt9g2svOiEYka9yayc4PrvaUA+VjHyp9bnYI2JpnNCkReZiUAHxbzafYcvKgEdSL2ZUD90x6sLRnWOoz25/RfsHXqdWyy/Qg+FuOCAY4s7sInk0E+dvFP3f/ZZvHtChkdt8eVqIqlaSVn/6M1rI0RC0U5ubD8cIt/sqqBIXe3c1fKNGEMxFUw17dRSwqoyCR8pkNVAOf7lxYGmvY5TIIRbP0ajHj++epnCtriaUPPrBm9Wsxo3EkXO+Uy4lJ5bml0QH/iMmsh+Q1fMQuLe4HTF4A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6969.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(38350700002)(36756003)(66946007)(316002)(38100700002)(2616005)(66556008)(66476007)(4326008)(6916009)(6486002)(107886003)(1076003)(186003)(26005)(6666004)(6512007)(2906002)(86362001)(508600001)(83380400001)(52116002)(5660300002)(8936002)(6506007)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UdYxmboXOR/MCv/ToRtOCea3AeytdMIZaP0uAP8OVs3KzPMIEnLDqIBMWJKjsLxTQkcWnFDmXgI0UsJwbFCZbDk3CvwGDr8YWDa3ar/f+RudlOPxP9dHh0q/qqfSHH6QB9XuhH0V97Hsgk8yIpO/xaUQL0ptIFAtRviPRTRgrIgzUD3/tHha8eshsH4oWJHPTDL4lP425bgiEfB8HV8fiMqlDCdYG4IUdT+Gsx2t2etsqr6qJhXOlUCmaY1tQZv5Y3m7h9+vwep2mizf1yZU9pWSSGBxk9oPvX8wy9uIOR7GqbIc/ibxOsFV/21KpOECGaFlo4Rykfweb2/Zbpnb4iFjlYLBIJE1TGEcaLE7qGCJi1xtioUwGXIAV2SSOX05wD/xMz8Ku/x/Jo0k0THxi9+BDiTnQZ/1Q5WBJfVSiR2KydIU7o1bRu7IbcPhX8l5R53Ghs8H25QrUnrZzt/sr8n+OSYQmC86YyMZ+2GxU6Vli41LOzB4pA8VxASnXIbXKFRIyE31Lw798sPw/WAZ0YUk1RLoIgSXglgjE0xyjRZBEpNemq1JB1Q7R7uaSKRUOrBC4Uw+HYiXVSuS3qklv7Pqrw+WDHskIs6CupqvRP/nN6Neuwbcs6z5e7Wdgi/rDLpQLoNqX+tP0LaGDevI6zd7Z4dZbpcA2I2eI4syj5seDyISI4dWF+Nz+5JqLkLOT1k76ZrFxrJ0n6I/8ilsV7+9Nfc6HgOUIJfnQYldLR7FO3y+RfaZvUxnISt31YkuJPfcdUzk13r7DeQ/34il7yCbfkU/xiDztHdY2/q/jyx99cUQLRxHDuKTgu8zBFF1zKB7AfoE8evfNpjZh1v8TOFRH3GQvjhtQXLGvgMHQv66NU39W8mz+vi5P2IirYOGokr3dqum5bJZKW4dowmb8Svl99BbXk9ySyjNyIAT29a0eWowXijptb6dA+K6CyDvO2PSoFFBvBRGyL/v48uQMq0WRuNm6ceztI3ItiTVtjAWygGt0wdGjVAKaOPKmaZ/xs+N7sEJYuNZjz269YJguM8Fknvy5DQlN3426zB87chcNZqUqzQBiPlMYyKup6ylekWB3ZFhtznWId9Iq/U760BpKBiC31MH2oko63Amll2451EjEM0NWQZpC+TZ47neo1rrmPbi7awNHbo3HiYijoZTRsHjdRv7jHJQVek+kPxIjTN0HihMCBpareuzAh4Xjgt+vHhO0soMKW4wnmMDQubLrq2eGWof/dbJZlVA/bF7e0R1CU9f4mgL8FAJaGwP4g7+/YWJtOWiq4MuZGg2sC9nQA8NHZ1xoDMRFxrrl232INTcrU2Bw8V1SFTBDG8meEO3tV22Z8GF/+UYMLIdiqKg0ftOqiB4ulykdYa3v/LtV8uH8ZXuOXWlinu/FpRS9JQYxrHDkFbWSuPh/VbNKSxfdQLIDoNZppLJDBYqdD4Ps606RB387a4Gx7LjGagM85UO8FEMgjEJYoT4uDP2TfAFIthwII/aZYR2iNc2DYI2H2N4cXV9nTgvE8yG2ZruK5CcvbGy64H6Ebao9jWY+vD/cXnzizsdHYsiJWfXl/I4vzt9kVQaiFUPLCbznhb0OT6pe5pP6G45tCS7ly7Z7f/VVEmAd6lR+/TrhHlFiEk= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9b6b7a22-d5b7-406b-edce-08d9efd1103c X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 15:45:45.1611 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: eTJ079+GjmApR3zjrlhprJY9eZ2NJz6TZff+fsrHyx8HI590J2hA7iBQhscIeSG+TPUlFe8BtqwHIQK+Ma23bQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR08MB3929 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 14 Feb 2022 15:45:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/161715 From: Stefan Herbrechtsmeier Accept valueless keys in sourceparams without equals sign (=) to match the comment and support Boolean entries. Signed-off-by: Stefan Herbrechtsmeier --- (no changes since v1) scripts/lib/wic/partition.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index a25834048e..09e491dd49 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py @@ -171,7 +171,7 @@ class Partition(): # Split sourceparams string of the form key1=val1[,key2=val2,...] # into a dict. Also accepts valueless keys i.e. without = splitted = self.sourceparams.split(',') - srcparams_dict = dict(par.split('=', 1) for par in splitted if par) + srcparams_dict = dict((par.split('=', 1) + [None])[:2] for par in splitted if par) plugin = PluginMgr.get_plugins('source')[self.source] plugin.do_configure_partition(self, srcparams_dict, creator, From patchwork Mon Feb 14 15:45:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 3592 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 628FBC433EF for ; Mon, 14 Feb 2022 15:46:03 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (EUR04-DB3-obe.outbound.protection.outlook.com [40.107.6.51]) by mx.groups.io with SMTP id smtpd.web11.35436.1644853554743174786 for ; Mon, 14 Feb 2022 07:46:02 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=VhqRyxt9; spf=pass (domain: weidmueller.com, ip: 40.107.6.51, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O+dsDasFB5GOqLZzLIr/aLzasDXtV+fhNGFIurpn68XLKMlqhJV5RRLhEZ8ge7dNSLK2USWm+VknDtrZfAavrXrwe8V+LTjbp5uBdPixWIrlxr0LKSh6onuDCbxBFd/Cv4C+TvwPPy1mnEmahWO5L6ZgkouxQqhygJystzzRFY/a09yjOfxba/RchQRyUOrbMkeL4TgJusf88qMHeTg5++p3oO/GBj+jvfFfTTtP4oS8ys7VAhfhSEa0Y4x1E6x5pRM86PBN0dxuk5IwitosX9HhAnWbkiGNjw5It6xVJyqxhPGYwUlMsu0SYxjWaQFXhBVe3DfenUBx/NbJUReb5A== 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=SHIhz2qENzrE7FgaYoR4mK5qljFzgvVoNg7W+awwraA=; b=MuYLslz/IyRZf8JQwtC3h/lP3/LHh9HNoUXxIRZmgb2LCe84vplWWaVXlRZiD59o+Z8wsNmJN/QM0qCwV7MMuvdfP+WMQQw9UJq+LCcQKOuanta7g0cNjN+ZA93W9I0C+azgoTd5GxGFBLP8J46E5toiPxwwks/sDlp+8jobCmx+ad8sn75JdtVqr0V8ygX2H2ncbdRvyVqApOjcmdH9f8Br3SFDk+t179f+IVP6N0kGuyjadYypjzWAnN23nToO5STMadd6D1XrMZjp0HiUYq0SfMS4fUDlQjrTsZh891xCY80NxJ7AcMW6iDeTs6rPSVITojvbA+bzp7oz17/kcA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SHIhz2qENzrE7FgaYoR4mK5qljFzgvVoNg7W+awwraA=; b=VhqRyxt9YvOfH2Ne6i9zrlj1biLw5U52UjdA9GXOditJy//0ddpR0v6mgBFjSk53Lh+WJ094EBfADw9cim91ZC5mpxIGHECPUvNvtwYuyh8lzRtxisB9f0vSmRtERaeHvXAg6eHvEPM9Ohn6WqaBeV2c1p6AoLiedY9cnKDyfXQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by DB8PR08MB3929.eurprd08.prod.outlook.com (2603:10a6:10:ae::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.17; Mon, 14 Feb 2022 15:45:46 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::245e:139f:5d4d:1dc2]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::245e:139f:5d4d:1dc2%4]) with mapi id 15.20.4975.018; Mon, 14 Feb 2022 15:45:46 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH v2 2/5] wic: rawcopy: Add support for packed images Date: Mon, 14 Feb 2022 16:45:18 +0100 Message-ID: <20220214154521.26905-2-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220214154521.26905-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220214154521.26905-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS9PR06CA0257.eurprd06.prod.outlook.com (2603:10a6:20b:45f::11) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 110699c7-5016-49c1-7118-08d9efd11084 X-MS-TrafficTypeDiagnostic: DB8PR08MB3929:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:473; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hz4RPbUPt6BEpvt8ncTusckMdWs20fguNRARi+W/IBiy84Q8BZTKoK066Lz0KOPqofm7XOQfftcWXY/dlP7kNsQYN/QzEZ9fny3eKzAahevKKkuTzGA8O49NWXDJzKbxDgSpEAdH22acjYafRoLC80I7jApvEQIKLhWey6iRM8duIlT630kXMTovN3srqWTC2CM2Dl2+kIZgRz6HQ0OTJcxRG1ioSdQoB3CR6LGrQeNkBWhOMAYWSw4jU2b0Rtbistife1Un3YDluqXA3FU7Ofi3P1qYGPy7+vMffnBkW8eMU0EF7xyHvRSRhGSBO78e1icJdzSpSf86ohFgcFPh3m/quD034qyx2xdp/HoRaYmdLIJadF/me30wsb6Rnbe2+q8sV3qY1vHc22mgnI6UyCATRW9oXVXmv3brTmCrORl0sR8dJ3OmxG14cNqixg3neKbEjIhWGrtRvTOqmejBpwEOwdp8R36Pxgt3eEhWau7E99uecta26ko8Z79JlRXJ+YDvJ4UeC/IHTUXEf24vEpR8W3uQMhkpjHFRRYqwi4YMBqlAYleKE4harHfRrzI3NmBxFRQgIAGtJHvbSp7+sbDTQh8cixZe9bVP7rTH+x5DNxJRvmC2Av8bqTi+CxAZ7o/44o2MgKP//tfrm+QnmCqnjL6XPABWnF9/IjkySXl8S0gzgH/ptL73cBY1w+AbT35VupNtnl2tb2+1mBHpCA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6969.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(38350700002)(36756003)(66946007)(316002)(38100700002)(2616005)(66556008)(66476007)(4326008)(6916009)(6486002)(107886003)(1076003)(186003)(26005)(6666004)(6512007)(2906002)(86362001)(508600001)(83380400001)(52116002)(5660300002)(8936002)(6506007)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1yt+R0kDSrczA2mmrdeQfMKJpoGcYH/y7H2imNK96LarOns08hi8qXUzdTaGe/PMl63PCZXrX8f4+Iu5TAZ82pmLDeQzGydraI7OPHoSt+ZanZqcqscPCx3fDLa9oQr9sboHHQJsw+f2NfMqVFnOZBy19LW7XuV3a3G2BWv2MNjymsM/+JyQboa6S79l+ydsPz9aWico3evRReVOt1nxMPu7RruHnDg7DcVX5nfKyDI4fFI4vAJv7mr7lJKXYpw3Z7D/v6w/MFdn6166FJpZdQ8KvL7cBmjC2E05pCayZtBEdMtKQBFq1q5GGR0cbJBFxT53CREf4gYET/COV9UsZk8Aw8ok77CGL4uX2fvu3G1DgnPvhA4Xh1MIpFtR9ETGCw7QIrfxH2fgOV9jikz18fdAH58VxmzVd8C41i0jUwnCCx+W5fd5ScW4AsCzfvCnJP092Yugmya4RQteBmIHOv3X5q11pa8Z9HAW+zADUOMBgtOdOFWbYL1vHXuoslWq25fWGsy3+QlQULDLciOKQHXcUlAicQed5SoCfykOm/YGsrmpiqG+CBjyIhDZjiXrIREQn5EaFz557XY/4RYTtzy2aqQ9asxTQZJzjqyCSUNyzH+A11fcER2bmd/LSIindN2OTDjJ2RJQ+G41fy3ZIJIYGehKFmmO67eQN3XAj+6ZhueqV3mmTV8SNc/jkYOpmTAAFiK3OkTw+Iojwoq0ztQ79q6+SEvPYFn5d0TJ97badXTT13XC6qvpss5hycgtOUWls+/wJZs/G9GiJgtkMEDlk+Tr3b6boiZbOp3dkbbi6a8BWXtkiwsyTXApmMO+aOc368wJrekxLixPTYQD1oOl5tvHP+cr8CuUst6G9ocZndWWfSiy+F8J1ZRiiQwZi7xZF8XIw6wtKIE+4n3x0uwd6MAOetJDtFRKfY+MHl7N5VQqDavJRDSjbGE2C8xsBcdhnpSL+g9P3H6mD1+WVhXReRUEZbsfOrhitjdGIDYECWJLYZmuJzG1awBgWoDHygbc/GyoEGCdNhDt/B/8S7bAquGDWPvSIUYdFYzHvHwkBqnUb50qHS9EuNOl9dykmeOptuhJrSkxzVciRxdjCK5dXb7PSHyo6SVGq/hZd5MgVRyXU2/wnRdgBZTlG7X4v+/+D6ZEMgqoQVQJoeo3De2KePJPcG953vSaanOZzcvqoIWSLjkwQDvREwAZehAnPz2Q8Q1hRB1c9SgZyvoaGmsuW+lfjWKCdQOnFkHljTt5D6wB7XzIiT7oXPsIkKgRHePGf7lN6Of5KZlB5JteDzVAeKNG9D+C9ntIcpkZPT+BqZ0zgyyzeildIqrxt6s7RKZ22zKi4eXRXZNn1iPIUARr63rwx8CnTGPCZ76E9ZMhG8BRkPKKMq6N2lP/RS4gCUz80xpHjwHFxlVEzzw/R9zwIYPwaeWzqBxhpn0hvdSDeXk3x+rLJ/1uGLdvtvJFod4qJAWws9eCkesS0ZyMG4lbDnw4t/6rEmREop+LEAVw24bfscDQWcHqsugyka4sSwpwbfOr+BSYxPFkoaS/YiUULOypaK0ym9WiYuvYUMXrKFZIOb/nWBywHaemmmCuqrgOgreC9GwmMHFm5PvlYRfKrJfSnsd7SYnpcpmSCbE= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 110699c7-5016-49c1-7118-08d9efd11084 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 15:45:45.5204 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jjuQVGcV/1TiyyiT/Kj47ZSd/nGzdorUDMGu8stmkOz9zmr7uOsNpk7dFcfe/fC2kWL7IX4HJkkTbnf5OYPcrw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR08MB3929 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 14 Feb 2022 15:46:03 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/161719 From: Stefan Herbrechtsmeier Add support for packed images to wic rawcopy handler do minimize disk usage in deploy directory and reuse of packed images between wic and swupdate. Add `unpack` to sourceparams to unpack an bz2, gz and xz archives. Example: part / --source rawcopy --sourceparams="file=core-image-minimal-qemu.ext4.gz,unpack" Signed-off-by: Stefan Herbrechtsmeier --- Changes in v2: - Reword WicError message and add compressor filename extension scripts/lib/wic/plugins/source/rawcopy.py | 29 ++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py index fa7b1eb8ac..7c90cd3cf8 100644 --- a/scripts/lib/wic/plugins/source/rawcopy.py +++ b/scripts/lib/wic/plugins/source/rawcopy.py @@ -4,6 +4,8 @@ import logging import os +import signal +import subprocess from wic import WicError from wic.pluginbase import SourcePlugin @@ -38,6 +40,25 @@ class RawCopyPlugin(SourcePlugin): exec_cmd(cmd) + @staticmethod + def do_image_uncompression(src, dst, workdir): + def subprocess_setup(): + # Python installs a SIGPIPE handler by default. This is usually not what + # non-Python subprocesses expect. + # SIGPIPE errors are known issues with gzip/bash + signal.signal(signal.SIGPIPE, signal.SIG_DFL) + + extension = os.path.splitext(src)[1] + decompressor = { + ".bz2": "bzip2", + ".gz": "gzip", + ".xz": "xz" + }.get(extension) + if not decompressor: + raise WicError("Not supported compressor filename extension: %s" % extension) + cmd = "%s -dc %s > %s" % (decompressor, src, dst) + subprocess.call(cmd, preexec_fn=subprocess_setup, shell=True, cwd=workdir) + @classmethod def do_prepare_partition(cls, part, source_params, cr, cr_workdir, oe_builddir, bootimg_dir, kernel_dir, @@ -56,7 +77,13 @@ class RawCopyPlugin(SourcePlugin): if 'file' not in source_params: raise WicError("No file specified") - src = os.path.join(kernel_dir, source_params['file']) + if 'unpack' in source_params: + img = os.path.join(kernel_dir, source_params['file']) + src = os.path.join(cr_workdir, os.path.splitext(source_params['file'])[0]) + RawCopyPlugin.do_image_uncompression(img, src, cr_workdir) + else: + src = os.path.join(kernel_dir, source_params['file']) + dst = os.path.join(cr_workdir, "%s.%s" % (os.path.basename(source_params['file']), part.lineno)) if not os.path.exists(os.path.dirname(dst)): From patchwork Mon Feb 14 15:45:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 3589 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 630D3C433F5 for ; Mon, 14 Feb 2022 15:45:57 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (EUR04-DB3-obe.outbound.protection.outlook.com [40.107.6.51]) by mx.groups.io with SMTP id smtpd.web11.35436.1644853554743174786 for ; Mon, 14 Feb 2022 07:45:56 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=VrTZm8x7; spf=pass (domain: weidmueller.com, ip: 40.107.6.51, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e+HS8BP+QBdZMWzUMiJqsyal+zXMXtA2Ao7VXs8mddWnfB/iIHs28JbcSnLSaAMAtSJWfctv67XQKDkcsalwRwdoFDWDPQHSD797bYu4pM+rOqpuYL9VgxzMRm3JgXmvhk1M4NEWb6id7A3lh8OriqWbyNHCl5nK677jIGbPleuAD7JguGjUTRtt2QBGxfZJU89SRdUE2Z6yzZRMjebM3G2NIYrKmlsPHlaUMKRSWsbGdbUvmekMtnWxjwfF5//VHAm2ad4rxdLKWUjW2brRuxZ6f7KFVIrD94h7NcV/lZW7xjZIpIei44Rr4qZWDTeK7g/7urKie1mD+xQoMr5pLA== 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=q9rxBzd+VfEGAbo6ymefkJZbUJY/YA3dLyrhDG2qqZg=; b=LPs+qvFn5AgJaUcaAe7evLJ0RHVAiUv0u4zRi6WiBaIwpnJAg2WjvgXyMriGGMPzKCVzLeH/xgf2aeyY8Ol4g6dXqps1Wr6WkZxlqqEi7kqB0KJ7w8hj3qvIGXp1k7sEgLNRQ7I4yzaVUsvc587aRKlhlER3fx2iVoCF6yN62Zp4QUvEv8VGpLLDJq82wPPpswWvDirHlc3rk+AvP8UcSqxDXEmn06Gp9lpZaXbW7Zz8VqxI/cPkmS9brdxfebNrO4S1QuhwdWz2Hyat198AKJawZycoE1MTRSBsaYbPCx5W26k3z43htj92M5NRXUQG8d8LJ5PQY7x+7iM4Yq703Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q9rxBzd+VfEGAbo6ymefkJZbUJY/YA3dLyrhDG2qqZg=; b=VrTZm8x7Ukva8DMD6eFDGs2lJs3CA0PXFlS1mQN8XbwI4nRtyTCzUwk8J3J0OP05HH8cDteenio5A/Yx/jByqM7vdL9weoYrfwp0M+pTzOje+VFwa2IPltigSTw0oaOLPsMWI/Cw+tvVZjCEHFtKKOVFBDgaE9Puh+vjz04I4aQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by DB8PR08MB3929.eurprd08.prod.outlook.com (2603:10a6:10:ae::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.17; Mon, 14 Feb 2022 15:45:47 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::245e:139f:5d4d:1dc2]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::245e:139f:5d4d:1dc2%4]) with mapi id 15.20.4975.018; Mon, 14 Feb 2022 15:45:47 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH v2 3/5] selftest: wic: Remove requirement of syslinux from test_rawcopy_plugin Date: Mon, 14 Feb 2022 16:45:19 +0100 Message-ID: <20220214154521.26905-3-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220214154521.26905-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220214154521.26905-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS9PR06CA0257.eurprd06.prod.outlook.com (2603:10a6:20b:45f::11) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 16d6646a-8a0e-42ee-44a6-08d9efd110bb X-MS-TrafficTypeDiagnostic: DB8PR08MB3929:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:211; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tGgKe0MX/aTKDIok2fqFCmr14y26SxFNIzlxRkPovbzcCRjFjfky5KaeOVekmr2olhu/JySZXihOvQtrTofSWaOSUYQxKY0F9Nqjtg8GNYEkA96FY78jKCCn5E0GapRDOAEt9uqBpWM+Iv773vzC7qeom25PF1LmuAJOJuKpL5PZfFjb4LVP5Dq0sps/DRHY6oeuowQ+ZYwwkwufBenVzjRJuIw0paVB/LDbacUGED8zg7YCbKkMyeec9MgOqbiOz/NfhQ+J/kUDZuVwPYYqRklwC64OISwvTImqfSiETI7rCAHSCRclpYZnaMuIOHjl8dfSQWItu48Pq6j5Oo25CO1QFzXwj5sM3zuXEyWqMUaUpxKz+vvmJ+DxuYX+0YRk6rrnnUMerO7w6chWxKySxdWLPR1FwipLVgNTqh3AsQWF5szzwHa5/3FyVY21yg/1yNWSn9cvt0ZiVq8aRM6Q5cWggwFunzfRllz049UaUxMfuklfpbl4D3ktpPZmYEmicohRzLupFb6/tDzBXT4YVxO+oIPdv656N4YSLayYGFMvbgf4k/uLtWix656vu1wjkSv/LRhjgiUYtPdF4XstjrkkWqhQm93pBViQUossmR88wwAYW/IBouJZtaFQYPSVvOvAU2a00XtGJ1Jg4vtMU/0oDssCrzmYRwtmSFZlC+uwUa6c36d0ExNcWKIFudfolPfb1T3xP2voWE+E7pa9bg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6969.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(38350700002)(36756003)(66946007)(316002)(38100700002)(2616005)(66556008)(66476007)(4326008)(6916009)(6486002)(107886003)(1076003)(186003)(26005)(6666004)(6512007)(2906002)(86362001)(508600001)(83380400001)(52116002)(5660300002)(8936002)(6506007)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: O8GFCV0ednKzd67Y8xnA88Y3rDIuQaTfZCyzOwuxrzwiua9RDEs8opQ0qMZufDO2KdIfqMSVPjqTHcwVAntbgioNYeFD0Nl0/8JocCTZKd5Sts438UC9qcbkjTCUjimAILFYiGiYrY7KXhpRZQSAnz5IUhMGxRzks+1LEybDjXg0zz6mKkzEQpp/LuN8r5BV19AVayx97zCFckvHZeT9buqK8zi9aKCrKO1n493cUX40UGbQvJPJJIwGVz+BaCIelWz83vogGQg/m26EmpSgrYrXaUsGv1N9CD+aPeNZZ7Jp9GDr6Yx6stKHzR4Enw5ROVkrYQFls28njgpsslEyybwRyLwsM2bYwuKqDvO267m1mL6rcKFM+t6BMcH1ADwPpbsqtpm31z56kfdCDdz1oSYUFVxmIaMlqroISGDRxetQi3RDYFcICFmtseY9XMEG4EZaAkifE53SNgkKjDXAF7Fsf45PDXOj947wej8UKmQ7xS4caSwLe60gl5tx1aguuZqIONNe+CrMpoF9jstkdmfIBCGOANYXuBEp9Mmiln32Bipi4obzod/2DTz47smQrObso63zThQJzxRrxt32JuBmlD7LIvFAfhq9DJvaF4R315z/g8UBn/7ZbOgPuSo4Hw/qkqOVissCIdO7eYtpflgPqu+MOoWTWUFuGgcnDQu/cqQAA/nqzVPHpDj0+fi0RkI2h0iGW0qpI/USy+VJFuXp6sDNhldKxFhPsWcEqCGtz942YDINq9f6U7f7SA8Cy7THE5+MgK+41CCgwsKk3wplKLCi782O9qBQrjWQfz2Eod8HFpmWkUabUv+Za65hdrz7h5YvBGbrs5iwfRXDMTwIfQRab+uPtifFvXx2olX3mwF7Ie8HF0kVNWZVdHfDw4ngkkqlTg+cRZ20K7JUMYJxZQGQT+RXZvUgbJXgzm5fragvlnMMNTyAs4i24GsMZH/uL/WrSAIxlvIwmBkrN+xqz1+8uvjHeLj1SrnJsXRx16KgMQIim83FuaSNlUpjJs8+N9k1xwqPHO7SG5zJC3rzQIw+5E34DzRLDehmyq3StbPC8CcN5OwlyyxgFWExqBmQcdOYjQDsTDSmauHdGqJGve56vWvAijUeAUcli/QrwZaGCMt+/VbJu+XjCCXd+La0qdq7lUQBX7tzWGQOD9aW6oQaWdEKcJOLnu9vgxj4meZEvJXFfiCNVRtb7A97rxIZ2+ryjn47NlgiKS2K2x0r4KuZxkK3Mc+Srdt5jO6hTsumaDlOqaHNL4xLxwicGeZl7ZBF2TfWSHvfkleDvqfKdjaok4i3bRZqp9ec9QI4hI0SL/Xfdgf2GDw/SgLYJPIHiVXu4g9hBtW4vBm8ilesTblSMK353co1RDfj3cGbGnU1Q23aTdVb4UTDgOc8QfvtzoxPWqrxDiNOaz4xmKKwnvHiZNwdUn+PsyZ9tlcxMSbVejh3yFiKtUS2hez9pT3+vaSYHbofPoTYVE8N5TOcjlB1urLPq7Q4CK3ayficgMHhg3DSmU3dXjU5WouuwIKbEPH/NoHY9hKgLmN044YPMvXUhE4jTjVxXcFQh0YWgwBLf+TmxwVEdEgsi1hCIGm/8vLyVQOH1b2b0wkqQhxAInNgQ6wRrlDOcc/nCLI= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16d6646a-8a0e-42ee-44a6-08d9efd110bb X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 15:45:45.9578 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: KehtT34xyQukSzVTGfppMLZN51KI+FCZVLPL05xN1eWakYv2su+HuxdhGzDu0EKWZVPVpzP4AUeHuApRtfdehg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR08MB3929 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 14 Feb 2022 15:45:57 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/161716 From: Stefan Herbrechtsmeier Remove bootimg-pcbios from wks to eliminate requirement of syslinux from test_rawcopy_plugin to avoid the following error. ERROR: Couldn't find correct bootimg_dir, exiting Signed-off-by: Stefan Herbrechtsmeier --- (no changes since v1) meta/lib/oeqa/selftest/cases/wic.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index 5fc8e65142..96b3e1b6a5 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py @@ -1070,10 +1070,8 @@ class Wic2(WicTestCase): img = 'core-image-minimal' machine = get_bb_var('MACHINE', img) with NamedTemporaryFile("w", suffix=".wks") as wks: - wks.writelines(['part /boot --active --source bootimg-pcbios\n', - 'part / --source rawcopy --sourceparams="file=%s-%s.ext4" --use-uuid\n'\ - % (img, machine), - 'bootloader --timeout=0 --append="console=ttyS0,115200n8"\n']) + wks.write('part / --source rawcopy --sourceparams="file=%s-%s.ext4"\n'\ + % (img, machine)) wks.flush() cmd = "wic create %s -e %s -o %s" % (wks.name, img, self.resultdir) runCmd(cmd) From patchwork Mon Feb 14 15:45:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 3590 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7512CC433F5 for ; Mon, 14 Feb 2022 15:45:59 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (EUR04-DB3-obe.outbound.protection.outlook.com [40.107.6.51]) by mx.groups.io with SMTP id smtpd.web11.35436.1644853554743174786 for ; Mon, 14 Feb 2022 07:45:58 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=w85CMIIx; spf=pass (domain: weidmueller.com, ip: 40.107.6.51, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LlQ7LL9Hu9N4TxRBR5wM2Su2dfajHCWAEDHHAj5qEOFeekWaT1+WAqMk7WQ1bEZ6qDTxp81oToNZyxbAXr09gmqWyZq0BPQVqb6uyZx2akFi+2zEOcG5eqfPc5V0+AVNKb/Bp0aRFwcGMELFsampLgEEGh4SfSUbD9dI9noHBQwrBRFgi8UYc7sckfodu9vxlnWoHUlzHM1j5xP/IXAXU+De1JiQ5hj3LebWIi3bcR+alrVaICkg5+rfFKTgGzSVY8dJfjIhgj3fldtYuWkKrwn5ml+3UCokKLnO83BrBGoNgjA/teNknJEDrWDn4TJ8endRQT1Dn4K0ye+1ev2y1g== 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=H015rxYuTwdZuoUN7PPaClfU3RIT009aqZj3G6N0ba8=; b=VnnldICU+HzDHc8USAnl11Wxbeaz0uY9/yK58HCJSmhzVX7bAjG1CtVAphp+oYjLsetFzfLdb6/xHVDFeWx6jyfaH96J7IPszWcGVjJvHbc5UWP+fkQHBDcjFrviboyzhYAcLc2yASn9oABw4ji847cVa1LmLLkjuRChs0SETISh9glGo8TthIpaZp5r5sf451Lgkeqtz7YLNMUvrTfIQ9rKxiRuiJaiN6dq6USeCrSrJp1mMMo83o97j8o5XeOuqGyTfaKOJDCm35Jwroh2UvwTlr7kVCvP7AWwrmyiltM71V+6BkOGvCZkCRwlY81Tf6iAf5CPB+lxNSC9v05fvg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=H015rxYuTwdZuoUN7PPaClfU3RIT009aqZj3G6N0ba8=; b=w85CMIIxPcm2x22Asp8/ZHB1sBbcglXFCPEhjAfOOBtC9BSMo2XYXi2irkPwcSkNQZdFDM8luHShHJ76triThuLPiyNHb0vqu46kFye+LspvlceNywRYJr/whCw5eSwNEpKr8nLyOsurR6dpD4sxQxmEqHlkUierkx583surahY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by DB8PR08MB3929.eurprd08.prod.outlook.com (2603:10a6:10:ae::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.17; Mon, 14 Feb 2022 15:45:47 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::245e:139f:5d4d:1dc2]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::245e:139f:5d4d:1dc2%4]) with mapi id 15.20.4975.018; Mon, 14 Feb 2022 15:45:47 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH v2 4/5] selftest: wic: Add rawcopy plugin unpack test Date: Mon, 14 Feb 2022 16:45:20 +0100 Message-ID: <20220214154521.26905-4-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220214154521.26905-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220214154521.26905-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS9PR06CA0257.eurprd06.prod.outlook.com (2603:10a6:20b:45f::11) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2e33ae8e-3a84-4a99-0355-08d9efd110fe X-MS-TrafficTypeDiagnostic: DB8PR08MB3929:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kP/HEgpvsMuesJDyAgepPVXFG4e4OwZ+sQhoVN9zwiGN5m0uAk8xUrl2mJxLPQbZTlTIkRynXnCb1jmyiDnqbCdaAAojDHHdihUWeYleWMfOkTSckLnw1Lv7WcdA3jYoPOIk9CjXiWha8SY+LXAkNpOv9W8wKWa/wn1ujL4LqYfxLvdLM3EFRZbHdXiwkL/cL2VvMJaZxWpy43549c13ByMZYhpvfi6oeb4633rI3S7gQ4mqRsU3E4uwRn2TMcpNY1yZVYaYcxYuX4AiCIITJBW3LFp/IgooB7rd5JBgB5jVQp+FmhYd1U/jIfsqsR3d+nOpV5UqfwKpYJjTVYYKiPxYUnwWxqqSGAxLyuFJOMaVGmzR/xvIOl1bS4bD/hQVrJpy9hmpjvANd4f1kR0LfepgZkdGZd3bZy6HlYtAQn3k9WOaCwuSjbK3i+0sc344KeiJeXAhe2HQCNAKEB59ynieNqNc8hJy2ykhdKrINhkHNHeIo4ERlSGly65JgOH3hWreYpLm8qagKvzGrnToyfq4VqDXyRtjL1DuLJXx3Wk+EuolmEckDJ0M1/9QjsuV1eoYsa6pOXzY1tbpifLZ71aGYIgXVpBd2OEPaEmyDRhGDbFBALy3p4TxVFJtX9Ezsi088WLHtBzgf0jOBe+Slv4uxpQ7LDjsYpGb+CRxPMCKXwb8ARhA+0Uk3vG5ffwuT6NIFw+DAFxWLkf+ah0IJw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6969.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(38350700002)(36756003)(66946007)(316002)(38100700002)(2616005)(66556008)(66476007)(4326008)(6916009)(6486002)(107886003)(1076003)(186003)(26005)(6666004)(6512007)(2906002)(86362001)(508600001)(83380400001)(52116002)(5660300002)(8936002)(6506007)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LQs1pJc2JcKQpzSY4wztQEHLJuDKcz8xy9oqM8XCUQW6HqIwRB76hdloxbZF2FSzgWkLRVdzPVvdLTEutztY1FFnNFx/4E6sIJDt93+M3i/FgRLZVIL9q5I5VREfgmSTRNpcQ3VYlok6B/w8K9nmdvjIreL+njI1l7cWvtetu70QACGGLBE6O6yYFM1lNTSWQTj7byWylLtdF0zNu8UI97JOCa+STfuJPhWsL6s7PHn4gSfwl421gH3AUAdowVtnFxfgM4yGBHi1yp05F7j57rnYSeaC8kkXIa8EjDxAkQh09VdiFvhJaRBHwSFwr2cq1ytHUjoMqs9U7nsHZnTaOPohNJT8RIQJWte58IQOwVX/47xi5Yq5WFwgAMlt4E5nu7RGDIcaO2YMjMLXKNQSTebJJrD5HTGvj8CwSIkYcyoPUB0+9hWLQQIR9vQx+lsdKUswYxqX3IPpiK9GNfVS4goNS0+t7scVxRFiRFKeV+9jltQAiduJXpIUw7gn9Dd9BVHXDdfThzwXAYlSgpy87y7xBrR3KjEDYNjX1m7k4HM+Bhtlmry74SCBhfGcxu2EaXC/u9tSg89MiqyMTJcVskZ2pFnBip6jeHk3A6VrsMvyFuGCMTIfG3Xv6lOwCDxKDxxBB1IbAJI72c6ecld72BYwlAL58raRbYgG91HFuC10hz0IHRwyx7viAq4Te8nTgxk/1ELTRhEejPUFgEPsxJZ7M/gmpffvrkMKaEuqgO0gKKv7hwG0n1mpTFg+OU9SNlXSTJF7I7RbMOzvp4Br9SNIyHLX7lV+eGOlWvPC/B7cgGWW6s8RxJT/q5F9C8ddeDIuqmxVfcRGAPx1gnpNLIWUGBad35cTp5zSqDf9SgYHcJN4y+L5HsefkGghfQR7zPBcudhaj0LZNLJfRmUOAO+TNIxVEN5yXXezbzjaT4+ZiQwWHaUNCy1fWNaFTM8tKvmR5T2BhlSSuEIE5P15rxBYzhyY7zZrHdGy4qdGoNsiOKo+zKEI0ed51gXEL54Z2KRbd5bPxAJUqZ4SRbgkm1McLXCBb3xNjsBEwKUe25FQ97bLfN1Bc1FvLdHYD+a6h0mcdf8BcjHwGzxiIwLsp6G5jnD8pbM4D0AMnjvgvAqfaB5tOGfOvXDxJhxqDLz5uMj6+ApAWl1iPgndcwJShdYNBiCFkPQKdDd1zfkdKFecEi2ppiYqd2+9zM0BXieLxxUGfWQqvlBQixPoa/nRroRpmYeL1RrxO6aRNAp5ELu1AYc7fdkbnb2KMvhLcWasLjewGqgZXI49SS6zIJPDtiTp6Sv91EUBh9coOlmqyKQEjq/o1s8PfunoCF0qGFueXuaZQH76LZmjLlTqTTaczjdIEMNpicCXUYD1h6gP8C+vJnKDISv0JZpgohVhT1m2uo71WAVkaM8hRiD0tjJ4w8R0BU3LUqxuxtURAC488K6LWVzV6vGFauYhaFAWnE/RyJ4VZrRes7/YWIL+p8zI6nqBg/lcv6F5q6wUJoomCFM395+kSR+fFIcex0VzgwWaJMEuTWp5ddTg8xLMZlanOUWg4hT1ZoTnC1XXWUuIXyBExHHpftS8SPdVmvRU50ZMCbQiXA3XMpNNEPEkxMkLxaCKCiI1n75WUuANhXPaRoU= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2e33ae8e-3a84-4a99-0355-08d9efd110fe X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 15:45:46.4889 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mMtjnyqntj+XuwtKaDrbORPhUYh6jHtMi/E/POGOwWyYHvTnTQkVHMEY7jRercfw+CJXnvbwt4TjoYPhC73w6A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR08MB3929 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 14 Feb 2022 15:45:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/161717 From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier --- (no changes since v1) meta/lib/oeqa/selftest/cases/wic.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index 96b3e1b6a5..a021f8d84b 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py @@ -1065,13 +1065,14 @@ class Wic2(WicTestCase): self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) self.assertEqual(output, '2') - def test_rawcopy_plugin(self): + def _rawcopy_plugin(self, fstype): """Test rawcopy plugin""" img = 'core-image-minimal' machine = get_bb_var('MACHINE', img) + params = ',unpack' if fstype.endswith('.gz') else '' with NamedTemporaryFile("w", suffix=".wks") as wks: - wks.write('part / --source rawcopy --sourceparams="file=%s-%s.ext4"\n'\ - % (img, machine)) + wks.write('part / --source rawcopy --sourceparams="file=%s-%s.%s%s"\n'\ + % (img, machine, fstype, params)) wks.flush() cmd = "wic create %s -e %s -o %s" % (wks.name, img, self.resultdir) runCmd(cmd) @@ -1079,6 +1080,17 @@ class Wic2(WicTestCase): out = glob(self.resultdir + "%s-*direct" % wksname) self.assertEqual(1, len(out)) + def test_rawcopy_plugin(self): + self._rawcopy_plugin('ext4') + + def test_rawcopy_plugin_unpack(self): + fstype = 'ext4.gz' + config = 'IMAGE_FSTYPES = "%s"\n' % fstype + self.append_config(config) + self.assertEqual(0, bitbake('core-image-minimal').status) + self.remove_config(config) + self._rawcopy_plugin(fstype) + def test_empty_plugin(self): """Test empty plugin""" config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "test_empty_plugin.wks"\n' From patchwork Mon Feb 14 15:45:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 3591 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 62B6DC433EF for ; Mon, 14 Feb 2022 15:46:01 +0000 (UTC) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (EUR04-DB3-obe.outbound.protection.outlook.com [40.107.6.51]) by mx.groups.io with SMTP id smtpd.web11.35436.1644853554743174786 for ; Mon, 14 Feb 2022 07:46:00 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@weidmueller.onmicrosoft.com header.s=selector1-weidmueller-onmicrosoft-com header.b=OJPvNiVX; spf=pass (domain: weidmueller.com, ip: 40.107.6.51, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UF2QkAZ5v45em7Zq+2FMUJP7vD+USbpS0wpe4zYIwhV/04FbC4gGL6vHGriw8+M6GVI0OQF6K3hOUp6Vllju/E43550IeCRBlq0RULVxPIv/gJtacfTrxhZ3omsH9hIf4ZoAow7I9aXmHqiKQggPA3GFQsAdRrz8188W0XsmtlmkBIccsjpH01SGCMR1R1nDuoedkXqCT/aglReFXmNtBs7b0zwceo426Dn0BWWFwki6P+tew1vMgJ5Ep5tH/+66OkGCzZmVUG0QMCQ33UrmqdrYlqB+9OfBLhzdtD9BLaOGgZKs+wWDjaV8FfpPYoc4eAcWKMPjqJdspNsido74uQ== 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=KTrpHTQR1DR2BcA4qbEZIdP7nHkjWK7foZ0Gd2FPqYg=; b=VcofF/1/+GEvmX+Vn0Of85nmnJGedo6inWgW1pJOC/z4flzlVTzg7rYmnYYANVfWn/b/BzXLuivu9xtPQBylu1zHZGHI7GW4E24yhU64dddn0seV5vPgb2NbSicASgNN8u9JpXGIfikTn8hzc4PMJeaSzO235XuF6oNWtsZBpS/k3A2QBdOyR4pcUOdPs/QAt3XtPxH0kJ0pl41DxsDqchgWtTQv859NQXzVgs+nTowJUXz5UuR1eyi1e83B+hcgTCZxiBSVAEGbQib4uc2XrCZoVn9IPVi+Rg0ub2KYV0V8CPgfC/hfqRJZSkg+yVsmZoHWmFg+bdjV2KT6kpNbRg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KTrpHTQR1DR2BcA4qbEZIdP7nHkjWK7foZ0Gd2FPqYg=; b=OJPvNiVX85HQYtCl5MQDRMpWDtRMqjIy5oKHuhSTIPfCF3+YKfMeyTyoJif/Ro+dXyKH8wI1vozTzgo2/h8BafPals2TwLxWao9/dqtJ3ox5sueXb2x5CBYtOvX1XX49VC8YbLvb6Gau+872mZuLbi+SlIkA3U0Q8xey0RBrEXY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by DB8PR08MB3929.eurprd08.prod.outlook.com (2603:10a6:10:ae::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.17; Mon, 14 Feb 2022 15:45:47 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::245e:139f:5d4d:1dc2]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::245e:139f:5d4d:1dc2%4]) with mapi id 15.20.4975.018; Mon, 14 Feb 2022 15:45:47 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH v2 5/5] selftest: wic: Disable graphic of qemu to support WSL Date: Mon, 14 Feb 2022 16:45:21 +0100 Message-ID: <20220214154521.26905-5-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220214154521.26905-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220214154521.26905-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS9PR06CA0257.eurprd06.prod.outlook.com (2603:10a6:20b:45f::11) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 451086e0-44d5-4880-6648-08d9efd11153 X-MS-TrafficTypeDiagnostic: DB8PR08MB3929:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:758; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DgUHZaEVUFDEfk4JAe6X5t7JSaceawv5ONMJMasZATK67Wbu0BNBZKAolXPLJr9MWZ0zzix+X8YwAwnQWp5hr3o2Zrsx2Cu5Oa4ij2lxZtpoHdFpH+2CiONQhsGLZ6J48H/lyC/bMIZ1gxmavMIa3Ym2R6N6Hv6Fg2rmJS1+XJRme147r27EgyRsRSc/plB5W1N559ojy9GcKocbNpLGycO66qMG2TiL1SuMTuVWodI4l85R6OIZekSE3ZQ/ZpOuwZ3xv07ZbnCwOmaTgngMIFSlygPV21sqAchYkWOiJoKBzFvhAqwIVYnixKVpyLJo3N2rGkQ5OYEnT8/CjGMF8qZNTeiA6CaO6aDtcVdkSqC4gbHPUbFizD5nx7kRryUpBgi0FR4lbHebZdW7xi+hz8Vob7+r1lvdyGD1Bw5HPoOLKXn/U8ot8xRmcMtYMVLtzF4q7H/A+kNBvasg7aEavNPFj6BMlfpbWGv/OxTQeMLUybbJb3hLCJEA5ho5bgJ4Rli35Oa9Q3Vdqrl7nrnZSPEMMplwbM4TcQDyUrXiTxptHqWcvcsat+GI0tdNI3ywHgfgRPSgTCSB57ka0iPWfYrKpT63llPssn3RbH7oApe9j1E+aKTwBc/UIGpKkcHjXUITmj9giogJo6VILyvxP5FsarxYqs7avN7jnDhNM9UEhNN+rmWexmnyYON8uOxNqpxD3tojJssa8vzsHjx/mg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR08MB6969.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(4636009)(366004)(38350700002)(36756003)(66946007)(316002)(38100700002)(2616005)(66556008)(66476007)(4326008)(6916009)(6486002)(107886003)(1076003)(186003)(26005)(6666004)(6512007)(2906002)(86362001)(508600001)(83380400001)(52116002)(5660300002)(8936002)(6506007)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: n9keOCjt7WHXKhkn6xrV4Ea57bjayeWxbpBLSh0rReEcGruS+trVBlRpJ5LOApaEyoTrcSscSNTS41I1I9F6qDbNmU4zgssjkbc+iqpc7/CoNk1tFLKGhKUm430ntl1NshgT/dh+eOI6g4wbM5fm17+8NDgveB21KMQ18wYXQMLwSXP/QYGWA8mgLWkmpgUhps2y36OQsk6Z1dHK7RSbLt1RM3XMN7rFmW2sXRiNc8N2rJyACIrUORBDwenJWnTMJO10tAYW3/SlrEBTzp8RBfqz2iNwIL9/dUkD9aAc2ekrCcCbAeUPysF8uPdiqNRN+IPL3F39UOPRKF7ELjFY3uaclNhbMWc2fppXyU3n6Zs3dW3b1wzGIBk/9IjPFPfx340h/PMxcU6h0bCclg8q7ACuX0Mm0WYBuCl/bHKfI1l1VW7r9vIL9CDMrBpbw65tD8petG1zoILIT6kv0VetPqX1T3gnzFARrasyljC2YEwIlJDj88H7IIfa4mw/zauwoXeZ1ywQdP30cJ4rBb2LROV02puaA8j4hVIEKzKz25v7MCVywzzk0L31yjLPkQvVjT8ooQo0c8KVaEpXB2uO4H6CNu90rPPl/rKmR64wciF1Gjnv9lJZYhj7415FNKiRtmvLMMA+ZU7ZW2Pv0dhb0FDX/8bm8g2PlT1rDBK9mMEPjsMr4sLZe3TRxOsFQwpx/kLM7P3CgATJgOhGlgKIydj3zpAoVQK+uLfBHHGwbbEAyhsIZlHYU0SuJsTlMy31m/IV6rMHwErKwaQRfNJRsuIcwQhSskukH0TcoVN+FLe/4uPlu5ZruPvLE+YNrl4mFWwa0P1d2q+jOFWE/lm5iLzUsxr+OlRPTpKL56yg6KWmQot7X0EYtX1ShXB9+RDhacS7dI0D8N/mIS5qq5AJxrtT/KOolLdUaKoIqvkWKFyTilPffcNuLkHoY41toW/UFDYzkVpqNrf54/5sDLPo/IWc2DGscOuSAWL+KdVRZzGWVr66fatcNQ/ewH0vCx/cOrjIXXaTfkYBDKajRN7La0odF35pyBEYirP7mFNNSVzFVkduOoqUaTzClW5j+WAFUIIxUvcKYTYv6vG5eV9IyDjEcJ8cX0v5lI9p1L0rzgfq1gt+8TARQWM/wKMMpZrIxykfIAZyyVtu1aO4nxQ3l8Y8QNeLLPvQmvmN/9H7dPAZyqxt9hohB3NUlwOAu0qD8dkcdC7qLW8lyQdC5EisH+lK0CpnxAarRAyOPDEIuTRS3WradQ5/uxkBaMKNIP0YHdRHhhHpaMLV03IXxUivbG5/p24vs5EFsUW3p7CL+4F0cafLiQfs15bZROL27mK0iROt1HPHhY6WTGsWCvDxnuGJ7LpVxlboY+S44maq1tsSrU7kwDyXi7YRGbHYLZQ1MdVWuST7FTujniwdu1eDMw4u8Pc2UrZzG+MEbBapGpAp2jAj7S5MRr62r/Nb1B+fAHhuOQZspPyKLRnRoezNX2UTgFZKHBZkZn4kSNY5OIunvOw4NrJXSuYpbVhKOCqegukschZkVQvVnRfeV5rxdMDB5u6V3w0I4JRptvpgxXjFU8z8pbSbZn/G/lPHhDvCElT+DCWi4n9A4Gtz+wY6IU5Cr/VQPGW5n6NYwONpbMc= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 451086e0-44d5-4880-6648-08d9efd11153 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 15:45:46.8953 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: blyEeHIqLBPnWqPu8jji3YcGzPkkxvitysDLgQM0hBQn+qkOHrJuRbfCaI2lwH/cjnSGKOa/8PF2tZ2gfjNYiA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR08MB3929 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 14 Feb 2022 15:46:01 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/161718 From: Stefan Herbrechtsmeier Disable graphic support of qemu to support qemu tests in WSL. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v2: - Add patch meta/lib/oeqa/selftest/cases/wic.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index a021f8d84b..6f3dc27743 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py @@ -851,7 +851,7 @@ class Wic2(WicTestCase): self.assertEqual(0, bitbake('wic-image-minimal').status) self.remove_config(config) - with runqemu('wic-image-minimal', ssh=False) as qemu: + with runqemu('wic-image-minimal', ssh=False, runqemuparams='nographic') as qemu: cmd = "mount | grep '^/dev/' | cut -f1,3 -d ' ' | egrep -c -e '/dev/sda1 /boot' " \ "-e '/dev/root /|/dev/sda2 /' -e '/dev/sda3 /media' -e '/dev/sda4 /mnt'" status, output = qemu.run_serial(cmd) @@ -871,7 +871,7 @@ class Wic2(WicTestCase): self.remove_config(config) with runqemu('core-image-minimal', ssh=False, - runqemuparams='ovmf', image_fstype='wic') as qemu: + runqemuparams='nographic ovmf', image_fstype='wic') as qemu: cmd = "grep sda. /proc/partitions |wc -l" status, output = qemu.run_serial(cmd) self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) @@ -1059,7 +1059,8 @@ class Wic2(WicTestCase): self.assertEqual(0, bitbake('core-image-minimal-mtdutils').status) self.remove_config(config) - with runqemu('core-image-minimal-mtdutils', ssh=False, image_fstype='wic') as qemu: + with runqemu('core-image-minimal-mtdutils', ssh=False, + runqemuparams='nographic', image_fstype='wic') as qemu: cmd = "grep sda. /proc/partitions |wc -l" status, output = qemu.run_serial(cmd) self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) @@ -1119,7 +1120,8 @@ class Wic2(WicTestCase): self.assertEqual(0, bitbake('core-image-minimal').status) self.remove_config(config) - with runqemu('core-image-minimal', ssh=False, image_fstype='wic') as qemu: + with runqemu('core-image-minimal', ssh=False, + runqemuparams='nographic', image_fstype='wic') as qemu: # Check that we have ONLY two /dev/sda* partitions (/boot and /) cmd = "grep sda. /proc/partitions | wc -l" status, output = qemu.run_serial(cmd) @@ -1180,7 +1182,7 @@ class Wic2(WicTestCase): self.remove_config(config) with runqemu('core-image-minimal', ssh=False, - runqemuparams='ovmf', image_fstype='wic') as qemu: + runqemuparams='nographic ovmf', image_fstype='wic') as qemu: # Check that /boot has EFI bootx64.efi (required for EFI) cmd = "ls /boot/EFI/BOOT/bootx64.efi | wc -l" status, output = qemu.run_serial(cmd) @@ -1418,7 +1420,7 @@ class Wic2(WicTestCase): bb.utils.rename(new_image_path, image_path) # Check if it boots in qemu - with runqemu('core-image-minimal', ssh=False) as qemu: + with runqemu('core-image-minimal', ssh=False, runqemuparams='nographic') as qemu: cmd = "ls /etc/" status, output = qemu.run_serial('true') self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output))