From patchwork Fri Aug 19 14:00:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668134 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=NXYdo29o; 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 4M8Nlp6lRYz1ygd for ; Sat, 20 Aug 2022 00:04:06 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 10F8184BB3; Fri, 19 Aug 2022 16:01:55 +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="NXYdo29o"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A305B84B5F; Fri, 19 Aug 2022 16:01:18 +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 EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2041.outbound.protection.outlook.com [40.107.22.41]) (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 349D284B6B for ; Fri, 19 Aug 2022 16:01:03 +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=AXnSjKR9ZoyTWi6I0qn7uU9AcX2EiR/ocCSfBpwCyDOw99okcR7phXsb6e1VKtcWaU53NaEsjXOe9SQc2tHdpcZMNI4YBaX8CPv05eaw6LTnoMIoSg3KkCxeovL32CVk0OnkcXHZ0hbmT67BARZf24zYWrnNm77VOEANHAO9JP0/8nptdoSLWukUfTSDvDR//SN8kOjlYEEbhkdrJWl+zWuEV9F8ise4GCo5e0a2908cTTwdbBqPmrdIdm6M5mdnZk4xYesZJ20CB5V0qDu4FYCvZpwU5dOU6hy0WscM9YEboHjHfMChUaVeGxVUQGAxTZeRNneMG5KXRzvwLDfSgg== 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=/SquJ8/SCfrcIupxrYwP+O3zn+coh+7Hb4KOiv6buBc=; b=dBD6eCv5yRAMQyyxzWLQRsGoh4CK06h71f6LUX5BPbhclpZ3a26H5wFnDWSk8ApvYJxQ2xClhFUcqhpcPRdYaTtLTMgq7iWZm1JZEsRQ4OVCmdDlaaOTPUHvJPfVYqSccqXo1ZNM3VFfJY+yX8CLwhyS3GsjWiTe7Sd/JC90mZj/QYr91YP3d5AxqSvI6wwXcKBCwV+wXni4PccvpRL7cuKDwAUmcAS8VYf5Hfa5RQmzV2sFocOneMDAfgEwet055zUS5GYWTrIEh365vB67LFUS4F5t5SZA4TEZuqVD79yqOuHgidBdlPFWoeGdB94k+qm/L4K93dT7kP0y8Nbzdw== 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=/SquJ8/SCfrcIupxrYwP+O3zn+coh+7Hb4KOiv6buBc=; b=NXYdo29o4hJ+dJFxTv+ju/rbabZLKR+aVIN+mAMhuEmzOmIQBVxdgksU07xpLULs9ko7+7fkeV+2nf4+Xy5lqIhe5Z9sN0DeGnWDRcuA19XYn2lIY+JOftiNVVTraygBMRZUgllE1idJqEpxMzOX2frl9oR2i7noZnsehZDsRoM= 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 DU2PR08MB7373.eurprd08.prod.outlook.com (2603:10a6:10:2f1::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.16; Fri, 19 Aug 2022 14:01:02 +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.5546.018; Fri, 19 Aug 2022 14:01:02 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v5 17/21] binman: Add bzip2 bintool Date: Fri, 19 Aug 2022 16:00:31 +0200 Message-Id: <20220819140035.32760-18-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220819140035.32760-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220819140035.32760-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS4P251CA0011.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:5d2::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: 06a631e5-1d64-480c-d446-08da81eb4039 X-MS-TrafficTypeDiagnostic: DU2PR08MB7373:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /EKLwkBGGUiMLib5tRoEuYEJm64wZwD+oVvKJs3QBwMYH05PPyqeagCRBuzCttxtQQ71HqxZ6Z0Wv8xYRQ1MGZgkWplWXiBvqrCrQsxH3bWyUtHT42fkrl+U+xuEnjvub6yDnOkEKL43HUr+6PEfa/52byYzVVoo/Dedw+Kh8VavYmxtIuqjE72VxkSJYEhEgTMxAqDmZBaRHp9YkrGlszAuxtritXgNV8ISZPTqMiNSqwVH/9k3kZ3w7GEfG03zJwppNedurVB9RrLpfOZY/e7XIUC6xe+8Ap57oT0Tz9lzBdYtgLYzb8pNAcrBV7uvzm5Z9oeUG2dDQUxXIQ5sQXKt9RGMuRpZm0y4Zo+TLOI5YfeNURJnMr+UObwIIyLXlTbWQMNwRmIR6OPyRIYfgRYh2cxtTEcQKgDHw4DRzrXnvv8s93gDA5EqI9dLSd2/vlmszoUT+eu2SUjSuDNNnU8qM+RtB85PnDNHePC1Oe0+o28/BEa2tvtxYUwETRGP6LUglTiGnjnToMyNWtfcnYtDYcjvMM5AQMaz2rTGe66ui5dgOjV6baum3Eb+fREgZ9TYSlrhKtKsf4AUino7wwJdsp7Nr+M/08PoOXqSgP/uGqVtlTk1Rw1b4MbUlnwM9pFdZjXOW5yAS6/Rp5eif8t2MbJENNqmLlQLyjL/q2ZB674VrjL3yKq6v5Bh04tNaCbIwwxBbSDzxMnWhjmLVi1C9fdW1LoeiZqOsrHx5be+KVfwuoupRgOdkMxw3elsTjF0D+GtNdY3IhlM7i9CoA== 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)(39860400002)(346002)(366004)(136003)(396003)(376002)(4326008)(41300700001)(52116002)(6506007)(6666004)(186003)(38100700002)(36756003)(54906003)(6916009)(5660300002)(38350700002)(8936002)(316002)(2906002)(26005)(1076003)(83380400001)(8676002)(6486002)(86362001)(478600001)(6512007)(66946007)(66556008)(66476007)(2616005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?HN17ANOUxOZdanmGa/qR0eVKKp1j?= =?utf-8?q?/zBNMTtixvdX43TNj+y5oEzCSQkAygBeFZk8/yW+QvLgAeLcJ/Aktb+vF4et1bUWy?= =?utf-8?q?b5VSw28MBSj4K9V/F9lNvu2sUXaGEmJP0/lQxnjvlJL1R6s6XjBuitVODwG28wsIT?= =?utf-8?q?eCF5LLLkjPmj107jVzLRGSOhbuvEH1a+57IcSbg0LrI3h9NTUYw0kr6rTabQfahdH?= =?utf-8?q?r6ZATGbWCS5sxP68ZlGLiR9WrpPXbzKEhO6onZ/H+h2MloMAbkpgQARygjl+Uxqga?= =?utf-8?q?omdxkaoKW4qvGSkAMObKiFRxcmQl3WkT9cRNp0YOMVPD6/oAsETsC/1dYI69LQRVB?= =?utf-8?q?XwBl71T0NCFltLLRwcP7TxrE+pkBK33pGG9Y8PWPS80ZSbhVHLCfSl8jK2tdaI6a1?= =?utf-8?q?ig8FBzTjiTah6zM2v+elPX4UrsDyX/w3GCPOzGn/HHmJIGtzWat8bsYubU1TyW1pZ?= =?utf-8?q?4Z25FBJKh5yj8Fz5KlzDWVMdsH0K1vFigVa36jaW0g/GkUZiONDG19afNWLQXTQ19?= =?utf-8?q?1fYB9AojaWbUR2F90+vTAOALsBmRPdV/VVtAKW56DfTpSw/jEzDjwtjzG32kEWEPG?= =?utf-8?q?93ZcS2aiPhcLMuOeZr4HI86LvCWIKU7rh698+tNdbmIU3MNspVO2l4Xu5SD5EiOm2?= =?utf-8?q?yWOcg/0yL+DFIFiw68MQDdoiF6ZpmFcThv8gWTyzy8Opg8CS/ualVeXnlcuRpiZZk?= =?utf-8?q?ri4vKA6Qq5eWX5ofMD0AN/JyEgnIOpp5rcOor6MBGKYQN7aOX6aUn603HyGnOayS7?= =?utf-8?q?33sx8Aa3MWCsaldtybLzA58RDleZBbszqcOrZH8zJ4Qz62kXDhDB6+Z9qwsJ6kh/6?= =?utf-8?q?nq7VOVtbFy2x8iUXX2lLrpI5d3u4iOu9grPVXathBbivePwuxewBh+Z9Vn+ZjD9YO?= =?utf-8?q?z2iSCwEqiodqoP7lZrPikoOgMXSj/AoXgRASW9rVLQw2LTENwaAaP2yDYBgbegt8W?= =?utf-8?q?q41vxRXtEKrqw3vWu1506PrY0JPzuRMD6cnFHs0KVZQ3Fu0Bll/P8Nz7o5ciCSHP7?= =?utf-8?q?wWbgNSsGGGax4ll0/2Yd8w5/dOgV895wv1kc9tiRc+lkNBywJzNzLd3mWzRWoI/Nu?= =?utf-8?q?bCe9pXol74waCvrvVpq3kEgcBj6ozl6FpqbiC2ymQ8KBe7m6zG1+vC+5MwXX80xVZ?= =?utf-8?q?KHteWTbsSrEVbnR1aSKgB6I5E8kBDcoBw8dNvl45h7srl4QAXk8YwnKGUBmifJCg+?= =?utf-8?q?mEt2sP2w5E0/UGbop2qxVlkUITSUtUhCY7iJcOsIliG9KXENQWEkCGvoUtg3EDBuy?= =?utf-8?q?46jWUM6ev+ywvGd7QWTLTLgKs1qzVKV5HciDY+2QH7IdJxm03jv34BgnyvgSEcPd8?= =?utf-8?q?FMrVS2dW0ynY7tzvJHXaHSgHQko87DmQzYcozWbfdvkz9u5dM5SjR5f2eUrShNtAX?= =?utf-8?q?LAhtAL6lQYPyhF+ZnS+a5PUF6GGzgb84WUWOpVUf1dXN6YSeyQ8OyzYKgbbr1pP1F?= =?utf-8?q?PxQDkbJTcx1VQHFmzREFEGWwFVEkDJHBkvVREM/RXjDfBzyn4fpgDYaEo5/qrj84f?= =?utf-8?q?bTpPEQLYxAi/GQtE5Cad+qcg5nU+x3/mAA=3D=3D?= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06a631e5-1d64-480c-d446-08da81eb4039 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Aug 2022 14:01:02.2269 (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: VKMrIOd1/QfjK+5ZBL4Bt3GW/fLB7MReNvOJZBrWnkfQ8xtH/kztOfPw730d2EtH2gKPgcCdJjJa/D/Ygx5SNQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR08MB7373 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 v5: - Add algorithm name to entry.py - Add tool name to ftest.py Changes in v2: - Add commit to add bzip2 bintool tools/binman/btool/bzip2.py | 30 ++++++++++++++++++++++++++++++ tools/binman/entry.py | 2 +- tools/binman/ftest.py | 2 +- 3 files changed, 32 insertions(+), 2 deletions(-) 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/entry.py b/tools/binman/entry.py index 31389be672..5fb8517329 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -1157,7 +1157,7 @@ features to produce new behaviours. """ algo = self.compress if algo != 'none': - algos = ['lz4', 'lzma'] + algos = ['bzip2', 'lz4', 'lzma'] if algo not in algos: raise ValueError("Unknown algorithm '%s'" % algo) names = {'lzma': 'lzma_alone'} diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index bbb2fa19c1..9fa8e9e049 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -107,7 +107,7 @@ BASE_DTB_PROPS = ['offset', 'size', 'image-pos'] REPACK_DTB_PROPS = ['orig-offset', 'orig-size'] # Supported compression bintools -COMP_BINTOOLS = ['lz4', 'lzma_alone'] +COMP_BINTOOLS = ['bzip2', 'lz4', 'lzma_alone'] class TestFunctional(unittest.TestCase): """Functional tests for binman