From patchwork Thu Feb 10 16:17:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 3495 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 AF691C433F5 for ; Thu, 10 Feb 2022 16:18:09 +0000 (UTC) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.88]) by mx.groups.io with SMTP id smtpd.web12.12556.1644509887047822028 for ; Thu, 10 Feb 2022 08:18:09 -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=XoeeRLM7; spf=pass (domain: weidmueller.com, ip: 40.107.22.88, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UoHH8y5Rg9WPDT8Lkwy1pxBd62KIYO9bNg8dubJQcHoaN6WKYHzVljn1SPM2DNr+XOJcpVVx85hObAHOZ0b+vnj1Ig9cWP6gkN0dEMZ1fzD/dwJNOkfQjMCpFYLYNgY9dAQ4V4uOgHIRAMH9Gl8f1sJt4WnVXUOpC2gtUhfMfe1D4hVmXlpvuNbX5/8LHb1EOwr0UJZLUvmygl9Znap6C12R45bKbSu3lIcSgEfssZt7txXAHoSZvIQNfM3GHC3+jcMdyGY/2BL0V0wGUhswJ0Oz8XcftAeWASuXhUbyUqSl5/J7fcdOIUwHSY2iyKZJzutKLex0P5BDr6Qbnh20lQ== 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=7X7Wo0m7uA8WIjcM1TmXyltk/nV8f9LN8Hwc4FWltGk=; b=YDv41YtZCS6IzPsjyWlvguKpe8wHNwAYMCQwnA26T/4NUA46jBszuPVU5iOIh9U1M5rNzDJcyb0ZcFTP8BCX/yr87PMVG8dBkpQiTewHIeSZEqGEg5rAMjRTfHSxMzbNZtkT7QtMSkyCRvK5f4WFUzF8iz76E0dJJm2yytmnVilQlK81iQ7hXMKXuEUr8DKL8fyDw/xO9zwmQW1Mc1OEN2M+P0ywwPeVZa/tlJN8PHwxTFZDzwwdNxMC5dQIGlLpZKVoRZWGdvy6PFtl7bgG5CnxDNEJbiwm2hKBRUcwPDHY43fYBAJ0IQaMX1YS/QwZT0WG3h2sW5VrcJDmC7q3xQ== 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=7X7Wo0m7uA8WIjcM1TmXyltk/nV8f9LN8Hwc4FWltGk=; b=XoeeRLM7Eg6gU7fawVXJGrP6lUhUfBX2NL9RYuCuK0Qe4KEtveKev06KBe21SiM7kX6QA1keAenyvFdY9RdSGXkNOqPW3nU6tmhAimiAJFDgMNr2jCAdXTTClfR+Os12xaaz1OaHoBW3DDySgHnRTO2MsihXRE3YEqClAcrWvIg= 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 VI1PR08MB5501.eurprd08.prod.outlook.com (2603:10a6:803:138::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Thu, 10 Feb 2022 16:18:03 +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.4951.018; Thu, 10 Feb 2022 16:18:03 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 1/4] wic: partition: Support valueless keys in sourceparams Date: Thu, 10 Feb 2022 17:17:35 +0100 Message-ID: <20220210161738.17989-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: FR3P281CA0024.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::15) 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: 7feb564a-31fb-4de0-130c-08d9ecb0ea0e X-MS-TrafficTypeDiagnostic: VI1PR08MB5501: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: I1J8c4/Vu+80vfAEBwi9bOr4QjcwEgrlUGyhI5MgNz34rZOLm5J873MlH34kOtFxRwYbUdU418gaCA8tEFEq8EPhZxzXO4jPqW+P1mmLaCmfqLQ4DIFp0mtHD7pSRRG+xRAx6+A/zoV/tEABzRYqfDP5DXFDDnTvOrxYpOVX9W8Zc5xxFRrq2ANvCT4kNyCrlw8d5IdF6W0hOceEIBEm4N8j5Thqh1KeoRJLcxa6EZIlxNs7reBHTDsE9VpFtzAxG4RQONbrEMmIT/aKfkiLOrXS0VgEZVLig3MVVTfWE/szZn4nhIUpE09Ub+LrtksrYxqQcuDguHcY/jubKmgbSOiwcuj1KQfF01jM+xYYzA6nJnvGdV8ZwMub7vluR2Ok105kRWeU1yTWXnFVV7Ok/QSeNgZTw+l5DJWX3M24eKcRoRhJLAMoUVv8HvhKsclbsnXtdoc9DNMnJ3KQtPXKFoYfr6gCMs7Fgi/ZL9Bl6/xWeFHVLh9GOaniIGh4JB5Lvl7AYxkyXKKfiB1fIV2Wj6DNP9Im85spqphnUi0EqA2GNo06ex/rkPVTFWTdwXwsAjqFrxxr2E9SZtZkqVHIEJUyfr2xylmHLFlY1613IJHE7PnkNEN2kIzJnZm2K9TzdvIft6fKjwmJ0JDh5Ufgs++jgktMSmW//k/vVVxHVfhok4NS9w/h9grfKDPhs0gdY1nexja/KcJM3C+f30gSOg== 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)(6506007)(186003)(5660300002)(38100700002)(6666004)(1076003)(316002)(38350700002)(6916009)(2906002)(4326008)(508600001)(8936002)(107886003)(86362001)(66476007)(66556008)(66946007)(36756003)(83380400001)(6512007)(26005)(6486002)(8676002)(52116002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eVfX8nhYL64GyjrN/paBwrC3QOgWYGP6Fp0ltX41/xouFKS68bzjm6NgJX9ptPILv+ci6a6iOk8Uipq4NDvJMYTQ/O1/B7QwO2drSXk1YF73TcNc8J92Go+GfRxHnFElfySC/T1PUESbnCwP0eAUCwuqBvCUV+Mf/TrCjQOv2qyWwoZk5tDfMbXBNnnreZLfqEjVUNVH+z8RT62Pj13rqCS91jAoJChLJf/4Cwi0pzRGYw/neaL5iTUFKmgObWlJB3dNmmv2F/ABXmicdlRVMAYPxZv4gC+gfbYomEAQ8NlqzmmTWSt0pSU59FeY6xNnAoeuPDmJvoViBoNpM1bipDun4xdT72REOzU/hyveTOlCpqpkTDH8UILZ4vSW1OWWykkfE6EJ7MaUVSFuJ9Y6Filuv725g5WtdddmGQKG7+jyjdRY545rG+X99Dz/3YJld3BUzEIJQky0dNdp65PJrfdM4YlyeAm66JbYFjvQaY5CLD60PmyyIeZKwBRGrb2my06OVKbf/I3DoudrkxCT2UEo9J16Sguf/1KPkbr+3XaW2YfzP6kWVegDS9xq1LNh34pCLx69jWQNOlUzVzE1wnbmVKMdrT3ODX+KeFpGDhX9WAV4RmnCop98ywBlWBrVhFVRlRna2dgjHRrqpaomuC1b43Df22q1NxWA8jrtCAwkDrAMPgCKiNfAvimMAr9I/dgdEiGMit5+hVFl9V+5TEmhG1pxX+IPg7R+e2tT9ZrNcGHIU6pRKwuwvNT+WYh55Fo5g0qTU5waFNu+S6C6vxRy7EOhQSmMFAK6/2cyzSRZKVaj5Gfs1W3v8pK2N3FZRWXBvaeROkDP7OD4Z8pml4XG0PRvktBcPW2FHoeyRxt5ZVnhtlRHu/OgRerkHwZGqb5YNm8CtjpUxFT+enKVMK6a2dguULWtUGk7HB/BwNIETOB8DLjWDXPhY+WmY8ofQHVN40J7dzhksCVIKLrglTW1pvy1ZvJ67J8RwagbwWPV+PiIy0LgL9ArG/adpQt1pCY00JMpjCoLiqXh/KQOiBVEAjhXduHXkWnLwDI+oIX6HKEI0ZRAHnGpl/f79ki+uCWnumD0mRR85nDoA++QmwiHTkHWr/hHJgQvvNvuVHDbpZHumbs/jc+K5LHXLUN98xCL+oz660wCfUPCbT3JyCTYUO8Z+NQSeMmjFVm5tTTUQ2qB2T+54F+zTMHt6WAG2d5A1bMNLLNA40J6NW9xZfbU3x2g2KZD01vAzgvlSs/M4vgPUfNf6xFtTY/mi/sQHP3/pUcoabp7kuaXA4Up+/4Yi/hiEUN4twBYbM5UKt5U2JIgSjqLI1a02WbW20BEDMwUbCqqGXm+VSAP1XJfVTExyDMis/UAsadbGS7GH5fGBfVCuHPeFDqYobeIO2p8B9qndpM/rcpWMR1kYe9v5JSJvYdgcqsUAgMUsp+zvMglgW2RVoFS/ed95Ch43GMqMQUaDBzqAZ27e4ucZFlpH/XXPmaaXrW8sP/YKYs+LB6LKOSFYvRo3S6kJW5NHaziyM+LATyCrOwS645NZVoxlwRg91FmYSAiKi7V2o82aB27sYoSicoP/wRz9qns8L+YlWFCVnNQyZFaMMfdi+5rml5O4QxUiLmlY8Rwhzf8Q0s= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7feb564a-31fb-4de0-130c-08d9ecb0ea0e X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 16:18:03.5919 (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: GsZzQV8jGhnPgFi0CSpYrJHbf+zr96CqXkJ2se4SoLZWHxJMVx2YyBOCId/Z9TlIayUi7plJDfpbNeufp7+N1g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB5501 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 ; Thu, 10 Feb 2022 16:18:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/161617 From: Stefan Herbrechtsmeier Accept valueless keys in sourceparams without equals sign (=) to match the comment and support Boolean entries. Signed-off-by: Stefan Herbrechtsmeier --- 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 Thu Feb 10 16:17:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 3496 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 9DD95C433EF for ; Thu, 10 Feb 2022 16:18:11 +0000 (UTC) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.88]) by mx.groups.io with SMTP id smtpd.web12.12556.1644509887047822028 for ; Thu, 10 Feb 2022 08:18:10 -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=Omezwlvg; spf=pass (domain: weidmueller.com, ip: 40.107.22.88, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=isZBkVjvAk1Wqqjot4eAPBpMhKHoxFdBc0LvTIKWdZgXNksY0bHmtuhmd72YpOhnnC3/Fqnq98rqpfQchXiL9m7stf3dzYIhbIrSwE3qQ5XH8nhBZzvMZ/9R5rx2B700vVgNEAq0fe/h9GAXSQXTPZiLqJ2mZo+PiMabz0lNc16PekdHmtr1qCK6MZL24XanwGFWaLZJ/QfgJwxdClmA808cYHEfSOiuVX5Le7lcB56lcIw8s9NCJKVI+bEh+s8N9x9HgJ7hmjk9XWEtqCpdnCEhKeb5eQyo55xHS6aenju6hHgy+jnHs8FDfXXo8FSb3f8cUccVvHDldOkcGbyc1g== 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=bCiAbv1USim62iSMCO91pdYtwM6d6L7G4uIM5YUoTeM=; b=PqFkruWOGdhkhmkqgarjRUc7JhbNrktdNJnwtmXRq0DUvQ7VsqmFjdyDI2eNUXJJlbYSIEciEoMR6ZnFlbD/2pBTfgK3yZtHLTpgVnJSVNczTP9ck8ew+VyBiNV2vccjI3oaBa1HnR2r6Q4dnKe9j1xlcqPlvB7lUUlBN93P0kNdzQ0E5aSLuD11BmF2eSuZu+IvOmkrPmwutMW3wdL1OT6gSFfqa0Ma6PtpqKJ3htjQBGrKYldjZpmtiwI+W+pMAvMQcDDVi0gVh5LhvTO3v5frx0o6Gvme9GwCUI5Auy3ilTDTZE2NIreM2jPCGLQvBuEQRmSlUjgsGHR6nFSnlQ== 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=bCiAbv1USim62iSMCO91pdYtwM6d6L7G4uIM5YUoTeM=; b=OmezwlvgJ2adrrxmnwlRijEoUGx9giHMg6vNp8n7GNHh2s2fXnZCTM6EIjwq78G6acgLqUtC6wyN46xL1CoM4uHrFOM1dgipURGrlROFq3ldNjSZd09VtNvYXtTY/iYKB4rwjubNNm1q2kZdRpuBSFj65ywaa7NAZcoacuJdERc= 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 VI1PR08MB5501.eurprd08.prod.outlook.com (2603:10a6:803:138::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Thu, 10 Feb 2022 16:18:04 +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.4951.018; Thu, 10 Feb 2022 16:18:04 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 2/4] wic: rawcopy: Add support for packed images Date: Thu, 10 Feb 2022 17:17:36 +0100 Message-ID: <20220210161738.17989-2-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220210161738.17989-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220210161738.17989-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR3P281CA0024.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::15) 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: 9354bc2a-f0e9-4a1c-48c8-08d9ecb0ea47 X-MS-TrafficTypeDiagnostic: VI1PR08MB5501: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: T/sAko3KxUj1wscKgF/VeE0jLvAulRqWOCj7rd037NK/9UqwuCRpmVQOCaZTJs4hiV978p4T/ALZ5mIiM2MdphprLr3y2wfSfF2wNyrjM5Zkm15buvkNx55wvHbsOPBe9oyAl/vLIg0ZFNAvIeu1haZ/+6Bil4BU/V4xXaKQzh/xNGcVKQUMjI3uSQaysGurfQv7XkpVHyUpRCzWLlXCbGqDewHHkkmiDZJpsUG0NfqGnD5E3307kfYqT90G80RMRUYEEx/8UF1/1a97Z+hbl1V9qc+8yyiUevPyGOX3EaRfavH81njYKaKAM7dlXQdq8yHbG5qt8SmtsrsedqbaB4/173qNwfIkZ8N9U68XoeECzoT6IOls3sgG6x9RrDpCvB4S6CKiLWY9xCqr4B1OFapU6yPCOzw6ehiOeMlQsP1Hxmwv+g3VB1v2s8/UfXPJ3juFogREjpks9sZsSwkr91apQZ2/7s8O+9KrQ+rRfFZSrFTcaGURHI6p+e3tAw2pj6k4iO9EI6xLzuHV2vqbMXOMMoyBj6uO6pTO9IwHPn0TgJ+C2ewBnKDt8HlPLtDLGSyr+sT1GhC0zu8Df0QkEAs/HN245CyJBtGqwOCGOwKmAG79su2fPS/V0i/63UhPO044weluLV0SjR3i4uyPJrhFfs1PP6FhjxlrFldU8DMCsjuVpCr07RnO0vgWldhX+5s6tmudrvxy1+p8dJiYWQ== 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)(6506007)(186003)(5660300002)(38100700002)(6666004)(1076003)(316002)(38350700002)(6916009)(2906002)(4326008)(508600001)(8936002)(107886003)(86362001)(66476007)(66556008)(66946007)(36756003)(83380400001)(6512007)(26005)(6486002)(8676002)(52116002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qpIdmEc1HUDpbNPq5kcB21M9u1RfOQ34JSYo/6V4JJkCsArhHhwWLm+2WnHY12EgTBKm18PfbJDJVmD79VEu2qBlv6ItCJbY+WQfA13zSzmEvqLpVEHw1NJ+Mnv/m8lrGdPpVxTqtU/jywDeZRp6t2+1RF3AUF1Q+jtjRbY5u7gUBDm8zuVhIDqe1F/qqX4UhfcStwaIm/Du1IcKIp2qhZOR3tUwF3QMVD9gNCTYwfcDDiKnT2O8nxN+QFnmf/BUEXkfhQgkcLiubO86eZzPcmVL3UJoRc8IuMLzyzBbsXEomj9cTpLqvwAhFCMbvc1rHeUxWFoGToU3sqVsnNz5lILVJi0zRw4Bvy933aagVQPEQiaFNszj0Vyh7qe6W9mCJ7ma2KCaHoY54iJsfiICJ6isbCPz3A9p/J9MJNdjsYAWOAqtqFf6ycpHxpi8ZymrUMJVpuJ9ZWjMziU0qmbPuQbJq18zN1uGDXf4DnUjLAMSlDoGmJTitGJQ9QPtV6zZiFMTphI7d5Qd7lVeagdZ/GQyMSIgXK1sMaiZYj7zwVZ10acMjE8MfSpDY9IV+Eow0dRdIwj9VMi/qglgIghnzlsWdWYDZgB3yKohLi5+j2jjJzpL2rZJiAwiVtiQ85AOAsFCf51I9Nem4jLK9Dmb2ctl+LkRwhfnjIRMXeDmlk6TB4kA/u/2ojZMBFRTRfiQWxQ7HSzYEnlTegMCL8hj7elyOdI9FgvlfCTmA2M79YtA1R9A4WpNUM/BbDxqy3AHenNG6JUh7GIGl0gGIQvbwrcmDD4jAsO40hiQs5sa/luAXr7JZyqhkYTAvGBjXipTnll0UvT21F9FR0XEW1nTUMbhrzxjwhWzweZxKL4z7Mg/LdlPsg9CEdqdOkem0jxaqtqM116IddgCWE8fD7emASjq/KH5xp2ZSbPYO9xa6tP4g7OGnnE88PD5OHBPhDeO/pn3IX5SvRPwwjNFFod9D323H7yxBVQY1pCHwYewtQmxK6Yue1tUzedvvrKFEdKbbMsObUuUU00Kjsq1qtaaho7arvC80XtE+Uc8WpsvXtZHv47S+7/NcrgNcjbD06kYd4TGBoH7c0Qk2O1C8AQN0mPzAQ+2llf7VoIyvnHBCLp0NgOMevceLvDUPmmIZesSWp3wiKaekgSnQWfWGnOswD1dGdQvESjSLkVQC1jnf9OwrZwUcT/1F6pKuLIT9kSYpRUV6HW0JcrGcI96e4e+MW0ti0j8EmIB/lfQo7Ni+oXFE3aVSCthGTEMF5BOsU1jHyoXSYHkTibCj5WmDFu8CEuyqma0q0IGepBIuzO7vYBISOyP7XUWx12gxPA824Y/3sGq7CM5RNlcHTTVMzmCL+vTNQgNY5SJsKmCg5+028mF863VZoDu5VUn4DZC29clmuRI1MBrWbNs8zrm/drDQh7W5d7Jqwq0srmnmrA/n58WMkLRwbCPKtHCqaYIu7dXnuAys3jYT4MMJXy7unh6pQJ6UvciKWww2DBeE39ChikkR5ZEUBCm/TY1HvQJUemLl1T+E+ZUD2pe+F4qizM6z/KpNVX09HKNnChTLzqSNzNEQWr7EcXoz/UjJxA8FLMHCnAiPpCPrvKsYF7898vhfOfNO3wrA7fhoK3x1DfwdQ0= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9354bc2a-f0e9-4a1c-48c8-08d9ecb0ea47 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 16:18:04.0479 (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: d2fL7ORZL56fuTSs6iCCDJfrEhgv/+s4jc8cj6p4GyIVqgEeg41B3PtRHoTZeM/GKjwLxHxYCPiC8eEv/SG41A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB5501 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 ; Thu, 10 Feb 2022 16:18:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/161618 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 --- scripts/lib/wic/plugins/source/rawcopy.py | 28 ++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py index fa7b1eb8ac..7816e00e49 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,24 @@ 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) + + decompressor = { + ".bz2": "bzip2", + ".gz": "gzip", + ".xz": "xz" + }.get(os.path.splitext(src)[1]) + if not decompressor: + raise WicError("Compression not support") + 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 +76,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 Thu Feb 10 16:17:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 3497 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 99AC0C433FE for ; Thu, 10 Feb 2022 16:18:12 +0000 (UTC) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.88]) by mx.groups.io with SMTP id smtpd.web12.12556.1644509887047822028 for ; Thu, 10 Feb 2022 08:18:12 -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=m/Uy15up; spf=pass (domain: weidmueller.com, ip: 40.107.22.88, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SyR1pL+wXrMtEy589dUGqdOtRXCccGnl8My4nKsD+zr7UbR9p/6uQHbisHxjIXqW3NVGAGBsv+eN9f05djqsBEDN1kXgmZdv3+/RIuG2GaA+pYW6/6LvUV9fz6rhdis58vf1NnSWfQmT6P2iu2NTUvizf/UdJZtoj6+9zWTJBjChPhb8MJU/AUIz8GN4hAExAJhaPPhmzdz8go48O95ecWEDj/S2RxH6yKhGypiGSt8kt9Nm0qYt6h3CdUrgOY0fJhbL12UzIk1b4eJNW51wXz2xUP/m6tTjXnMbIaNU6ahfWHy3XC/g0uzRgKo1hZz7ZG6U0GRFk/z5QFCKC5b6Bw== 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=fPfRGI6pWADPd8OL2uDIRdfZoMCLmb+XlcMCocixR6k=; b=LHtwWsyNHS5QGHLScvQLV0FNXsydpah1u2qnZqLpc8TJHfIm8wDY7KNEsD4jpwQTAUh3vG6l/0L9DK4TFjwvaoME3nd9GdufU4B+/8XbxZdwZbmEp2WW+QdPBB4yjJ2Si7WAMg+iNa7oFY0c+gBKs9PJe5xGQTZxitxI/BS3o8H7fIONSWfmayjltD3+DUJbW1hquNlKUpsJIvW+5qnFcRd3WhyKW+nxnTgDpxj/6X5swFST51+iRavIoqTYZi2xP2onmbKN2V+wrrHRuxpOeY2G8WzUVe5HTVHZRJ8Acm5cffQjLKeZt18V2De6JP2/dDO2VCo5+Tr448xNcteNEQ== 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=fPfRGI6pWADPd8OL2uDIRdfZoMCLmb+XlcMCocixR6k=; b=m/Uy15upKlZj5S3blCi/OFUYHxNlgoH0EihoWYCqHzfAxiuazTReOltmXJgJl1oP6xqu8QQJCh1Qdqo/at2st9jRyNExlB7TWC5XgBDNwKhN3Kc9lCjbcel5KgxerTKFpm5auQG65IflYSxt5tn1jgpIN3N4IpslbJfUphkebKg= 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 VI1PR08MB5501.eurprd08.prod.outlook.com (2603:10a6:803:138::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Thu, 10 Feb 2022 16:18:04 +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.4951.018; Thu, 10 Feb 2022 16:18:04 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 3/4] selftest: wic: Remove requirement of syslinux from test_rawcopy_plugin Date: Thu, 10 Feb 2022 17:17:37 +0100 Message-ID: <20220210161738.17989-3-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220210161738.17989-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220210161738.17989-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR3P281CA0024.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::15) 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: 1cf2f2d7-bff7-4b96-b6e7-08d9ecb0ea85 X-MS-TrafficTypeDiagnostic: VI1PR08MB5501: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: gxk/QmAD7CMDi4iXK95qPUatdaNmDUysofB3x/7eYKQaO0bNbjOyRSFS/vhEnvhYcxwLqAOSmHuVnpi9FajVmukXuj9Le5cgWEsDSCcbJEVDQXfS83HIGD6IaFkKkaHwuEXRgX6FHjGEqmQ0NnSHLecXpeRwroZ0mKmCnwTnkmqkVUaWQ1lfn7/RHB/OQ7du5MuFFDuqoD9a2GXxw6dgTyP+nEi+oEy9kotrKMMokzeknW8AWOz7Eg22QkpNaGx7ERMgpLV47VnX+ns+1MmbLjE2W+9dtaWxjGfyyWKfByzJqTCi9h4LGOssAFcn9PgUbl4tUboAIbS7gMo7pbwD1WhVIZ5jrBtJR+MMpGZ4mSNLqyercL0zSHxONRIGJ5zjV0fiUsBSlDRqoRKPeoNExH0NUhMzLR/r2eisZKe2LoccTPH3Lm3km50CyJLY65d+yeZMFwe2mB6Ok9pzp4wOG0ZyzyFos+M54hjek1mGECdsULgR5E/KxqRXmEmSlMC2j6ShOCvaYwFObZ8Bb1H5WhgNpdR/Ie0ZK/WO+PsNRAFOr++Fy0Y1IPEtSUYTYNmB0JjrdSeYZdzxwFLMCem3P01UA9rTKAji1b89HIi6BCy8whVfEHi8umcyXEriiPau2EhTVyTIO2xJMvvu7mrP2gVI5lMEHfQ0zLyDIoIdpAPTCO5pjo5b5r7sn/ceneHr4zR49QK5dmZz+B5iTDYVxw== 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)(6506007)(186003)(5660300002)(38100700002)(6666004)(1076003)(316002)(38350700002)(6916009)(2906002)(4326008)(508600001)(8936002)(107886003)(86362001)(66476007)(66556008)(66946007)(36756003)(83380400001)(6512007)(26005)(6486002)(8676002)(52116002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PWNquu0UY/i9BH9mr1RGTtMDNMs2V5OmB9tW+ha1pJjobwxQO4ofFkCWjIg8oMAW8y/qG+8w8snLOIvtiyfnAjhoX3uuyZkUtJfMrkOqZVy77hqpNvNlBJEsunfrCm9sTzL98PR3icKIk/EpPhqqZgcgDMGloCMkfiSXDwFx13l8L8YfTeCAV3IrZXMnB3N+QiXJxtCdKw/J6cqI48e2ES6uXS6f2rgRQcgDgaBE7X5WixitWTXdbE7ylrWDiw5/A1KdEjZuJIq1madS0NdoKHTD5ailIfw8yM6RqpPedLAu3OGfNPp506r3hn43+TTQscyNp1TyzqHWgtJpesBDjPE2H2LfCmZTew4XzVZqZZzgu34yJo1jY3y+ScVAAbYBkCL7/2a2CicnSxkNHT/9hkM9SJ8fQSkcFdVKgAv8zkmsZWv/J7xkqiW3fPuPebZlSZlW63GCD2NVOLT3C/egthuDz4AUU4stGc8EX+6D/9+TDFxQh7zOGNaqtpymW1MXthxstBjjEzpRpiBBDF4t6r3iitC6TjeaWKfc2Yo5SpixtlogiCoxO7EZyI/CKqasA2mQ/yai2b1OkcuPQ/vpsH6oUexD4b7xEecJ7rToBjPcRLVZJGzNwfySIGzoxu4KsR1QvAUscp0cHTODPEdwbZDUtERdkDk9ffJ4mlt/JQXZGgc2ZCvzf4PlL66pbiXlVCPOp5hGVizoJwrCJwB3TMUkkNv5d4xwbLHvYm5gXn3znNA0JP5o/Cy60L5ouD+PLP2s4xa8uHdbFsfupmuZgjHsfBmYFZyuXpm6n3nan1GkJLLQ4CpcUBhf/+PmI2/Jrb4zuNyl+So4zDG6gQrk7fDTyjA2RVryN9tBn8S1jDL485gsuxQL15NYM4SdeSXW72YqODD5muM0/sdhEWlWfplsmljbe8OJE7uwISGUi68B/lEuNDlKMcydypHX88JYdz7yrD81+Kccve2AAQI+DSkCPpjQ64lynogXS6AlMI5UCTCj5HHLVcPJgkB//9R2QFPiBtbYZvEDJtFpjRsVZSE6LlRg/sP/H0ptpUmDX9hP2dEZHUtyJkB9rrHMu00PHtyL0oaRqMZ5lg2PWcHr0pWHwDUdz+eS9fTxXcExBHzDKbYyH6bZe/GhcIgD+lrY7s77gBHzF5Xo7bMil9t4BWVUQnGZAucaWKsgH2UJFWJA6RcnBYZyRTdAHxi6jVthoGZlMWKOEzATsq23j0xoSLaBOtlKsv0NU2Bh8ep79ksRaJf8gRzl2ZUGXQl9veJC1fS903+SBTRkVuKL+Egeah0VK4mILy/fgJfE5sbxbKPtNzI5nYmeRdDyoCEiU9EC1Ywzc3UP4HqFSBOCSjHHxWd/NxsYSOt3HYMeF5tILIbYX5QVnTXvuXRunF8a/eBRNxCu5vC7ibPDZEXCsIpcU/9/qE/Qe6Nsk8LT2rayfxxIc3cqNoUWy4ca6vY2MfXkTlvZWnO9h/TG8ODAF9LFBPm0b8bxGj1w4Vf9GK+HkPKA4Rd+ffmDEx07LH53H+U53WPx9MW14iCe+mqhadtrEUyAOOZ10Kjp9OVIqxqRK09n75lD4E0NnkzoZ3EAVUZWyA0eX5KrxGDfyWLa6OvxmKjT9XSzZ5LBQbecDQ+3xLM= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1cf2f2d7-bff7-4b96-b6e7-08d9ecb0ea85 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 16:18:04.4553 (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: xQ0ZVWZXN6CDbM4a7v4bR00+xmzqLi8BIL0hrgGQHPi/rVe49cs4GRZ66IKUTZ0s2IkExe4ocj9HhHaXAdfsXg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB5501 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 ; Thu, 10 Feb 2022 16:18:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/161619 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 --- 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 Thu Feb 10 16:17:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 3498 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 9A758C433F5 for ; Thu, 10 Feb 2022 16:18:13 +0000 (UTC) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (EUR05-AM6-obe.outbound.protection.outlook.com [40.107.22.88]) by mx.groups.io with SMTP id smtpd.web12.12556.1644509887047822028 for ; Thu, 10 Feb 2022 08:18:13 -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=O44+kSLp; spf=pass (domain: weidmueller.com, ip: 40.107.22.88, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MGNRh660ABMdQqVWFKyGqcJWgXd1xrtK5Em3hrxq7YBWukRa07O81lbW6EVFivN4YKCy8tvLUVaYCe/poVLeZcE0HtV25g03xERH3FcUNZoo/uW+MU55MAWysVn/YMhYWd4U30HPCstrljIzRjdJ8/+CJseGD5BbBvjfOrJanLuPFX8wgTDnCj+5u/8P9l6lDZZUp9DPUPYk/N/0iEQJPNcbZ8ltVljEA7vJeLIseJzelojvyVgvSZyjL+XAB9TqgNxPJFjs85w81aseIkC8QTCdbGAqNUwdL10aws3b2HnGUjYskX8lkYFfDV/MyKAZAA5ZTihro9iqMXo9lwDJOw== 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=0DGXJpVQ97uM+resQBPpm+1cwS9/xBxAwnxEGjR++G0=; b=Y/ExtDxKc4JkM1MGGuOKlshaa9BKEJt8Me+KnpFW238moAJUervFO0wmXcLywDMVoIRWu382DUTBAoVRbcWl5ek92b1HsE2NFHsRMBS+XUPHBS3TrvbWdVMlxSm9deY1T2oYa1fHzl7aOHT8/iDW6vFPNKHWTJyzWl0/p9GPALU3jcPH8bmvrCXxKBdF0HxffUNLxYnVCWTAWkuO2vwcjN2vZt3p9ZIbGGY4zXQUJ861gwKCcUkUBN9+2Z3eotLY0sil0mIa5ztqqgw/Se94h6WHD9v31mO9Rm/mTdAuO9YhGvkNUrnyg7suz/cvt3GbEPeaCEt79Ewns70Rq+ZgJg== 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=0DGXJpVQ97uM+resQBPpm+1cwS9/xBxAwnxEGjR++G0=; b=O44+kSLpIEwhx4aKObh7u2IwzvOFccTOf5m1RCpb8LFZujQC3E5MTMUp+5+PUu8t7cZj/T5mt4ejHbsx+F/Okicvm+AKZAm1VOSswI9AfQKXm+amn/9UkL+A4ZTgv+7aLVBSpV/7f7QqMM7UcwnvMQvWaPT1LGDcvMQtgAhEUhw= 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 VI1PR08MB5501.eurprd08.prod.outlook.com (2603:10a6:803:138::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Thu, 10 Feb 2022 16:18:04 +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.4951.018; Thu, 10 Feb 2022 16:18:04 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH 4/4] selftest: wic: Add rawcopy plugin unpack test Date: Thu, 10 Feb 2022 17:17:38 +0100 Message-ID: <20220210161738.17989-4-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220210161738.17989-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220210161738.17989-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR3P281CA0024.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::15) 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: 4dd5c86b-7c83-4925-4446-08d9ecb0eac6 X-MS-TrafficTypeDiagnostic: VI1PR08MB5501: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: a+vjwHHV4847DQMITabPgHcia0XyMkelTOuP/otIjZq4fax5xFdLFBldQ0AhD1diEZUIn0PLi6mX6X5ptr+vzU4nOmUJWOjUpYPVe/CR8IKNuXVgdEEMtkpRaVWBcIIrYT5bd110cmg4FFkEqybACa5kEpXWMFUsiZyiVtDZFDg1+qI9jIm+bwkdhzWkdaYEQUND3tdvjLHkerssFR2JMHjTbas8viKXaCjvydnRJ0sCpN8EwFqH8d9LIe1AgaOM8SCT/ER7Qd8Zbnivlsji8elKFsMyJl1mPFeInPKnomdI6DncIhd6u4fdyVs4RT9Azl/uXG1rEJNvISnOezw8l1DoU96cC2OE+8CHIZ8toBNMoupAqZRib9h4fQVD7iT+nN8NYdMx9eb5HQIdrRVxP8XQy/ejdD7FozTvCdgwO8feFViSS0iRTmzgSZoF9Ds8Ri/2XL5Ub68qgf4p7/91Yf6c0aWfTAhr+vYUfa9Bl/Wf67HZZfhCP836BCpBpniRvyIz4sBJ6V8rf8/Nb8gi5wyn0t/jDNav+Qjb4/ezdQozl3/Z4GUNrKZF+s6IrEdFiuBmid+4cFabgIH6ELoU1Enz/bxVt7x5bB3g2/uQpeeUzOH6ChF+Ad5gD2yQUJfbieMHGKabNGWzRXUWnCXerDy3W2NdQxwFwGpYzs6th8caxxfjNCdFIuDJASe4EBpTw1WQ7b19VVtNYhfVUqanxg== 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)(6506007)(186003)(5660300002)(38100700002)(6666004)(1076003)(316002)(38350700002)(6916009)(2906002)(4326008)(508600001)(8936002)(107886003)(86362001)(66476007)(66556008)(66946007)(36756003)(83380400001)(6512007)(26005)(6486002)(8676002)(52116002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bzBemSKIb7smTyf9NeIPCVHQoBbSZujfcB98sJWNNfnlzBtTBftIV5r4AsEDp6RbGZq+Y4p64vF5on2eY+u7uaKei84F/PP/V6VS0v5TnX/11dTC+a9T/w1wIwyjeDEGFyFCn3HqV3MmYeol2rBGKyCodXmVOXDZJKg58GO/pDlo0c1oRWIfQhakqi1rmL61nQ5q6mgwyMxZdYm2irprg+XvW0P3/5WoSGk2rzA9C563wcAMS2/J1RUP6tqLt1bU6tGblLazZyYbTfNPLOGz64zW8fcDdUDAHevp+HX6yF+JGxzAjjxQ1SFgEmPgHlmfA3KyaxwN006bcbmQFsmfFele5Wdn1eTunOl5LNF3//axxd4oKeJHIawMMSPZ3eyMgGfYRsaeJDecLMuDXcutBXJBOHLwxyw7WsP9Nl0DJjV9Iiq2dHDv789zUy4Nr8ruQ5ld66yi5m97oie+qVziDfMWPCIZakRZuFl4mZxU6ewtZuukp5T2Ox+3xBi85LPF2phjAcsF0T4/4v9imf7cV8E/uAmTqin36HBHB/Ra8L7imnpnoyLVCOEgN3h/mEGC7AzFWD9woZdakjearVUEHYuxwUUi9wyD9zrV7Mi6EbIHRL7XOx2cnba5Jb1ehj6CSipJZky8SnV52/R2TGWHWF8dOB5+lNXNRrJ2Tl1QeHelVXLLQe5mGCGI0kkmclqUIMK20qENxDGQmz8cXpw1ahaPnl46k+MwOE+Kr9iB+eOUbcoFPlbNW2HZ6QtYUqSDt1GOBGeD2JNrmW9eZp+JhvpFXJQnHQClJ7nKxiJ6EOYWwnuaIPWcyGFYbMD54OnMs98qzi2R1khbfAdhiUEtuJR6R1wQmfVqI5udfoFD4y8NnZS0EBlK9g52sCBdPZzWZ2pCdMQJoe9N/fJJey1WvJIn3nS0AYR7ioG+LRZxQ8qzKDv0URG6/ZKtZ5Z4lN6NEo2V9MzVlF1a+WRnyND+U2EN4cvhbUciJK6+hAxV+Fi/J5a9lcfVKtg/063Kk3YbEPIxHwThBVFwdG15wIhC52OoIp/j4SMfIOwwdSD2duVIBmaStzRxCMcsRbbpgjDhpMajotUIlSUKtKI+GDFZZFBINF/dHAF7on8sILY7JmaWIIWK4dAw8KAcJbUvrvD+/GbqR7qvFD9hvAHGsiwdUcuX6B/XLT2ZgUX7Y7DcaKc8vf+W5rsBwehhN5qABOIlCwpw8CGnhF0nlP04VdREY9YD+FAzuU+UWUJIK3vVuwxdNU4Bw9Lg+JXpFpzcctkvYEA2qNoszJoJhBL78UqkkPZLSS1KQO3GtTWMZanDWvMQVHzima2ycPSUuRs7s3t9SYb6gF9ceaZX2HnPzTPbpajBtz1eAZURKbwqYR0fEvDeDc+awV6jWMcSeZjP8evys28gluXx3wvnWc0qP+1B3wnrBlg5fh+W8fqJwuBO22fSRp3jvQpl0Fw1+clAVss1RSkjQ+YsHFI6QCPW1UXy8FsWNHBA2gB+Pzhw568F6doq1SwXfRTGg2+xiOicaHpCtOIeVvMFulXmcOaXspUBmn1ve8DP2ldKsiGBoQ0d3H72siXX8iFvPBhN92LpLZUywYB2XMmKuATy/mERwkbXLkTfsrYIeILI6qwyU+rARXs= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4dd5c86b-7c83-4925-4446-08d9ecb0eac6 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 16:18:04.8303 (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: m38umg3UvXBdwVwFkMzxL0e9YdCDlPvCtevrKSRYZuC/LMKvK7PeVcDVEO4ikTbToC6Rqo7MUs4Jg09yiaMj3w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB5501 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 ; Thu, 10 Feb 2022 16:18:13 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/161620 From: Stefan Herbrechtsmeier Signed-off-by: Stefan Herbrechtsmeier --- 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'