From patchwork Mon Feb 14 18:12:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 3596 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 77D0FC433EF for ; Mon, 14 Feb 2022 18:13:08 +0000 (UTC) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (EUR02-VE1-obe.outbound.protection.outlook.com [40.107.2.43]) by mx.groups.io with SMTP id smtpd.web10.37911.1644862385167473379 for ; Mon, 14 Feb 2022 10:13:07 -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=ShTDkfha; spf=pass (domain: weidmueller.com, ip: 40.107.2.43, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VhdaxtKelfYN9k2rkuyIqLCGqqC83d2Ca8vOZjFdTCuAFx8zs2QjlR1AwK4zkzBwwJBvxmX3JpELznavkHzMp3fmtQx+hsfMnVxLgZ7VrA0gjQWJ9YYZAfDdWCBLPssKj2kpIlVxV0vLxXJMqXu0IeoqQJp2JnzcoK+ruhYpz0/ktNrChJVCit8oGrysbP2WhK8EKndi8iYpdMi+Fy833cV2zFxaXkrKMeZ+sGpDId7hGzIOgvCUEDJ3JA5Iv7qTzsY6LftaJWONCBhEh2nK91PqFggx8KViOsLdlaYJCjnW8yoWLZmpq2+DvbAOIGxipg9X9yfcdzYukzJR7wWLmw== 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=dsEkVt3OsJwqqUoGLiNAJCscXPafZS08IjDBbxcqLYhzeibYdxeGo0g58gneMrZWqd0kD/GDbFG6DWyqtDrLRHT1I0GTm7G8LDG7Z2CADxHRkF3pHNBpNC9H9Cr3NtzesP86ssza9ZCMYWwL99c2553EGIw0z695GyrV4lCeCbhIz52KDluG7+qqtJMCgb6OC//2Jrc8gGrYwH50zj1O7/HnzxInder5qeEBw2q6znKunSNyVP/O3lio17v2R+UCjZ0o3dXJXxeljTH/iPhmOdpm9JJUP9enWUSWktJXcIZED55Xivd9g298bsFCv6bC1IabqoQHQYSUE6R63oicqg== 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=ShTDkfhaZSP0+b5ekTO2E0CuqFnRU2+PKV0AWzOVvc4kBcLj86DdSSFGL5QQR2OgRREDH2Je0rd0ZilOE2P2nl78Ms14q1Z/VeuopPjSYKCjXYQBBI9NqveF3Hro6xiLc61PK+aKp8omjNrJllmBLCMxyoudH2MLjx3tkJZUsT8= 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 DB6PR0802MB2181.eurprd08.prod.outlook.com (2603:10a6:4:82::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Mon, 14 Feb 2022 18:13:00 +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 18:13:00 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH v3 1/4] wic: partition: Support valueless keys in sourceparams Date: Mon, 14 Feb 2022 19:12:34 +0100 Message-ID: <20220214181237.10308-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: AS9PR06CA0256.eurprd06.prod.outlook.com (2603:10a6:20b:45f::7) 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: ffee85c7-214d-46ec-6874-08d9efe5a271 X-MS-TrafficTypeDiagnostic: DB6PR0802MB2181: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: zuo2k50IWTzTZOeyoxmtAKAaIkRXxJu84EsulPcZ49SNJg2tWOMTvLM603A1H9siDGj7xYCHvF9CCXoPQKanIAq7xze+M56Pl3HXG84YctIWxz908k/sYAwDhpWywAVld8+s/V32/rhyK7cHRlyJgJlN71JTR8yfCQzvqlgonnZWAq7O5792sxHeUCy90ym9uMkFyu8RH0r2u2pn3bOzm60Oh1qy6bYVyp6rtJ2JbM9PSmhgw/0BN8/QGN3kfO8xaDAT1fAaDsiro46sGfXiKN+U9DGsjPFlpmLHUAyfv+50z6bUtX+2v/Gp0gns1TNnUvjFZFQ9tJtveVLbeBvViTOy592D5pG94r+CTIBFI4nh2UEdopziKGBqHtvc/DLKlxrkF6rYyd2laWh2HidAfAi31kGzoNUls8HnYkt66KJn8KFkQPf1XrcCjSqF3B/P6enJYMZiQYA1ZVXa1OsWQqXBpiFBz0EazX4sXnppElu+NSGYgIX1m1Q83jDGWcb/fQlvgs9qn9XiRCGf0vpycYwsCv9EVxicGv/31zmUzaHrcGTuOe8hYsFjOuUnJgQB1IYt0QUBIs949Kul3PUpeVzGvAm2jx9KVIXDhp0ewAaM3Xdds8GQzQxvfLClvgU2kTBO13ncvUi4vR4kf3JWMlPwR+p7uKCdIe9OcbJvIfQp1s58mquknV8s5XFb/phZ9UBJxgX37ONHELfzd/tfTw== 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)(6486002)(8936002)(6506007)(4326008)(66946007)(107886003)(52116002)(66476007)(508600001)(6666004)(66556008)(6512007)(8676002)(6916009)(86362001)(316002)(2906002)(38100700002)(186003)(5660300002)(2616005)(83380400001)(26005)(1076003)(36756003)(38350700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kdM+TpNfHW5FW3+dMCsaBUd/dAK5MaIWo4cb6whu71ug7YtpOwMEqIdR7Stdcmug95PO3EZfeytb2PaJikhJcELof/ZpKl0f64/PZeZRubkYPTxyMUWjZQyQQGav4lOF9bXZHEiHkPikC4wJZXU2LKYa4ExMDoPRTFFwX0TvZcOH0h4h+SRvdsY5Yx4hNkSBq/BwUULieTsDgjcybiPC2gUVRccHL2ZJnLA8Trw1bdrNJinQREHcm0+MoqegRsbNaUL4QfQEpWVuq99tfE+6UiDdAxqY2iN6uLIr6grF9usLfoi4W8RhBlThxlZErNurkIUaYZ8DXp48QYYcMhoWsXO9PRmmI2hMQ79erX41vh1tORgJKybtbZLCdry/v7pOKUy52GToFADi/EONAr9G36sLh1ljlbmOu5nP0M3Z4MuSh1LWLngnwW0asBLCbDI3h0ClaSg1t1qNPMuAYVK6EqubEgLeySLh1DaB/O3xSawi3NfIJ0mcXYkBYfOnC1QASV1CtuIYcILzO6fop18grvAbU2H3VK+1gtR3gdTrdKCKQY0ItcS0vbUcmh7YAja2yRwC6r+XAEp9APFyzbdMuplmUboX9qVYjdJ6D41+ynJf5CZnDTjrEyFajk3+OpL75H7Oi/tgVeAqTT7HzNpYAbJeEPwyzqvezvGehF4St+r4p9uKvCrNnQUfkq4eoWU2XGhX1t1PXykKB+KcKckBB6TF0Zli531ebgI1mJ8nuhGhuCIJI9lsSvRieK/KCSoxV4ZxGgvCi/YLqxYg3FxSJtu83N4IO2y++Jf6SkgxWKTKYwFTKyzBCRmwggGJftU1VTgUVD34LkXkMEz/SJmOxrpturogkD0hyK8OQcOOon+v0M8+635SVoPDtrvbLH/1sQOcACP73O7U+eyZYRGXsYfkuTmqiZMkIM7/4xb8nZrIr5qURC6zszyyQW3XzbYNAf+gGGmuS6SAzl+kTxBeC7ecAOqTzTzkViwVDY3dse2IZvi92N7aShOjvzyQGY/6sOjNbyWT63WRoXsB455RYQ8fe2RZ20NQFwV2JY57n8uHGJbk3WSBvNxvEJdWaFOdI+LDOM5FGOiqy5PnKNF6su0gf3uBo+NevNrE1C2dsuUTr6AUMawV9KzQdtbOBBZABbDuuECwD9QOBugAMCg6g9aq7sZdTcPTNXjwp+TTqi9B7X/Lv+YhQdTSmUEBEUcpYIQtj43OLrkWrlikN9nE9XSdMrdcQI6C/+/4ncSpVrusQJKg+131Z5gILBOvapC2zneNETjWPUv2HTRUwwEvQiJZ0h7CRZqY/QHJiei/oALIcT734svj6NfvjSJQAiWW3lvUgCeHTRcYWWrHOvF1q3mGED2LQlKyb1tky3N7+CTPNdVvgrKdizms6Oaf7BTD74Dw4vF1fCHV19PEiXsTmoLJTK0yVgBlTpyzfPAnU/UbPGfEZwYL58FlJBtW9EJLJDioivo3NmAYyv6jZnecWmTyXqMjYfUNw70NITzFCDnsY6AcUsKlKk2vyqvHpQdBUF6c2XZLjVs/sIGMBeUeQJMNRO3CohooTHZNt0BMLyOvbMQAO6WfysVnsCkuXQ2kjeBKV305dPlpFMP9BmNW+YQdEUVaRyvYA3g9RyNuUuo= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: ffee85c7-214d-46ec-6874-08d9efe5a271 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 18:13:00.3869 (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: 2yCJtmRWdm2A7Z2KsSSEGEsgaE3LW75fADfW0WFSWF6o7CuJwC/VkSyyewGvicIacP6XR6Ky6SVggBCANDSJRg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0802MB2181 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 18:13:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/161729 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 18:12: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: 3597 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 4DBDEC433EF for ; Mon, 14 Feb 2022 18:13:11 +0000 (UTC) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (EUR02-VE1-obe.outbound.protection.outlook.com [40.107.2.43]) by mx.groups.io with SMTP id smtpd.web10.37911.1644862385167473379 for ; Mon, 14 Feb 2022 10:13: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=YOnpmL7z; spf=pass (domain: weidmueller.com, ip: 40.107.2.43, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XnXImgmmMQUXjpEwmUXep7CoimAM/xSVl1vZ3e2q3HbSU0ZrD1fPRKw//6Gp7auTn4Z1fBeWTI4UxaA22TnMexRwdqSWuGNYuoRDzeAAS6ThtedxtaCZvHeMz2XnWhtN7Gwcz7qvvSgVdH4WJv3QHfAxtIqkfmWB9jrJDJYsZLvY3V9bc29tsT9ABCjJTHmkXolEsuX23NqHLoEvifiLpSHLy51+ATQbwyUOHRk29DXvwxJfSeGsGmv0IpXDCBYsASO439HOF1PAJytvcT45pzP45g473RckHAckc1WIVULtIGXomtqYLd9TmJN+sKQ+mwH95gewwr78MHSzMX6gFw== 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=xkV0JSdobVomIT2PD/jcj88jVdL4Vmva7ZQ1xycucSs=; b=mvhiajy4WuYTbDE3w9or43ETqeqniN2UCLPFlimkQovImPOCpksWcTBkBVjPzuKjVTf0UMkYWuk+ySWmktKXR9Hy6tloASxLl8ZuxGpANRc9vatZ1lDbJLh+qnTSHL87FCijxzfVk/jhVRpZKddECTi8pCwgCi4L3onRtF0KtsodVTbYQ+C6Qc6NG6nnK/YPIzhr8EqGpCRYKRnKz/SmSdENwb3n1+aA/AkRktYkYZ0HWoLdDHJT6exE7Kn/96gQA38kdq0oHdqSnPVXaXhfx8vxatuS7HLAH99q2GtSC0Z7igC2u/7j2Xta/nll/ubsAVWI25/prK4nc/B5lXVCTg== 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=xkV0JSdobVomIT2PD/jcj88jVdL4Vmva7ZQ1xycucSs=; b=YOnpmL7zR8C0VlxeEJf1lvTi2WISMRZJeBm2Xo2Vq7nxnhJqxD6EUm6sYBkpCtDmaccFRGVCq3UglDDuU0hfUuWG9h0OPqFlGT3Gf62qmYxRg3RAYJ4ntwbChCEKBIaZ5XyYBW+ibRCYv7YiyiFjMiIQHwaOVofYs9wLk/wfugQ= 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 DB6PR0802MB2181.eurprd08.prod.outlook.com (2603:10a6:4:82::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Mon, 14 Feb 2022 18:13:00 +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 18:13:00 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH v3 2/4] wic: rawcopy: Add support for packed images Date: Mon, 14 Feb 2022 19:12:35 +0100 Message-ID: <20220214181237.10308-2-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220214181237.10308-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220214181237.10308-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS9PR06CA0256.eurprd06.prod.outlook.com (2603:10a6:20b:45f::7) 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: 6cfd78af-ccc2-46f5-b040-08d9efe5a2bd X-MS-TrafficTypeDiagnostic: DB6PR0802MB2181: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: V3vaiEAIoyzyVPUml7jIPSaI8inyRt3cvc6UYfCWg1Hagw6GciQgPUGQqay8wEEevaP9IQTvHRZIapIq8bwi0VfgcFRx/4b1azmxazqbr+GDuqr1KL7IjPp4sUrQKKelGBHHEFfa5pkjwmAHudmLYXWe0a9CyRekG2cMmLgnb7yB88g+N4/8qfi6nKv95qCJrJQmFP90oOrSFNERGLAUHajWnVig1iOhDd3aggGs9jTQXx99J1SqbJqW8STalt3M7ElKEVjmpKIHscjkgpVE2FRitLR1cLeAFVEBoD3P8hxSqlflnf35HiHQxJhpAyuR0+/cgT00KN5YokTGyuvQA6V4bfxBNRUzbHQYx2vg0y6bzAYELFTOGi8B1HLIw9tv69AUfzk2bI2dJmKNTyzNXwKDDtLyEXmz/BFUzM9kwzUloPFMmtiSS7voa/b6FEdUkDnJP0lZ7scMW4LHbhpFLopifcz1kP9B6JrOykGobKLyVYNCWYul6aIWewdP75Qu+lnLTBRo9MMmNSL1VshsT15u5thcMP2SADElbc3U53aL+bvgxsoj7afHnip6oXi+1+5i8mhOSOKDL1N2BN/2BTLF7JDaQZNYGkBGYsTZKlf+XP7+cKtqwBbl28PxOeAPDA5EwQajk8oWp+rNNwHVJnBKUFf3bSIWoItHd2xTyvyhKaxppulK7NVot3Y1TO877DxbRZA7UcDu9oNLjKwluA== 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)(6486002)(8936002)(6506007)(4326008)(66946007)(107886003)(52116002)(66476007)(508600001)(6666004)(66556008)(6512007)(8676002)(6916009)(86362001)(316002)(2906002)(38100700002)(186003)(5660300002)(2616005)(83380400001)(26005)(1076003)(36756003)(38350700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: whSI3u+/P6URMf0VYqjjq/kVbg5q/ZvjrPdB/tl90HwQuU5QzNWSTNAfwb8iOy2cr0Ajmo5VMKV4wL/kxJ1KbUi6Rt7g7uqbFxQ3IJXcK1Ug/oSzXAExKUcH80+HhrZpJz1MjPG+b9o++kr5QiFOk2HQgCQASUEd22eHeyp45U0UYADyOf7nzDEhZ9eCotVj9Pmb1GLKfG26kReHlo11QnIQnmF+35Da0Tst3DMCtapYGKM1Kx+JPlYDJ3U3vA/MEgjv443mKEsxILX20jq6REKqo+hTHvRjWvuwPy7KcUd+sPubhpcsMbvY2fkq2qPb46a8uCXQyZ4G4t4Q8aRp1rTwAsmlyGHYPHsKHagIhK6l0tvGXGcp43qjhXd56ZGbwYYcrI32I5oxZYhclotvadEivJi/UXV9XJ3/KbRjzIvEry6C18C/Kp8l+JzlSlWkz5wSZFJdO3UI+LQTlxDe4k2F1s2Bq2dSbrwb+Ge+6vCYRhpe9U1Ob1jCs3fol06N++R4yty12w4q/5qhN1hA62Gsvwn2RrXZv7+y6EBK9ldVZ8XtbXUCJhaxcFtILoKTd4cBYV/8hcPhfzF7GWCekzNC61CC2kaD9PE3I//kEG24dOZTfWa5HTGo7ftmv9tR6541L0OKxT5cW94HyxQBJn4SpRMzYJiqeHVbRAsLxP9i9OabCRlOl3n/a448wggBvblSTTaOLJa88H1k7xgAdB5zDqk9HEZbKansFrOZ/wqUQhcuzVvslB8C8NNVxwwM8aq4fhCsfpFfFHOn8msYxmqhpH+SJJxOrEEe8G2sg5axcErZSJSGVy9YBuaAumlyXVRQMQ68uvevkbmbUKf0GAlKMxxqCtGbOmVwf8AIed7ysLwc92JRrVisnfpvcrE6ZuIQzAB+GbOhOts9g2CioWQy3xYah9esfZwbFhiO59HNrXhKCXNed5yTHGG5swGzGHLLbrzXAv68bJjtqhH4JB+sxdxyDKgQWclukrSH25JJ7QJvNvQsUZepoI7/5c2s7Y6JX1JkHKinFm1WRSB1S6dN0Kglr5Ja87u5MssO788TwjBRlkGAMHgnzMYJnRhGE7nSr03Bw4CbDO4rJfJsPIlZsFPeCt5gPWY6UHSC3cRhYrJzWIxe9k4sJ3pvLzOxor4/3UKYVY2G78+HB0EORLPL8lPgVQYg5EwGQuuIfARx6jANHK+sUrNHY/zSF79zf0q8gvJLmbCEJ7nTjzlKvE2CaCpmH33mm99LuJwwssi/l5wMOwz73Uma35beQvQUyeU1UK7KkUMuIILySryaoaC509Gy1/HG9chk7wGZkFMkm1gtFIt8tmYP0gt3MZoK4Uz/h1Wqb6y1Wm3tvQSHzysXsHlnZa0/tkGuwK2EVBvYI4e1k2sAcu7c96WRVzpmQheRVk6cYkRg4vfyD9aajmlZUaABFQOXsJEyZFNAgxj4BqNfxu2WrIyi8+Cm2lx8bA+CnwSAheya160SHA6agEU1tDB7aAHYt3I9ShGVfpUIwY0M6u6roLR7a+wK1B1K111C7e6lXhPIyJW8203E4rzeGmn3y1FH/WWQvcwoH/IbDMws/V2RKZh0lQCdwfNExEB/nSl/byomgQTxTXimMJglVJ5YcAbt73N9MWIp3aA= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6cfd78af-ccc2-46f5-b040-08d9efe5a2bd X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 18:13:00.9025 (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: EHdzTB8P5AIgwVgtM09opvDaKBqp216rKPkVDr+AUGUPEJkuymZ9tnEk9oHcKmuctzg7S/E7tRTXeO+72H9+CQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0802MB2181 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 18:13:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/161730 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 --- (no changes since v2) 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 18:12: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: 3598 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 4E272C433F5 for ; Mon, 14 Feb 2022 18:13:12 +0000 (UTC) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (EUR02-VE1-obe.outbound.protection.outlook.com [40.107.2.43]) by mx.groups.io with SMTP id smtpd.web10.37911.1644862385167473379 for ; Mon, 14 Feb 2022 10:13: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=43riZdYH; spf=pass (domain: weidmueller.com, ip: 40.107.2.43, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ur6BJUye01hwLU67dPIBDMFiKOaauzod6I1HDIglISGkh4hiGAs4e0m0rV/YV2i6oadEcPoHHvBUdRFGOhxZAu14sEmpvym52p1kCPldlimU9KcKXrbi8Abcw44s2DMhuGQaOH6rpJE0e6MrFWPPpS7oJdw+xcmFsanss6ZCcJOcPIlXkv+6+pgrK3dYOICXVw0W0f/QXlH8diPo5BhTzsTDV9M6TC5cTYqnogg72SVkMnHqLedmtWUV6P5G1lGYU23bN1tc0qmZdu1LDWhKyAD8fTBX1KVrWbMD7iwNPFFDlZ//huNnnKunFJqvlVul6koYS6a8JnWAQ5d7l4XRaw== 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=VSTFCJH6HSbdVXeWM0JztylZeIty5pVqsRYWGWZ+wUqMe8fPrqd36SGJQ3X+RVeCH7HBbR3VmCwy85CMiZHWuuev3SrgqtpBxABF2k4nFlyjAtV9Lhd+QDTjSU7eGDyjxNtMDbOgidtvr1zJi/902Aj+WECQ+ZobkcqmEwHk2sfw+kN2xymvi8Ibc/fAgLTM9OJIs2ZrYScRcfkiJBjVnAb4G/uIJdnpTU4MDX88EoLkXFbrTb5X9ki7tzjkzo3XX0b46rzN8mqsQd094i4tvfaB0pG2EZhPZxCIpmBfuIub4ZKMozTf9hCrD2Yh0892iLjbIGg8MyVZvOeCl2aS1Q== 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=43riZdYHZZ5QdsSiXnNQAVW2Evh7GzYI5rrD3idPXeOuUFz7ZI3JmYkK5WBbagyznEyV/9C+ZDVLkaaSw4xIbZDnUVtDOyrftK7K4L8lyiJBs2Nv+olgGKN3cv/JHufaC7p0jfxgvC3EJJOcogk5ySGMDlsAraEzD36mkV4DSmk= 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 DB6PR0802MB2181.eurprd08.prod.outlook.com (2603:10a6:4:82::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Mon, 14 Feb 2022 18:13:01 +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 18:13:01 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH v3 3/4] selftest: wic: Remove requirement of syslinux from test_rawcopy_plugin Date: Mon, 14 Feb 2022 19:12:36 +0100 Message-ID: <20220214181237.10308-3-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220214181237.10308-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220214181237.10308-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS9PR06CA0256.eurprd06.prod.outlook.com (2603:10a6:20b:45f::7) 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: f2851285-4f70-4b2d-5d8a-08d9efe5a30a X-MS-TrafficTypeDiagnostic: DB6PR0802MB2181: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: QLwmLjpVXa7uwV3M43kF5ME+8E7wN8omd9o30DzjWecH7MXC1j3x291lAnMzSHswrgZIXkQPEMgLTxwLo4M7LWIfMO63BiECLUsP8UOIpwrofUEdW3DE/+O4DfV2z5+G7z4to+4wpDAKA76tuUmQ2iXYEicbM2e1LzFzb6mu5NRctTGtEbKNFeSM/vwE4eF92Q9Bsj92NdsSg8K9zy5sPef3tpSeyEpbvhUe1+gwW2H8jSvYizLxzrVZCLPNguGeMr9S75Gjlfu/wlmYmAmyfxw6BeC1RKmCvLAXs9HSm++wxBG1V3nfuX+a7cFrPk5PPevY648xhdC+IBhq1a4zSa7EBckxTMeVJBA4AmbSFoS8P1gh3IUBpVqzITY1IYtX4o5zUcQ8j10duNEHQrrsUqX9s3HQYBcf8jMGfCVPrfMrrWcUq6zF7nT35t1qN+KDEgcIJ/NweQ2eys+qe9rMpmfEyZzK3fzrPkWcF1clJVtS0n2bBvXl5cCoNHnD0Yg1INOxH/FBUmavsTtY0vo42apsVCi2b20rd0n5cjyHAPeHcxqbSCfPJ0jenCVX7G0q/CNH4ZjKmTk39UY7X9tS9Sd/d5WgXxxDGJ904BS1kWiYdGI1zCd0xWzS+akWRTA5rgpbXT61Y+gNG8x/XSMkdDZeklGxWUIkpaTmRvKy7hMwyNJiVlI7dvEZMNDi4k4FK0Zgc3S5qi42wdXQtEIUdg== 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)(6486002)(8936002)(6506007)(4326008)(66946007)(107886003)(52116002)(66476007)(508600001)(6666004)(66556008)(6512007)(8676002)(6916009)(86362001)(316002)(2906002)(38100700002)(186003)(5660300002)(2616005)(83380400001)(26005)(1076003)(36756003)(38350700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +gU0R+rZGhZJUJcHw1xFNKo2nRgnYlCruyZ2tBLcpBaTER+6gLWrp1G/FJ0yHTNlSYVnkZLexgDOIl2LnwO1fPj45mtStG0OL1Ef5lIvPn3Ayg881w4YROVbzOSPOMA5NSVeRJMu633N0zPO/E91BfITwFG3YVUdFqJ3GV56FzhRP17zqYP1B8J07L8yn2fit4XQSm6cwz+QC4v60HK+5Xt0SeF2aPEu7nbmDnlbqfv42omDVY0Kr10DQiN+VfxToT7a0XOAb2lR4OWLuA7oRiA+w8gRNB+CydlurP0D8n7XmviiluxvPLWe6+8PMmkhfd0PJZWJitwKZftTUgekyJW64FdD+5plAgvxCh1SSO0c2KCoNsuG0IoQ1D9hnisPV9UWmUczd9DpC+Epfc4fConBSr7KSuhcCdkpzdvFnX18x/NzQHAI3P/3D0FOWHYCywOHBLyMBA7HxuvvVcaqnQb56HIK2WhTBd6row12/V9vv+qGGwaFaEHxT2j+Zs3q4w12ewPYWFw9EWSa135Nl4PgWnnuEcYLGBWSNL/WOHdibO0eWcZ+8N9chGM3QtWc6cWF4I5rQL/8+kxGJShWnPkpq67bssJBCvfeE67UdocfyuRGE1wn5K7nDJdJlguWucwTl1j3NJ0Kx1qV8dvOvD196Gk4QApyhgdXDU98te3U54shdkddgMm0VDty28hbr3DoI7FyWOkjCoH4VCRH29UyCACNAKYicFGyQwgLVa0vqesG3v833efvCt/dlrDtAQJ0IDnfV0V1AfC7b3AGRmTjhW5gbgxUkdOEpGdcommrob+yYRc+LkuVuNTXthjVLfws7hd0n952f1cdjviZtZdIZzzBime4+xIJHfkPNpr8Gpl6kJYVUUya3Kl4Ena0q1pzG3U0kQDZ4tBB1A7Kwy5OuS31rQpVOWbfEGacomOHoNpFo6VIsR8bwOhAJw6FnHdlqxeqOF2B0uQOaXAdVgTHyLimn2h2VgnvdAbSwiqcsclpizvGDkbDVHDy7OzMdX9UzKf7Q7XeghkDBD7gilgLqtMgFU09Qqw0dQLB8qLqvTvY2DPqUz98zbJnmeMOiPR9iYSfwCh5LpiZzfqG7ThxjuTNI7ba6VJrtW2bxJP3EG4remTCkWmzB90RpmzJvRuDm3Xs5w/fxBu+BeBnD+fxPHgLPhWEMe0F9v8e4woyP4bEM2UhsIKfC9VgpJLTQreS5ffn1gF59mqLGiJWSL+sHBSrJ/9qwXjLKG9P7Ufs5zkwRl+SqRvHZm+0P18md8DpXUSZPMq9/KJ18V0QZgMmnRT5rBtop1UYUkRRir2fpTRqsSrVM811xQfhvuMXR7xn22cZX9dDuH8jGOAJiRLFEz9Nx2oycqC2iaPkRf8x02bJeBeEguJ8yNy0cq25tkV7QDs1LNdth/cYX6ij5HQ/hXA0fSjgzh1DRrHfO0Ylp/CILNd5ptKfjeM3Ym1Pm/6h3w3g4cl/kRO8wbrD6tili3pOhmr/qViEbu5YPtnPD0e/GTvh+Gz/nb7Baea/sTDZsYtZoUPi4OarqZH/YKGE7oW2bWN8aGzywjwvOOfgjKKPbS59bfYYVmxGtz08wkLY18MHxCvYXw4YbWSIkfIeQ1dXLPnaD1hbai9BWIY= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: f2851285-4f70-4b2d-5d8a-08d9efe5a30a X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 18:13:01.2488 (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: l/nB7ZmIgKl6SggxrKPFUpTHuV01vHMdBEJP2HncLKubYUuH7e1NoUN16Z0KIXpd5Zco28+A4E+urpPdUyO5yg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0802MB2181 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 18:13:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/161731 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 18:12: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: 3599 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 57BF9C433EF for ; Mon, 14 Feb 2022 18:13:15 +0000 (UTC) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (EUR02-VE1-obe.outbound.protection.outlook.com [40.107.2.43]) by mx.groups.io with SMTP id smtpd.web10.37911.1644862385167473379 for ; Mon, 14 Feb 2022 10:13:14 -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=uBIQh4H6; spf=pass (domain: weidmueller.com, ip: 40.107.2.43, mailfrom: stefan.herbrechtsmeier-oss@weidmueller.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kTxLxgDJJs7Xt3nN69i+eOLELHRAHCHzB5QTRAvFOeDDQ11SgLjh+wUfBTyDaaxpUazlKJwybp6jC7xLehlsmatNwwgcczRt6UepONJlhf8LsgGcDn7CUg9I7FTiM4TaXeA46Pm5mwXQPCRTRo9hLUfwZfWWGrYKRbjniFIpz3GbQSyJLfD0XcChsGFZiyIWb/r3cprH1OWzG4aAnIVNpdlMTCpTD8J3PYfcU+iQzso4ZYYep+Ri81HW3M2ZNz0kfV2AKJJ7aDgtsfAM5bwXG7BwUaT628MU9hJAlkddFHFGLljK2z6TwAMzAyrcOhjpYOprZpV93s1WefR2QMD+Ww== 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=icDVSfUElIQku43xBn34D03e7+ryLYT2dqa5xErRFwdpI7s87PZVfIPI/TflITAf0xR9kkn+Q31hRHSIhUIA+MVEB1RS6eVWFvgWkSyhWb4EClR5ik2zWhP/wLP8Aa2Lx+qecwWO8dcmRoA84loI2WsHdImnTPcjnDBSR/A82jHlJvKFgNkoE/zsJXmn8th21EwRtHdJn/lfwMSfzXjFucQhu63Wop+saX4zEWMyqFfqOOjQi93LUytAyFIOzSasOrxTnIf78t6fhxgeKzxlkjc8DI49VRFJVIY5F1qoIld9AfKNMriyv2GpU4ur1qWb3OURC+1VO8AQjoztlxeOYQ== 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=uBIQh4H6MtsjV+iUREO94SxC3VChdUbe5NPlnxxLi9tkS8aa+i9xD60z3eFSftk08pKAj0l4gPqNs3yIcL/vEtwO4BZjW27Jb0Zk9egquApsbjW5Rn2cCt1loTXE7zKENJqVyNgONwU+E5d415xYz8lsJatp3Co1WfXbDv7VP80= 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 DB6PR0802MB2181.eurprd08.prod.outlook.com (2603:10a6:4:82::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Mon, 14 Feb 2022 18:13:01 +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 18:13:01 +0000 From: Stefan Herbrechtsmeier To: openembedded-core@lists.openembedded.org CC: Stefan Herbrechtsmeier Subject: [PATCH v3 4/4] selftest: wic: Add rawcopy plugin unpack test Date: Mon, 14 Feb 2022 19:12:37 +0100 Message-ID: <20220214181237.10308-4-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220214181237.10308-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220214181237.10308-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS9PR06CA0256.eurprd06.prod.outlook.com (2603:10a6:20b:45f::7) 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: a5f42642-46ca-436b-086e-08d9efe5a33a X-MS-TrafficTypeDiagnostic: DB6PR0802MB2181: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: OHU7w4pNUSnBAVZKea7XRb6MS0FFSKPt2hej+4SdOdQD9HwlIaGwljOQ4shCzaKz70pgZWY9POV2bH/cQOefBVKrlDeTgK4cYNqIdatX/01+x5J3oQzg7hsD7+Wba8FFuO5o68tPE6G0wWImflQZhzfshawV0G0dK26XpZsK6CGtgVGNzfSD50pkozOnnkvIj0xliBqtWdeGSnHMPKz+F1w92Zr41lsANNxEmtEfK26pUNHOtjNf20s/TDClbPdOrIV0wFhkqbGFVnpD/Ek1tH+/xAjHKOGtFPlYxhsivT/NmIObyTowtyyKB410E0KODek2Ve9ZSm4oks8DyrjVYJI+zuywHLJGWQwS5Q/kwzZjWizBBUtCNO0a9Gsgmp5PAkMFng5bKppBArjVmo+3xAANa4jtchOo+W8Vu3KPxN8GdjAFEahqGoz9k6KBA2Bpj4fDzZzI++xXvxGQ84KJgCVMht+ZG3UCIFXMECjuRCW9OLnUMXKPk3momuxQ9F9bFbDRw+fCrBAgaA9DnIvY2dZVjllrA35XdFN+JewFEGhnqhTXHq/qFKQN9lUexFkIqcOexQITTuuC1wj7nZ+3M/tfYl+3frNfhqEklJq4x1B9pCDLok95MGYZ4LzQg+M7s1pkdQd3i29y/ffZK9iIjvZ7hIl7Qee4OTZ6ByJ3QEmQQTjT2QYFOESwAM8VuZJWmIyHxOqbiBB8tcqUjESBWA== 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)(6486002)(8936002)(6506007)(4326008)(66946007)(107886003)(52116002)(66476007)(508600001)(6666004)(66556008)(6512007)(8676002)(6916009)(86362001)(316002)(2906002)(38100700002)(186003)(5660300002)(2616005)(83380400001)(26005)(1076003)(36756003)(38350700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: M4XZqBwseI5vrBgSLsv8QEtUvo3k+6KRwMU37YSBUJ/uSeMRxdN+F1/OtkL8Xu7mfdFRG/2sPt0HuFG39GxiNFghhVvcAsZSf4ukCLCEevlFOstEMafSDm5k0sEZjDCiJbX7FHi2c9uCHbYy7N3wMjUHLik2JGoldx5KVK6CUQkg14AnTdc2w66tbOJx/ptCZ6lRf9uMOfpjkTuX/7vXH10tDeDNqgfrMy0X6b4SiSEsLIfLc5ssbQAHSq4ATEQPWnZmvMIouymk+n0E0DAqkDhs7yqE1uWEMraLID4yxVgaTOcm8ij0u4IxO4YfmD6wjFPA9TwYcNCj9fQIF5F3s+Q6yKAg0PT7/yLw9MdjM92/TnNi41c9/ubdBNyhkdonrNgOAxpwRpAFqybB/yBXtaQoRxDKE2+fj3M87B1H8wuYfEb3cr1mLhCdSRJiSsomr97gKvAoo+BtiEZNzceAoTls/oojMtBxmKepv2TDvOHBQto0CbINZyRsFJtA/UCkVx9D/AMyYfBgZHyoiWFxz7Gb8l3lCoMr3uc63ELpejavrzS0x//hWrrKjvDR6in2I4+Glqz9zSuCTEAjuDYE/uCgjBM4DeK2RzUWwdMDNE+01Senj74RPkLLq/eAPhAc0Kd5KA1TE0Z5Iwf12H6hSuElFlqKgh8xdUTmzkUWA4DngQxHgIZ+lXPlivBfUgluJaoj3OXcRwmas7sOPcSveRdOa001dqO6SqHQOFaV9k+oy+V75kCimPVY19MQEorYIoofU7LJkJfVDNCEutbgtwzERLGPkoVxY1aqFy99rlJ9VSdOC7eEECYjIYYkXf+EKsWeZZZCZOLOU/QtgIrqvBdHK4GVM6eRgSUJlMoUgOqjwQ6mw+kZ5hYEdBvbNqJKR6MXF2Frh7IuumxmN3+8J4sToswXWlY5sVIFyn1b+DCO2bCiYpNmKiFGG8EJKsJZHLMvSLxv95IK37E+BUsaT0sEqTwf7nuaElmv49W2w3V0X7mVHC1PM3qthMGEE9YrFA1lUurAUROxdbXTfvFtsoB9DvKIaff90wMlBdqwpgeVLoaDScehX25U3usTTK9IZzj/ahDl8/3Oa8cyf2ewepI9LdmcsUODanPfoMKKMUo5IfKKIJw5uI1t0OLh8yu1py52KpaxxKJChUR+JOZ8fGE6L6NemIgfYjGsoS9KCcAak8eQNyAH5CViUtmu7DnQGPeTJremk36/1OrJuxQZqGH6qWT/AExRPnJDu/5nYP0Txf+Zb68MuhINIXv3TwHsu6/AaTCHbLqWgEmxS1q8LBKeIPwwX+UHzGqHBSkJF+dafKan7tsZuO04h/+Q0xn4aED8GzTADmiky58OQzJKuf44dKr19A/m3bFky/MyI3lGhUhMWF2yRvzn8kBtyYrrh6LZq5NmiLhGXCfwPu/SK/u0uKdwRVDFvYxdvIa7yIb1rMHmRomRi1Sjl2ycFbYUs6Ne0Ww+NZK2VFtSmtmaKCQdub56+As4EFixaH8a4w+I2SaHSDcPfU067+Y6iuwzN69YMyg6uEwp5QzhFvhSB0urIl7VnCAcHrvOXXPEOI0Q6+EaQlflND9Cy9c8NEXxJqokb7ISJbgfw1EEu3SRgKrsgM4oIGVMxErC1fBQom4= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5f42642-46ca-436b-086e-08d9efe5a33a X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Feb 2022 18:13:01.6080 (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: GH+avPtX08lY4nG9/fB+5REaXBa+b3y/WSODezCVqFwrQEMf/yCkt+elNmMaAq6ISBOooKbo3b6QUnz76jq9Ug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0802MB2181 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 18:13:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/161732 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'