From patchwork Tue Aug 16 08:42:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1666737 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=85.214.62.61; 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=riJk0DmP; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4M6PpF4LNmz1yft for ; Tue, 16 Aug 2022 18:44:21 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9E792849EA; Tue, 16 Aug 2022 10:43:08 +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="riJk0DmP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B0A51848B0; Tue, 16 Aug 2022 10:42:44 +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 B6785848FE 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=fr2x8PUY7y7fWSxp3FSIT1yktktOilCsG2gH5X2Zi5j6oxGvEZbQKSKU3k+CRlCOmy75MFgylfbZG8JOjF7t/sb2tHI1/Ov4DKVxwH9mq6A9jdPNDg0MT3Kdl5ghWo6hnEvAS1sD95ATy81v1VsZlxeYZNieGpPlf9KFsA79CjgEa8HjSaWyY6xxaUWe0zA5i33ooXg/gqpXBfkZa/WhCXA8Zm208oJdDUda9lvcy1J+PKTqpZZDoyotaLlTHL1khQcemCiAyicTwitGCzjZE6FLP9ZXLwEwCUHdobCkLMFJGz8HPkKgk5MzhBZEG1gntlZeo4diuEOZV8/IzIa6XA== 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=ofzfGvzCtFEvkZ84Xj6xScoNL0TMsCrOhnqLn07bDnY=; b=QsVT/fekr9OOjcRRkBq22oJ3FR4JZ9GgR0Go3SoJkexCi86EirZmB/60yAHScs4fRGPW5RybK74832ssNjDgC76tD0naCJGKxXbv31QNbjtAKHxzPLVcqeYSikcaVTNcqi5R9wqirIrC8eJSxSDQhm2sjk2XwTwe/Rf2EIps2Mbt2cBB/OCb81cWlOv8eclh54CBqKV2cM7C5S4XyhQPM6P0o91t+JEQOb2VrRskvyAIi7tU42mbsPj7cKPvh0zcBaOwc9JMW2QKwi2/rUphBHXdWIdbt8Vlrem0YbPSJDXs/PeLw5QsCH7LtvMcF9tei+fuRiKJZ061K2yjMnMzAQ== 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=ofzfGvzCtFEvkZ84Xj6xScoNL0TMsCrOhnqLn07bDnY=; b=riJk0DmPJYT4n8QaPoxy1ZoEkA1Zqspgz5PfvYfb77Bu13uXKJi2xtEenkUmLWCRqTJqiTgOMOyojN/JMaZg6AeB49b3VtOfO7bfACD8Db07ejPQ3yoDfqZn+fXWMjocHoUZ3YSIAt7AoeFoVe0Toa9mt73LAOaKWtAdY3XfNVc= 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 09/13] binman: Add gzip bintool Date: Tue, 16 Aug 2022 10:42:06 +0200 Message-Id: <20220816084210.14972-9-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: 94d6178c-9793-4721-89f2-08da7f6345a8 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: H1pTCktcNayFlTOJ7XtwleQwlrHqoxX/pFlvXWJ6bQgIcKlk2b+LBljenOO62LXzg8nggCK2DF3UKk2vc10zVl1FOnk17Du3rd9j5LfyPLIAze15ZetPdlSg5+QXF1LL5MoUtMOnNAnmg7PywsFqQrjlLhxrmgA4KuawCBFSrceAw+g5Oss0yWT465IFW6luvo9YYZWEaJX3sJGu5uvt8DoySdfNIY46YWitno0vJ6k+QBjR3z5Q8+H1qIH+9Zx1msDTz7uE7VHaOr7srMBcH2tsQvPYvRnNk/+lTUHoN62T25Pk4jBbVV9AZLPWxJ8u0XjDWfcrG7dXjv1WB/H1D+fIRTW6TfQnImWWnumyD4SUFWqdeni1OHYzH/6vp71PiSCwNUzUeVjkENH4xjHkELqp996w3AWW9WxCHk5moNQAa8X1ihc/ELeh86hj7nez56PAAccJBGwEtZKVh5qQzDsOMMzfES8XBwg3ErawK0E14c2xu3orAVYJWAhpZmXPEOHrO3LLQ8Ry20xJyVic/pMHhfMLDlReYj8Q6NutNGMdpf3aAdybkynK60bibPQJb+0UPfx/Ed4STfEBVRIm0Kwjt8ovdgt++7I3Ktzs33mTDokcZZYJRf3v7SujTrZ5EcgGKgnQYky9kQ8GoAC17mgVwsj+fCvcK9cfgp8cxZt3gPrsqbofMojeHhPQdmN8e63icxCadPnuT5fIPDC0WL0BwM9tX9Lwqnbe1iPQIEijHWr9iAI/lG1BZMHsvRR+n4SyQJ1DqZ2zT3/8H3nNGl49bc7zZlUrERVQLdZyi/o= 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?x6d9+Zqrq5+UCAGElkIAZjCNB5/x?= =?utf-8?q?iMIfmEAAvIg7z48GuJHaAE17CK25nWkSyLzAwyXGg/2fwZDmrY56YEznDl8bIBrFJ?= =?utf-8?q?FyWgbDXpNPExcIrbkKr3WIVGIC7K91vOVfj8vtKVjP06gNjRSZX0NTj1/PmwD+5nB?= =?utf-8?q?i17KN+oNjiXhnfW039owFPf0Tg5vK6EcGMTvYeq9NjP2fQPmYRj4UhLkfmE9fv2c9?= =?utf-8?q?++SN+Tr/aXy0t6r0Dt85SD+NlNsmgZ+tEQB+hKBnTCwSAVKXCfQ8ZxBQ0HfglWJ+s?= =?utf-8?q?EhgNR2S63iDQiyka6Rm39+m6ddAlKVrY1s/J9LkFSVeOS5bEdEPPQjucE8bF2XFXO?= =?utf-8?q?PIhyTQhE2yCSMXTzbyQhxxkDTaAeQJL9b4mYslqrR3WN4iVQ2kj4xgVrMwXhF0X6G?= =?utf-8?q?hbMsbk5LQ2yB9sqCnvgch9j5yh0XPMGVNk9UEoWsTrfD9rI+c43GNeB+fu/oddadK?= =?utf-8?q?tIhluJIlpS0/1M9gjmd949Gj9IjbIHvOU5RTgX3NpXabN8t6gWIuYMrCi5SZr6px+?= =?utf-8?q?lJK1MEELFdWoo80h7A6XeiH/v55YzAKneeW7xL9blSuL2Cid6+W7a+9e8o47i7yJH?= =?utf-8?q?4Hh2Ub0u67xmP3nLmXa2M6yCH/tkDa0fCt5BkpOzxBZcgSbjBt49jW1UAF1VFikrB?= =?utf-8?q?UhQdDzv4cryabTTVQtQ0EeDPUokc1HSsGlerbp0kL8H30tStoo/taP1PrYacz02E4?= =?utf-8?q?3Ckg40kskQYyGvRtm/ZqhOhhTV1ajWfZ6EL8SrE39eV4DlVn3h1+9kvToPY/u6o35?= =?utf-8?q?O9wvfl+rH4h4dZtxVw2eo98YJwWFIHMwbqyX8MEF1tho1ELjZPTV1Y6NWajtGQuCZ?= =?utf-8?q?JWS/Mt+enScGIWLlJ5ZmgSBXhK5s9Fogr4Ff6Yw61QNcRQkiIYIvPUKetEX5lrOWc?= =?utf-8?q?eIWQAKaG9n3xFHNVnKdc9R9dyo05JIRzC/Nc+9/qwVcOs9Dc9NJyNn+wrJuUlUnUp?= =?utf-8?q?HJepIdd2/OvTvcIpsqlw7SbN/VFSkOfr/SqTvdmLtEguQwj65Hn1rTS8Yba0u/FzP?= =?utf-8?q?1nRgWQ741M2rorh/4nDbyDuEWxde6FJyFQS4ji5ivUaTbzLyV6ava5jjdDuR3aLS5?= =?utf-8?q?5r8uLvBI8BqLwtIPU2N6L95zOIOYSyXoUX078nTdfjHedNJkQ6yCgxkatWeIkkM8a?= =?utf-8?q?TmLH+VqTEZWVH6F6nkFJxmzfxVlovjJNAgP2/mgH++WRRvkgiiZz7nx6KOhW5AHyF?= =?utf-8?q?g5BlzCkG15BoyBB4YZMDDdjg3A6hTn9jd2PdkZFMr1iEkZ0kL5ju4Ov468NnlH+6X?= =?utf-8?q?vhaXWT9DXjVZNI1H9dVozxLaMIcWT8Z+74b40cXmIUdo1D1gjrUlTU7pKBvboyAaH?= =?utf-8?q?DTK34thZLxLdWPHm/F7vnqF3B1DzwLD1JAWmC3697/Lhz86Np47gbfLxhRE8/YWi3?= =?utf-8?q?hcLXVnsbxD073wwtnrcTvQMc5zP5TsKxDuL1nbj7nezhdZLm7cp4gQ9QMomha2SAZ?= =?utf-8?q?FAjQ+kMLdsdjLxJFnN0ILNZEAV1f+TSulWiPuiNgnS1T+/q6H2LyfT1G1yCMShBQf?= =?utf-8?q?VXw2ccvD/FmrsAos/XQ910NX3ucCSB4eJQ=3D=3D?= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94d6178c-9793-4721-89f2-08da7f6345a8 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.4446 (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: ZUlpIkIZNNml58QO1NMb9ZfxqEo1xV3X/Wd8gfJdN48HMSWCIHNVV0PdGvdr+oQduiIXHi2OHcek7UQirEdXjw== 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 gzip bintool to binman to support on-the-fly compression of Linux kernel images and FPGA bitstreams. The SPL basic fitImage implementation supports only gzip decompression. Signed-off-by: Stefan Herbrechtsmeier Reviewed-by: Simon Glass --- (no changes since v3) Changes in v3: - Rebase Changes in v2: - Added tools/binman/btool/gzip.py | 31 +++++++++++++++++++++++++++++++ tools/binman/comp_util.py | 4 +++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 tools/binman/btool/gzip.py diff --git a/tools/binman/btool/gzip.py b/tools/binman/btool/gzip.py new file mode 100644 index 0000000000..0d75028120 --- /dev/null +++ b/tools/binman/btool/gzip.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 gzip + +gzip allows compression and decompression of files. + +Documentation is available via:: + + man gzip +""" + +from binman import bintool + +# pylint: disable=C0103 +class Bintoolgzip(bintool.BintoolPacker): + """Compression/decompression using the gzip algorithm + + This bintool supports running `gzip` 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 gzip + """ + def __init__(self, name): + super().__init__(name, compress_args=[], + version_regex=r'gzip ([0-9.]+)') diff --git a/tools/binman/comp_util.py b/tools/binman/comp_util.py index 6ec371b145..19627e490c 100644 --- a/tools/binman/comp_util.py +++ b/tools/binman/comp_util.py @@ -8,6 +8,7 @@ This supports the following compression algorithm: none bzip2 + gzip lz4 lzma @@ -16,6 +17,7 @@ provided by xz. This requires the following tools: bzip2 + gzip lz4 lzma_alone @@ -29,7 +31,7 @@ from binman import bintool from patman import tools # Supported compression algorithms -ALGORITHMS = ['bzip2', 'lz4', 'lzma'] +ALGORITHMS = ['bzip2', 'gzip', 'lz4', 'lzma'] bintools = {}