From patchwork Tue Aug 16 08:42:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1666736 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=u09YxQWP; 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 4M6Pp2693bz1yft for ; Tue, 16 Aug 2022 18:44:10 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3D997849CA; Tue, 16 Aug 2022 10:43:05 +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="u09YxQWP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 151F4848C4; 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 80809848AA 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=crUlY7TsDTvcsSJodkOJI9zNOjjJEpRrgK3SQEC4XmqV1lmX0TSqaMizgF5Tbha0YSMmKYiItolu1TOmWME+Jz12y7ifpbvATZqDzQgdifqXY7I975CSIIzSpAC9Z0jRYZS/R1XPi3WIEYcGx6bFyZw5WQCd4qnEQBLmYgbzWgKkX+23H+QE9JWLtbVfwamMGhyAre8ja3FaJvIta8kcRRsH0lXjsHFQaoJR1qdDLbq/LkpVPeU3EY8a9glJjK6CNCr8+/U2BB1WKiE+lrn9T4LYdcKKctvkhBTIm/XljC8mZmAW1ZwWdH4aL7j4IMkPYofC7oDVU/yydjq1aWEj8w== 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=vLovhJ5fSHeprcuvEGJfGhxzRAdh9W3vDz3NvKAi0P0=; b=aYcstgr2RBr8y2i6ej9lP5w5qwWkR2/GZiXzt7PgmnT+0uv7fCMiJPzMivi49UMzacWH/eDHRC/UAM/bLyRSFSjSUl4hmbJFNarJnV+xbiKFImy6NngWUpwF7oZmpQIpZXK/EbCa2xiH9JilsW1jM0ZRg6ug3qrb17FGU/J/IEgjx018xmBzj5BppQctDWqadXe1Gq8IJ3gd50OF2+zjucAINx+otNeSSHm67BKyzE1fQL4JqJtmEzY9SR+cMrxRmrK4iznvlbVJTHr2y7+CrO4f7yrYfTovkuNMr7yqRXU1J80wAwTif/QhiIAc+G7y/I9r57/1S2+wzM1HMxA1+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=vLovhJ5fSHeprcuvEGJfGhxzRAdh9W3vDz3NvKAi0P0=; b=u09YxQWPoMaXmk2y5P5Z9VJg2X1QYpxms6h9pBs1qP+eME2SJkxVByZSJtvECEXfymxRXpDCJ0ig4luI8tRkdXccNLI7rAYqtOMgjhXkzncxOiJKqMd3aiX5/2ezJY72WA+LxbbtEmxNIoBMPHjr3scJ9E9EiFYV4nvjGisxRoQ= 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:37 +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:37 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v4 08/13] binman: Add bzip2 bintool Date: Tue, 16 Aug 2022 10:42:05 +0200 Message-Id: <20220816084210.14972-8-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: c8cc4fc6-86fa-4311-af31-08da7f634559 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: QmSTZk74l36JvkusiPH+tTN5bL+lZdKWDtqLHEHALXp2vMWB+k+WptgwRtkOKtdMNxHI9gdXLFVfPo052d6Ejk19wkqjHks076EkpT9wLzJC4Cft4LPKWzplGnKqQEL1RAw1Oav3iZbnfZ+zv2/xw1SI/YlRo7yOki9BzwyX/gaFidYXNRE8Awu5cSD2borzRG6FqqTraefeoJIOJ46VIjkuQ1BhEgfxnlTP3avywfJUInNujCoVVtV2TtOtdq0jU+ksigIPYzG4UUa4Euie+V+heyNRihl8iOVpVt/X4E3U/DeVYQAGR7Qnr4qWl+sz4vodp7omecncLSHrX39B+Vx6XO37wCT5jsLHW5g5Sag2/w/6gVx1ydwOu2Sp6Sp90pjeSdq2hKTjWKt7a6r/EgCL4PzvTk6fxRkQvWnBCnRw0Q1JrzW65wAJeBX1zUNhohYcgYY5bVL8u1hL4KZt73n5J7FHvs/Y/jY6FEbQmaY5d1ede5lRfNIYRdwLb4QzApAo8gzY0ID4y+eoJSIAvznrMJ7ILlYZbf4lIiI0TpeUH4oGeJlG7oRJsL7R8LS2FUOVB3ZTYVprVTjXJONSA2qXBy5uh/3SJwXjkDG2mq1uHDAoknGqGgcGc3V8n8hs60g052KHpg0FE5BdSKULmkS5YVNDexptKhYEyAh6FpN9pKdipGfOSrtWOQL9i3gGrJmKJ3d9UjNu5TN/g1pmZweSI4js2BoyDUdAP2xBqgkHlU9xS6OTVqTNaj0Jlewe8OyupVNWVUwQAT5umEJEpF/ajErtfGRLGVxz7fJWWbSGvXSTwHvMx2bIpVvNmCCc 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?NjsuaXTTigjxXF/bJob1PqwTl6vJ?= =?utf-8?q?TyxyiGQ8HnO/u867z8iXwIUBGF9aSorthHpScFjRJ9VUUqDFc3zk+xgbbqlqnDf1U?= =?utf-8?q?Yp9SSy2/tZ9VjV0gYmZwTT0W3fa3tGaqL5L9qu8zVT5Hxlq0PuVG7OL/R4F69P6ZO?= =?utf-8?q?Hb0Lv1aN99NliMDUBeJyGCCkJV6WLUgOqdNdx7nExh7frwSwbLZ8BCTpqtg9vL094?= =?utf-8?q?rcy8iMUFksKmx1lDO5On62Yu2zOQDysJwKpiq9x8G1B5OWPLxjURBfl9lABKoo4YH?= =?utf-8?q?yHhs4LmcJCQ/AznTen9W6rRHnppaPRyNiyA539VuKtLaxAtkXdjsi9ZV7ogZugyns?= =?utf-8?q?NiLRK5Ydc7JWgPgc2+oJ2B6X4p1+Sftx/yYPEEMkRbfqj21zDREecODMbx2j/PW5p?= =?utf-8?q?tZvx4yP9FPbBBT92CNBrY1V66XEbvGD5d+Q0plCLzC33vkObYLLe+srGxwq2d8dD6?= =?utf-8?q?GMMsIo7Wb+GZzhMnueE4bytSykW63IUVJ5nKA4RfRMdvroo8y5gw0fhM9fK6z/Pm7?= =?utf-8?q?IVQBVrJZLIKCmV7VKClM6Cqmsi30X+3oRZ70NGAxjlE50IeKsY3kUO/F13rnIFvDm?= =?utf-8?q?z1zLG0YH/QWvi7vQahQ4nfhsvcYkLy6oNj75jXmehexZuYyMhEKEXSpz9fKNEgYo6?= =?utf-8?q?J90x8v7d/Z3pa0JAmwsTug99IIDDrOyu5Ghq7FV2910R2OKlSZk6geGOmaBfi1R4Y?= =?utf-8?q?BtcU2nyFrijiXER+iR5RNWwji3HzCIK+3WbPWH9JNp+Od3yvpqRRky3kbgLgZBwh3?= =?utf-8?q?QCp0E78aMQT1QSL0c2945PG7FnOtRLfVGpSQm/llWfYJ8h98BOFu7BwTKl2sLtJpb?= =?utf-8?q?lUMlivAQ/hiiZhkKCY7hFRwk7IBk+/f59OMhyojAhOPuaoikUl84xQDaq95OhexLj?= =?utf-8?q?PlrCofs1JUu72ZMHroIzq9NDR3GjMQjpiJN5QAzSKTUXIL1mMeO6ruDNez9xMVNms?= =?utf-8?q?d5jfLShLTY35ZW7aa8xYOKDpnJYi/ljFB/b/se6vLU891AErty5sejLNwpO+ZiuMq?= =?utf-8?q?FXPYyRyxmbkxZflXCftlX2YOxyWIuAEgm1zXMm/rm1fpIBfpMemaEc5op+6smc4YQ?= =?utf-8?q?0XtM/FyhlVRwKA/SSPS+Vl881+WNMkcXXQYNk1ud1pUv8t3YUrYr10kAmwtZ7OJPD?= =?utf-8?q?Y8kBoCRVwSbzZivFaPiYYj0FiOGfa/CmtulNYhElHiOAfBIb/a+0pTAzvCXQihY7r?= =?utf-8?q?HBBtogF7yC/9eWS9mp3IhpAqI7SXw7lci1dzvHtkFhTY1dwew2iHRjhq94aRJA+JL?= =?utf-8?q?QE+NEsaFvqGS7DdSzYOryL9twBs01VqW6Bi2o6djCkBg+tz6hYZR3JEreWCHZFAz8?= =?utf-8?q?DMT57+hK3/uW42om6MAPfb4+2Ovboi7ZbZKJvaHQuJbyVGXlhAbiOq+wFxj1o3+fM?= =?utf-8?q?8GcZze/6oC3CMXHRMbKdfifiapaR+vGNKdd1cwb+RIDCPAA6abi37s8qXrYkRpc1+?= =?utf-8?q?/LyLhpXzItfC1rL59VyK56IcdSnyrE5R1MF8qFSrhJwifHVZvwdxA00GF5IJFqYEe?= =?utf-8?q?efxfMkuykyvoH5XRm93xnWS2u+mZacw/7A=3D=3D?= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: c8cc4fc6-86fa-4311-af31-08da7f634559 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.0060 (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: 2CHLAScqGY89UeldSweVqkR5n0gPuAHVmmLlNJ6a3GIV/0NkwzqCRCOeATNtRREfz2Rts5wtfZWbcqBoB2Dt/g== 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 bzip2 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/bzip2.py | 30 ++++++++++++++++++++++++++++++ tools/binman/comp_util.py | 4 +++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 tools/binman/btool/bzip2.py diff --git a/tools/binman/btool/bzip2.py b/tools/binman/btool/bzip2.py new file mode 100644 index 0000000000..9be87a621f --- /dev/null +++ b/tools/binman/btool/bzip2.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 bzip2 + +bzip2 allows compression and decompression of files. + +Documentation is available via:: + + man bzip2 +""" + +from binman import bintool + +# pylint: disable=C0103 +class Bintoolbzip2(bintool.BintoolPacker): + """Compression/decompression using the bzip2 algorithm + + This bintool supports running `bzip2` 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 bzip2 + """ + def __init__(self, name): + super().__init__(name, version_regex=r'bzip2.*Version ([0-9.]+)') diff --git a/tools/binman/comp_util.py b/tools/binman/comp_util.py index 00761d44cc..6ec371b145 100644 --- a/tools/binman/comp_util.py +++ b/tools/binman/comp_util.py @@ -7,6 +7,7 @@ This supports the following compression algorithm: none + bzip2 lz4 lzma @@ -14,6 +15,7 @@ Note that for lzma this uses an old version of the algorithm, not that provided by xz. This requires the following tools: + bzip2 lz4 lzma_alone @@ -27,7 +29,7 @@ from binman import bintool from patman import tools # Supported compression algorithms -ALGORITHMS = ['lz4', 'lzma'] +ALGORITHMS = ['bzip2', 'lz4', 'lzma'] bintools = {}