From patchwork Tue Aug 16 08:42:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1666738 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=p88Q4oPJ; 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 4M6PpS0v5Dz1yft for ; Tue, 16 Aug 2022 18:44:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 24872849F7; Tue, 16 Aug 2022 10:43:12 +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="p88Q4oPJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D67A084541; Tue, 16 Aug 2022 10:42:45 +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-eopbgr10059.outbound.protection.outlook.com [40.107.1.59]) (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 F3499848FF for ; Tue, 16 Aug 2022 10:42:38 +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=PezlxAngmXFlg6ILrwASR7DgpT3rJ1h5UWBByrWxnlzmtGiRcBsOa7MMzd9q3+VTIVqFuuJBR0kuSPYk2IlZYPj5cxXEe2nQOwLQPxVEwd3Vgp7VPrPDOofW20Ei0s/vIjrT+NCXhGPPMnjQmSPTySlDJN0giaN/kNzU0WE1CFHfT7g2/1S5uIHdieB06m0aWWYH9S7DRy5vMzRizTXrlWR3JnElpA4Jx1fzL+w6QMtWzI8N1R+6GCT5Sz9PQW7WSc0kck2BcsOUC5pY+1mB7mK6UceELnWxY5pf9hEcXBrWcgGuZSps5bdAlCzzGXAhciHdTyDDHm6wpMlt/w8SzA== 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=hZJFS2VbBywllih4TRetx3fBuQc/bC8sGPb1BCVkuF4=; b=FUwM5UCmOdtEvQqsW0NegJ3Ng6bz4qm4IgmusZpZOeQi7pELatpkBVDApLG1MDkAv6a3vj1fGWt1d+B+2e/1oVxzwoxncuHgxeHBqvCVL3wSE0PyokR5VVmqfu8ua3TC1b8EGgs64CubKCq6xeo4ocnSN5X9t8GBjyf7ByU9xqLD4fSBFjwwpw+Fm8l/jQzL7Zru05hP4bcSuBro5TsZrnnXmF6q3a/A08Bdyg/CiJRQOZGLa8muzObEDavsoYDJthjUrryspWw61t9CPgAts+LRqFMU/Bzm9jEqEUAD6yKrnMsUEvqAn8yYQfpr++8qDzJdXqrPSowpqRozTfBimQ== 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=hZJFS2VbBywllih4TRetx3fBuQc/bC8sGPb1BCVkuF4=; b=p88Q4oPJwuYjUIIj6cvr7jsa10fITinAS4mxAIIZT99FzExAkTBtFORlpOvVEWLXkeh/e/eY1+a2rjW/kp5mQQZTUOMHwB0anWhe5w1Ob9wohKRfNb6Uw7dFICU9PI4gGQax/h4yCTK7z43pAxWX9xTmCJ9oBnleWO/TZ5lu+SY= 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 10/13] binman: Add lzop bintool Date: Tue, 16 Aug 2022 10:42:07 +0200 Message-Id: <20220816084210.14972-10-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: 38fbc82e-035d-4dbe-7b22-08da7f6345eb 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: WoQvdMlffK8+jpwh1Od/wZVfSYA/m0EFsCFbVmJoPDuie/UClezvRF1Bm93hYwSVNY+8OXKQ3zKnv75Uv//6kPnrqAbNnbbuO72C6EzJv1dcAFl5TXnb64TEgNfIa4c9jwFPipZBA/bwO/ump4vy9rBLdaDkfWTE8tKRQL9SBwqYmachoUCv+aVUtWp8lQlPnsFhZHwOv/olokIK6hKdwBWEK1lHZEGkoM0ERZrNfCTpedJlQHPSBExPjfvVGnmR0B0WuFNmogayI/MV/YXfKkVrHblHvbBD3hnAi6Ipgfl0De16EAHgjjNBawMC96CUHPuA88Uix6nGp2NHBOKJ0ag3tJ8agSTSJFWA+j4JRmBVwWmsXDqNkPFoMT4fKFejzhNDHIjJe8CNYmapJNb5cwtXh0z4wOxU5SH/Ryq6aYHP3vpKdEQSBAlXjSBE1urHpFPD6+22r5G6J5xGr4lx0eKePiEWK8M7PwQFfA4lFv0n30iY4Jf88vttXw/y5nMmJFd92xOXWsjEI40ILk8Cb3Dq7JHZ9O5iGSFFOAA1y+Og9stawJ3JjM+qK7r2AwRaDyci8WCI8L5Fvu5N4wcQkfCWreKgIagDkTqdoHJqGUFXUerI5GpTeQIOxE8jcpUqMoMwlQN38CiT5F07aHfPNSdQfSX9UG/qEwKDtjBC+q7cmsE1Oya9MochnyzGJEsZx5W8ElNIUp/xo1w/i2xX6xsvINCmhKpVjk2FE6TGlpODWfaWtmHb3auWbc1gmMYzTeoiJf5+0H4wPapAY6oaLj5wZL5Y8q1wUOvUCPT+qrQ= 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)(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?4qsWkAhkF8V8uroJYYQuTocrJLsP?= =?utf-8?q?+YI5ZWkmL87Jxc8JjAs3VuDcb1W7EFzx8W6Y8qcEtXNoACxKCeQODi03duz/2Btlp?= =?utf-8?q?5Lq5sIevZlWmkf8as0eR7awva9hrKFGNnZEpEyI9zTLqgy6mJXgHcklqBKAk8o8jM?= =?utf-8?q?vT7BLPvMxTWBWcBE+CF4taxMT7CCNbxenxEFSoLb0gi4iME+Jiogc0buXkHprHPSu?= =?utf-8?q?CNIQMfDZ+d/SwV2A++5xfJSjxeyNNeoY2C856zLy7RvGl9ctrWOBY/nl8z1nwhG/T?= =?utf-8?q?Qvck77rq3ius9uhsHLIMPN7/16YinZLpoCXT1cnQWQ0KpyFm/DrJLpT/PURDawCcm?= =?utf-8?q?NJiqGzyasOy+7CSfBlUPTY2I/YlDaqSF64ibB8qO7aNxdHzt2Ok95ft81Ie7zGH/I?= =?utf-8?q?fkANbq9Fe6zCLTQIl4Mh5yqRbn2px2IVgA2TZF8RxDiukZeQLHdNj/nmgRkrzCyjq?= =?utf-8?q?iIjsWZ2J9U0/VRuicPfAHq0Vjum3ZUIHkr0tXpVLpXlvptjrkJJ37dHwnUxxwVqJX?= =?utf-8?q?5yvyaOxY0BUR6w10paAoO9y3/pOsC0LtBcfPVAFqrrc+/Eeh37eI0UBiurJx3fZ+Y?= =?utf-8?q?BwHl1OWui8up8CWAEhTnM5E9DV9o/KZL1PPCgcyez8Y8CshXUfeZYPYzEzZo+jG5u?= =?utf-8?q?SndeSPvhCZlqbYrTzPEsl/rND9VnaPAFFaxR279LTh4zc1BdS2ltduSMbCvB1K1Sw?= =?utf-8?q?rqB6xdE2tZmoyfOombEg3pj2rvQzZGe5TiDFrlQi7bb6ocQt3LumukIGL+Zkx8ntF?= =?utf-8?q?Ec2Z+l635bdYHX1SnK3TRftVBxuFUKu6vgjU6F9re75rGlRrOa1umw8sZZGYKOM+B?= =?utf-8?q?KR7uX9uA4HnNNKVdGkS0UmF3JcF8S7YPz0C3edzYOalzMbJ9/BajTCuPb5VNPzfDb?= =?utf-8?q?wpMbrk2oKYrhLhbQqk/4T+bj9h7bGasfyw0iyyma8DiXW08AVKmtxym+adUnLRbRU?= =?utf-8?q?ewY38JzX80CSn4z7UP0eWLZ+ev6xjQNRyIpQDKOIqRg4bkYh0yql4kOKcdyBvlAK+?= =?utf-8?q?KmAecqRzBQsiM+E80QHJzrelh1cVyHhdbZk+YSLTok83PlXLI8ajVpWZsPwfmwZRk?= =?utf-8?q?6fCHYLwI0VZkiKl6Enf5EOC1AAK/BRyjQ2KuJn0El9ABwwaFPD3JXFehErxMklYlK?= =?utf-8?q?WQPzUE7O1qtIvSSRdd18kX4yYvxGgHMmUG6ihVWGB54I9rRplpTjOdEXISlvPNdTE?= =?utf-8?q?uuog86Yp2KQ9mRnXMoUDvY+Rgj/Zb4H7QiWQ2G2Wf++OJJbea4isschtHe781S1BN?= =?utf-8?q?1SeQmf6Q58BQe3PyHNLMwz47jzmhhXDDnKp+Op3TVVyKeBgwCQWEmCe363iYT6uAX?= =?utf-8?q?EomV0Evn5p45nUgpwibi2ionZ/D8Lh2plhOKaeKWJlCB+LVguH0339QWEwN8/zb+h?= =?utf-8?q?ZWYbaJIvtifOdD0isdNdRcEL4NJX3Sg2wQoXOmH0bW5UPpB75teGaM7iHezaZm++O?= =?utf-8?q?+9UkVuFIdn+JAv6Jia1NMH17WbtQsR7H+gWItxRzHxbg2dTym95niEPp+5/84OyiJ?= =?utf-8?q?uKpI9N/rsOLiHoSFuHcdNMM9Za54S2jh6w=3D=3D?= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38fbc82e-035d-4dbe-7b22-08da7f6345eb 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:37.8834 (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: 0mcdc4AJEWSo3HZojMepplRuPiEexrGo+bR5XuyycYbUUdzoSkklJSbcHS0qs+l5i9vU48rWcjvKo9M32XGBng== 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 lzop 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/lzop.py | 30 ++++++++++++++++++++++++++++++ tools/binman/comp_util.py | 6 ++++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 tools/binman/btool/lzop.py diff --git a/tools/binman/btool/lzop.py b/tools/binman/btool/lzop.py new file mode 100644 index 0000000000..f6903b4db7 --- /dev/null +++ b/tools/binman/btool/lzop.py @@ -0,0 +1,30 @@ +# SPDX-License-Identifier: GPL-2.0+ +# Copyright (C) 2022 Weidmüller Interface GmbH & Co. KG +# Stefan Herbrechtsmeier +# +"""Bintool implementation for lzop + +lzop allows compression and decompression of files. + +Documentation is available via:: + + man lzop +""" + +from binman import bintool + +# pylint: disable=C0103 +class Bintoollzop(bintool.BintoolPacker): + """Compression/decompression using the lzop algorithm + + This bintool supports running `lzop` 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 lzop + """ + def __init__(self, name): + super().__init__(name, 'lzo', compress_args=[]) diff --git a/tools/binman/comp_util.py b/tools/binman/comp_util.py index 19627e490c..d8fdd5c7a2 100644 --- a/tools/binman/comp_util.py +++ b/tools/binman/comp_util.py @@ -11,6 +11,7 @@ This supports the following compression algorithm: gzip lz4 lzma + lzo Note that for lzma this uses an old version of the algorithm, not that provided by xz. @@ -20,6 +21,7 @@ This requires the following tools: gzip lz4 lzma_alone + lzop It also requires an output directory to be previously set up, by calling PrepareOutputDir(). @@ -31,7 +33,7 @@ from binman import bintool from patman import tools # Supported compression algorithms -ALGORITHMS = ['bzip2', 'gzip', 'lz4', 'lzma'] +ALGORITHMS = ['bzip2', 'gzip', 'lz4', 'lzma', 'lzo'] bintools = {} @@ -44,7 +46,7 @@ def _get_tool_name(algo): Returns: str: Tool name """ - names = {'lzma': 'lzma_alone'} + names = {'lzma': 'lzma_alone', 'lzo': 'lzop'} return names.get(algo, algo) def _get_tool(algo):