From patchwork Tue Aug 16 08:42:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1666739 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=EsxFiVWx; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4M6Ppf3Mjyz1yft for ; Tue, 16 Aug 2022 18:44:42 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ECC3384A0E; Tue, 16 Aug 2022 10:43:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="EsxFiVWx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 407AE845A5; Tue, 16 Aug 2022 10:42:46 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10044.outbound.protection.outlook.com [40.107.1.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9CB16845A5 for ; Tue, 16 Aug 2022 10:42:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=stefan.herbrechtsmeier-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QlSLNbyg1zTGm0EEvw52bzS59OvwoFJd8/SoIAJwpHYCV8ikfQqGa1tgVlIid4r4ofJmD+CJeHIuFiPhBvJzxBbVXqVr/J+oSCdVTpf1CaHZzbSP2+YjEyWcPUC3KMP7nqJbD3+rEyeweJF5Aw6zaebpL/DeL+FqfsS5J0S8QXB6rgwJNo1o2wd32GDVucAIYVyFHCQgZ/nKkvuGOjcPL3NVz8ZCffUE8TpyiAzj+VaLI9qwmHouSc/f5vYqUMOt12raau1JsKfW6K2FB5/cBT/v6o1mUDiGFu7htHmNeIxStUOXda3pBAdEr3iiGJ+MeMScDi29FE5eVok0OjlpeQ== 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=28/rRvvJ7ElXOPnHjsVDNreYK9/WyIVdN39c3h/xuqQ=; b=UVhBf6jbTaAwmSOH4S9j1C6L4vsQQ5wxyHJpsZPXzDTVW+r1V17fHDhWyy0cOiR0OsGYxt4CRHK3XXKUETMtBHE0b+SNvY5BxkWY6SP6BSJvHh60gk61bSX381GwqpBd7RE+iS4YSD9HxTJrXfAoMfZUH/dhOJqrU7YcWmCl1FKC1UFQ2/koDcx2m1Xdi4qtMmkfDdrzD+5ZUi1ZPVRpMwZfRifEwZHzdkpj1CPvEmWNoL19UoHp+pYMddKiZCgE4RuxAVWEAwC8nXQozb5RU7U5GW3n0M1hebHyIB/V3HQCOC1r1GiVPv6QIxLHFnhY7urGmt/JYHa8ZVmSZlJI/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; 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=28/rRvvJ7ElXOPnHjsVDNreYK9/WyIVdN39c3h/xuqQ=; b=EsxFiVWx17ZFOZ2OddTLDHU1JLJCPyIHK5ANfL1HacdVMiBqTKum1R/3CdCdBsuf7UU16ADAUjnAM5QbnmonMyro3Ocy2P3IF79bOyXgcSERtBZjujgyTdRbhdherKCoomMcnPfxEb+TQ8XJYV4KnYrM5nAlNArUBOQ/oBhndJI= 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 AM6PR08MB3096.eurprd08.prod.outlook.com (2603:10a6:209:43::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.17; Tue, 16 Aug 2022 08:42:38 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f95b:2e64:9ee6:4d44]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f95b:2e64:9ee6:4d44%3]) with mapi id 15.20.5525.011; Tue, 16 Aug 2022 08:42:38 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v4 11/13] binman: Add xz bintool Date: Tue, 16 Aug 2022 10:42:08 +0200 Message-Id: <20220816084210.14972-11-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220816084210.14972-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220816084210.14972-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: FR0P281CA0139.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:96::14) 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: 5d3e8040-57ae-4c39-7020-08da7f63462e X-MS-TrafficTypeDiagnostic: AM6PR08MB3096:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gJKndDzkRg1LbS6Y1ZX4EaBKogoGJH36tJRs86RAJ7FuCa42SV/MivEzDE5cEFSmaedMQY1oh8XXPBZGSZUyfSkEMI3Cax9NMmDBrdI4WN5oqncoXLq628XgTf+JeoSFuxU91srDjCaiDm/dZLtgeuYzvdNSibFalY+I5nFXW531QbTqUVM0NUKJgdGHzGsYkgpLthjx4qkhBGj4+v1oqm1JYQXGvBk9DQq9oRq1eWAJO4r/QBZqotl2oUtUr8FbWp4u1CrbbW+Dy969PFkPi0wvZugysrbhx4a/2Qrymr3fCVB8tiGkqUEpJnXXlPi4gAc796VtcJJycMh0H/BCqBNzn6z7qv/zcl0uN/tUYIAXVqUJAeN0KM/KP10um411cD9GNgjRd74sDD/mHz3Sbdf4J5RQb1UgHAWDwmr7hwHK58dAc33avBMSlRm1pGiV2bXQenaQ8tWl4fA/h1gA2MJ3MG64YWH7NQZT66fKcQ6OHtLusmVJB/vpu9/QvDLqQavp3oZAv8efs7pQUBHJgvN/5sEzrgXtsl0aPeDqKBmlBME4uvE8ZJupZfx4MUqS/UyKXtjkjBRj/QFDDnOO9URr6aXNILTEB2GARIIJW5mnLgilg0TBbJk3hhbY4QA/93RxX8SlGo+DJTPzozT5fRTDMU/PLUjVkKwPcB+WLnh2wCSXu5EM2LfkXBVt6T9O1NX1sEttUcn7U0H0Zu/Hu/XDpCUQMx+MxL75Rp83heY8tn4Oj6w+0Y94LZGVCe82HCKTTPExn3KDzOh6DStm/tbKWg5ibErLNVoGs4GM4D0= 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:(13230016)(4636009)(136003)(396003)(376002)(366004)(346002)(39860400002)(6666004)(66556008)(66476007)(38100700002)(38350700002)(478600001)(8676002)(8936002)(66946007)(6486002)(5660300002)(54906003)(4326008)(6506007)(316002)(66574015)(186003)(26005)(6512007)(2616005)(36756003)(1076003)(83380400001)(86362001)(6916009)(2906002)(52116002)(41300700001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?nC7NWhu23ex66TZvnMIy2Ad+pfZ+?= =?utf-8?q?+0n3uvI2vw4jvtkQeb6SMgO10PxDfpscL3UfywLJcvWw0NqEVxR3GiYv85G8oZ7MM?= =?utf-8?q?Qq+NeNU+iNorxHG6yH02JL3Adi8v+aK4PDdlFM2S+4BSabVs+Yg3XB3AsX1xgvE0I?= =?utf-8?q?5kGA4bMvXg/38vkCSGG/hhmYX2DshOQTxOKzAM3U1pv5zsPxayJKA2XPmHWGrBqqa?= =?utf-8?q?TQp6jM6C2NJrvueYHLdL2ytv78+cGEEIHEMl/mbC537tMBMnmEHt0nbWPxsbOELfQ?= =?utf-8?q?z+IX5xe+ZKDE5qZitM8vkO2uCzHef2WMlwQxVDupUmPIIGz3mMqaQbURHcqrk3yvK?= =?utf-8?q?2il5262BUEyG5UOrzHE2X2XTcNjWLjZIx3ZsN9+RCJy9hCGKutWw1MPxzBTqywRaZ?= =?utf-8?q?YvTuqEYT+CZMlymgseu0rYNO72at7OAzA6G0U7k42MNS+TzYg46+LD6dmRql1N35J?= =?utf-8?q?rzcqWeMgjqTUGCls1JoGQv68Z3IYatR9Am6xOMrd1Scku/OOw8p7WU1dUPjH9Ajmj?= =?utf-8?q?YFF5a2WVXwYTF72HfuoGYCmUnwxDvbCcdoCuWG91/JaT97tDDCzNfXsNxYf2Oovbo?= =?utf-8?q?8E/qK/iPtZbC0AGrTxSX2nVdMmsxQAhLG17c+fhqRp3e9YOG1laoXPS3+ijvt5vOA?= =?utf-8?q?6Vg6ist6vu+G+i+V+LRi/9m0PReUHUM3esf6SJ/9p08MjWuQWN7EP6AQoeFkNOev3?= =?utf-8?q?86OJTuuMrI7Y0kiZHX+mUvWg6h/rqv1FJ1Ox5w90c7WTSQ39FvnDuisNkSIeAEDej?= =?utf-8?q?Ka62yol2mlLxJzXa8EliVgZ1i0gNAzhxI6fY0Eb6ysz9IZ6urbiVZPIoNA2f3VMV4?= =?utf-8?q?+17FGIo8bkEhLqd5WmX2zOBxyq06uIsCQLzcy/kM1IqAHJrv4ocJbgpZaZZhrDWsy?= =?utf-8?q?byBcw85CcgnY7R/lqp34GY7akZ7tr/S2vvu8t/tiBzVWfT7BROouoC8qZ0R1FDMiu?= =?utf-8?q?m5XCerXBb2WBayTa74Dk7UDqeNNl1z/6OWPB+Jyzae1T+USnH4WU7rfo+HIgfo1y+?= =?utf-8?q?HZBQzeGkOeNe0g8URN5EpKnvf3E7MQb6vc3wQxbkDuRSCJWzp1+d30qooP5CY0vBo?= =?utf-8?q?Mm8FHKDCqDE77DkL7HIxOoc7aIKpLIeim9ltTwRLzwkE5z4iaOgVBIEIC4gL6levF?= =?utf-8?q?UKvz2YAwUwGOS9VeKLnaJr95okT1IPN6b/Z2rdWfA2LGWHyn72kUIslwQ9W2FzgNO?= =?utf-8?q?nM+YhuYAzx67o3nXCAv/QPFGjhBoGRzLOd+1YVaT7YiDta5aPcorQlOZFN1wpwYJx?= =?utf-8?q?/s0H20i5kh826txzDdgUYmlAFVefnKajr8472slhwPZY3KIroyFVRJp2RA36jJOe+?= =?utf-8?q?cYGn/EzySjfSCrlX9bWETz1AKtGYteAhvir+n1UlBVuuErSEOnZYolw2xTbfk3p5+?= =?utf-8?q?E8cDH6YOOCOYZLroP7ViBVtN7gUwJ3F2jFv6AJKo+TcKTPy0fD3zvXTTnlHUekHcz?= =?utf-8?q?y/6HGZsguJmmpF1G1Z6muf+nDhsXBmwGbG9s6dQkFHp4MUzw46EHAkJdbE24CID2N?= =?utf-8?q?abEj7oJDbo1OFslCBSWSd705JbpbNKiOTw=3D=3D?= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d3e8040-57ae-4c39-7020-08da7f63462e X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2022 08:42:38.3378 (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: 6HEXYoO9erHDPah2+wzEYgS57FisgyBhPP8DbfWwPrJy5jp7VXNJ6U/KVgeOol4pfQYG5HI2geTTJllTKoBP2g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3096 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Stefan Herbrechtsmeier Add xz bintool to binman to support on-the-fly compression. Signed-off-by: Stefan Herbrechtsmeier Reviewed-by: Simon Glass --- (no changes since v3) Changes in v3: - Rebase Changes in v2: - Added tools/binman/btool/xz.py | 31 +++++++++++++++++++++++++++++++ tools/binman/comp_util.py | 4 +++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 tools/binman/btool/xz.py diff --git a/tools/binman/btool/xz.py b/tools/binman/btool/xz.py new file mode 100644 index 0000000000..e2b413d18b --- /dev/null +++ b/tools/binman/btool/xz.py @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: GPL-2.0+ +# Copyright (C) 2022 Weidmüller Interface GmbH & Co. KG +# Stefan Herbrechtsmeier +# +"""Bintool implementation for xz + +xz allows compression and decompression of files. + +Documentation is available via:: + + man xz +""" + +from binman import bintool + +# pylint: disable=C0103 +class Bintoolxz(bintool.BintoolPacker): + """Compression/decompression using the xz algorithm + + This bintool supports running `xz` to compress and decompress data, as + used by binman. + + It is also possible to fetch the tool, which uses `apt` to install it. + + Documentation is available via:: + + man xz + """ + def __init__(self, name): + super().__init__(name, fetch_package='xz-utils', + version_regex=r'xz \(XZ Utils\) ([0-9.]+)') diff --git a/tools/binman/comp_util.py b/tools/binman/comp_util.py index d8fdd5c7a2..8c0fe5078f 100644 --- a/tools/binman/comp_util.py +++ b/tools/binman/comp_util.py @@ -12,6 +12,7 @@ This supports the following compression algorithm: lz4 lzma lzo + xz Note that for lzma this uses an old version of the algorithm, not that provided by xz. @@ -22,6 +23,7 @@ This requires the following tools: lz4 lzma_alone lzop + xz It also requires an output directory to be previously set up, by calling PrepareOutputDir(). @@ -33,7 +35,7 @@ from binman import bintool from patman import tools # Supported compression algorithms -ALGORITHMS = ['bzip2', 'gzip', 'lz4', 'lzma', 'lzo'] +ALGORITHMS = ['bzip2', 'gzip', 'lz4', 'lzma', 'lzo', 'xz'] bintools = {}