From patchwork Tue Aug 16 06:41:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1666692 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=LKubp393; 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 4M6M7g43Nxz1yft for ; Tue, 16 Aug 2022 16:44:15 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 71A1B849BA; Tue, 16 Aug 2022 08:42:59 +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="LKubp393"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ED192848B8; Tue, 16 Aug 2022 08:42:36 +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 EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60046.outbound.protection.outlook.com [40.107.6.46]) (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 A157A848BE for ; Tue, 16 Aug 2022 08:42:29 +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=ds3mHEbm1ATUE69b0cT3yC/vJgbYdCad+EWhAaEb9b2o2H0awXkuOkXJcpG1WtNvVvtD2MJk3gwF0yjpYslSsyoU1ELGYSQbKzfOe4m5A6l66cp6ISwhqQ+sfipq73xUfmhgXjdMH3j8vAANWYuURXBGO781dKEXJwS9dRTF2amKQ5405hthzbpS70IPE2bAr8LsNV/qgdP4rFMS/iHpvhkgxW1jz57Aqcwjelsv03KqvCfumjbum9EJSj+AHIw+zN2Ba00k7No7PAKfEdPpwEgeM26Mm+gwfsAWAOQSqSUZEWWrLASnIfDaH/eXN5VYHkpk4epuapTkQM2bdbSsTA== 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=YXGHiqj8fFIYd25fpTuI0nVxxCNTocW+MnE6BoTF5no=; b=lDVwuRv5Iwj3NBTYIrRqjCA4LX0yi4sz48fAk5Z7j6Txvq+uBNuTRcjxN8+id5fXjPU3hWY1H2gAGeoJeudQwfS9pQEl60kCZ8PgNbtxY2w+iqs4CORaVBtFf3hMBkotSnAWfLzZVjEsPDpUJHoNS1TzXebIozOeduRTia+gnj5BXonO9XJn68xRRHQNkmasUdRWsSbDqEjJgtmhFS1vZz3qp9lBnhj2PkyWqwwKbu8g05tj94ElZysyu+8d2r3+xY0rfJbZG68bQoz1kLZo3vO+pWp+cWl+ZTWZF8yNon8FtbQulsN8dVlAq87H7h6b9yF+S5BfEB1ExXw32vpCvA== 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=YXGHiqj8fFIYd25fpTuI0nVxxCNTocW+MnE6BoTF5no=; b=LKubp393osrLLfebaUKaOvzmWqiThNBOYEkhy36ZNWf3HQGoPW3+9NDUoOUr18z8nR/+Ev3c2+HCWfNzXjk+mf0hbFlJJZOXCvZuM95o/ETLZR10jQVEV/0GsG/QYmWXV/kxhFVX6K7KaZrnh37TcJnSeyb8aojWHE709I2VHmA= 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 DU0PR08MB8662.eurprd08.prod.outlook.com (2603:10a6:10:402::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.11; Tue, 16 Aug 2022 06:42:27 +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 06:42:27 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v3 08/13] binman: Add bzip2 bintool Date: Tue, 16 Aug 2022 08:41:46 +0200 Message-Id: <20220816064151.9848-8-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220816064151.9848-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220816064151.9848-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS9PR06CA0744.eurprd06.prod.outlook.com (2603:10a6:20b:487::19) 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: 49f3ce91-768a-46e5-e08d-08da7f527c1f X-MS-TrafficTypeDiagnostic: DU0PR08MB8662:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +euKl3yDNyBofjdvC+CDzslD7x++2ibXZiH7YbRhVADCPnBEJYm8wo+2ELP2rZ3pMh8gIi6eEXfrIkt9RIxgdbIZO6XLopREgLwxSwaYWEcyJLxRGQLHVAVkhQfByoDOxcRnrGHo7wK3T2Rf6Qch8dAYkt5GKK4ArVcThmk7aSONQJdZapLwKc0kkx5YuhyytgzQJ8+KVDAcMgJvqZmE+VhC8Q8JnMxdlF2kLWprk6OhYnwarSmzR97E7dkFPvX2xwCLPgzDWx5yrj894VEO6Jnc0dCjKc3Uo7KD06RUvUmX3MzZVZkf42macB2u/mAfIWK6leEZ5x4OvIsnGQu6iZ2PZfe97fhrLLQZUyr3czpRYqBu9LMEWg99VupNQIeNA6pP2p0ZLDc5BTOTWNx5YmOT2sX0genPytDWwh0spfkl/1AQP67BdEKKCwSivVyIQ56Hc/jjbjrBjctkFatHnshELPiN/eWunWtgarFyFaGOVUZY2un6I4jq6+jdHLzmF+6wz0VNbPbsYut/De6cTqrE1Jwa/jAuLz+y1hUuj2kANeC5UUgiQDDugRzj8msdNV3ETU+kabU1jyjxlvHSUgDwl6e0VhZWqdUDcucLL9+38hcK1YJ1AiOZTMNpK5D4QwD8IBJ6Rt6RnHNDcbVfRdRiaK3gCp9Vf/LldqhJ2DaIYp0jrdJOJehgZEdVTyaaCHH3eK7IfQcr2Cu4Oq7iFihHPLvDPmedo5IQx75Fuo0lpVxZJF2iQw+Jgqs1InXsXY6xStazEmxMuc77nCJ3OvjAoC4AXD+UJ9SIbo6qfngAVH7Hi1dgJ2kk5c7mMj5L 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)(346002)(376002)(39860400002)(136003)(396003)(366004)(316002)(6666004)(41300700001)(52116002)(6506007)(6916009)(54906003)(86362001)(478600001)(6486002)(38100700002)(38350700002)(83380400001)(2616005)(186003)(1076003)(26005)(6512007)(66574015)(66476007)(66556008)(4326008)(8676002)(66946007)(36756003)(2906002)(8936002)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?LeuS7BTEl0X7ONsi31ZI/mgqJ698?= =?utf-8?q?Br6kPB9fVJ+/0DQBB5Qrx0BDu/A6lzdSZ/N2j4KCUk/aOVQ8HShyc2KHv9mTzvrws?= =?utf-8?q?U7hYGp96nGp7Gpvec+DTfcRi8axfmv+jKXMkIx/dCsXmQwckmWEqoyORul6OTC4Vx?= =?utf-8?q?XEBnlkiO4/vF3XiNcj0yyYqp/hoU0s44ZQkRTX4feCaefJI6thyWCfZLCxf78TdZ8?= =?utf-8?q?xH2DpvEzWJfrf/5pZLTYGy18GOB66hifAgHMMRwSTEzE7cf/bCM9Pe5uy2UPma7k4?= =?utf-8?q?HfPCNDfogwf5l3UkYvQSmWHiPyUPJLbe2G4I7vRgJ8295m20482TtzZ0ROI61UkBN?= =?utf-8?q?9/hqASg4LrBgeDbrsS9oPUShW7bCxPju5LUruD6G/BEey8HairtFO3FXtdx6oZBid?= =?utf-8?q?0oUtOXKFypCuPpmrodRCMUp3PhRdaEs2j3lyD6+v9QGoQBxC3jL/PK/g10UfQUMpp?= =?utf-8?q?nloHtqJ00NFrVeWXZXPOFL2tlIDpM0jscOKxnRN8rf4nC6y9bovi0+RL/lGxjzMLX?= =?utf-8?q?HT6hQfVDULogl8+FDzx6PeS5WHZxLBcm2C6xDzvEmDBbSEwq3IJNQJOR+pL2gHweB?= =?utf-8?q?tGwdgYDNRcDnxsU2b9I+uDuOLDCqKxsftaLuueKwSlMnyfq+7EV3m0S6ZFxDoIu9p?= =?utf-8?q?ZehPMVnrYiS5d3SQDlKqToI8wIiTJyTfJLW/uvp/cFlYvEMrmX4bv5jb1wgxaAw9e?= =?utf-8?q?8Z2Z5u88qseiWSFi6eJukri9cwLifxZOMx7btkFNOs4fS9bdDCK+Iijxxf/dP0D3l?= =?utf-8?q?lEqp7ui0K+ZcDNI+az3MtaW9tC6UsPXQtZz4RcqlEICN+46lqS5E8hNRDMSutyZC1?= =?utf-8?q?7wHjzZ0U7YW63Q//nVrhOfb7fN272IpOYTPQyWBCjdwidqvWNdChOsg4Bj2F66iFJ?= =?utf-8?q?5O0TzX8XkPfJ5KxFJDHZZwu7JZ0iqpFS92cWeBiIiGjBklXdBTKOIHDrx9xqabQQT?= =?utf-8?q?BNiGOTIAt1PNWcYpuwt1umgogTpvJUYVFJK58OmTPY8ydrP4bQVQHoanPX+GFsAg6?= =?utf-8?q?CnzqKkmEtnw/wp78CAhQyW89CG9/rVFEjrfVtF8zfNcTsh9Z0rrqyyi9KamyR4TnT?= =?utf-8?q?8ffXhH45QRbw7oQpLq0B3KLLT+xdsfaXCUAQcql0VpGZgxo9cBCDcSB4VzU1NbZG1?= =?utf-8?q?vLuZvAgLQgxIJ54voG8Q7kHmpUfYEpCIQHDo65exZsoK/vxpEg0uQcoVQAAQ3S3nh?= =?utf-8?q?xmnS68QmPTX+svZ+ZDkJokc1fOQUJ4LPe0FdXKUrj1vQ+Z2DnIxBqKlu1ZEsOuyIs?= =?utf-8?q?IW+jpYloCZMS9RcO+qTcWjba3uSwf2rCJkEM/8EnlPTtOusifqcHn+TIB77MnYFzm?= =?utf-8?q?IVz4/gjFRgnA9pEnpd50LFKVUpmlf3euCaelZn5ltUlIUu54rt53SMOuNbnpdpPjw?= =?utf-8?q?IV2oXMykfCMNwxQxtmIaQssO1bcgZ45ffHOepuE6GReZxpitu/KP4Dmap0P5u8kLl?= =?utf-8?q?V02dTKlSQdpsf9IOwpynVWg+YMA9qybnjDa7TWoK0gjMka2I1wORLm5vfYlSfV0gd?= =?utf-8?q?RT93nufBSX3qxfh6QCNQRZEWwNTq8qZt5g=3D=3D?= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 49f3ce91-768a-46e5-e08d-08da7f527c1f X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2022 06:42:27.4119 (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: I/d2KN6cN8VVv3gELfDyJAoRdDk6WFbeFpE4jdjclv3KkMIWb6MuVy7XxRcmsDNQw6RJecnTBD95Q7TXxtkNJQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB8662 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 --- 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 = {}