From patchwork Fri Aug 19 14:00:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668136 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=ZRn3RXOU; 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 4M8NmG0TMqz1ygd for ; Sat, 20 Aug 2022 00:04:30 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D2A5B84BBA; Fri, 19 Aug 2022 16:02:02 +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="ZRn3RXOU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 19B39845CE; Fri, 19 Aug 2022 16:01:20 +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-am6eur05on2080.outbound.protection.outlook.com [40.107.22.80]) (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 0FEA684B73 for ; Fri, 19 Aug 2022 16:01:04 +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=jfQuh5UKqQqAhwPPjsz5s5KjJQDiSuo9dgs46JQwG3x7yuy4rCnY3eSpfPmltZAsiJ3oElQqiHGOBNGPD/IJPPDiu6ba6ZT8WyxP5PY3/5AsvLPavxqQZ4sgg+kslP3I+7d8l9RU0Vt+PoG8ewhhsGNqoBVcLSC/0T9TdMrwHjgUvOzr+VpSx7+2tn0nWOZTB++pxdgg4fPT1mKYkrY2p35an9tCJaU2uAZjQQ6M+c3I0UP6Z59PFMsabQm1FUinhpQMhZ2C/pvSoCeuPYfuIvOp8WC0Sk7Z8KJ51oe02KLzmVB82M5XuF29JCpIE1BiyhDoTo+voASpXG+LFu3dZQ== 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=WgzojN53C5iAOkoKXtP1t9+IcqPYatxdSEV/JSaNpT0=; b=RrqtZoHlB7r+9NsRgbpYQO1C8xRcakVflbCzE1KnwLfH23oCdPNsuoeVZGQQ+dW6TQAbOvM78NbLiz0hKaGsLx/qolezpW0078SZs6V9uViA9hW51ogYs0Iy2xXT8znDu5nQrq7I6CEUlFVR37GUTcKy0SFqkOZGDDBNrSe2oTRr4ByARf0H7O78D9x4wEaj5z3Em5UQafHWgzj58NObhmG8dpyZoQylCvp6qBADhLcxE6OAFJ1l+bhrVPPxm/uZLD5P9OfnhoUAXGl9hhLGpKuSjkm3KLMBMNAE8Z1FI3FuF3bUaIKY1gW+XZSS0XTGAZBu4yaXDHZQzAE1PviY8A== 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=WgzojN53C5iAOkoKXtP1t9+IcqPYatxdSEV/JSaNpT0=; b=ZRn3RXOUnke6DrC2f8yOo8itiyhPsexPbrJnGfjPx/MSPhlQHCqZvv6XCLWxghh9nFh3knqDatz9xrThPlOB6mRG/S7cT02vwyrOmdZTKE7PoQlYfUtaCA+CoxfyjkVYq7V3TGKSF/23i+54qxGKCS4UwxDYgLyTTo5ZTq0WP00= 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:03 +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:03 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v5 19/21] binman: Add lzop bintool Date: Fri, 19 Aug 2022 16:00:33 +0200 Message-Id: <20220819140035.32760-20-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: 496feece-2dd2-4573-0151-08da81eb40d0 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: X/OvQkR1Z7z2se7qw2azg9e7EjbrpLBG8DJpXB76CRJLFhqEc01BUIZQner5OhL04sjqjEQBETz6odCoZqL3p3cR51SJkJLcJO3wjo8T//8bKd5y3/zYwPnETcsqiZNKgNkahd9faFtNkV/LbY4Uuna912cUpd2nZWRHUkcDY7a3kBWXoOXxc1aagfPSHhygUv2kQNqNFgAOWtPfSS0xXwpfDi+qRHVztokJHPcZJ7CHBed9GyKH+aVJiMB7GwOiCBmVx4imihzBO9OQDg1N7n+7eqaHDYAla54BxZ7OJ+keN8GK/LhHIHyKRBJAyDTumGhdu9VHkIEq+RWVrP+6TLGdiA1HT2ATENiOWWTAaXt0Rwe93bw0QcdJSomlybXQGGayF8dB/EGSwfuk+cC/X0fdjj3W0qTEQk8RTpWDi5wt0B8M+QGNazfd6aqDiRg+smo/dpRngN1SVGEHkpvtfTDo9xnc63FMQgb0RJ1+ol82EnhWoylyHqKBhAU7G4yQfrNY8uSOa4mJ7w7YRe9cd9fU+J7M10X4rFzrTbujKP/l5QKL0EYiLYzxzR5wUGAdyZKMgMECFbIwaPdkP/QYr3DsUvS6oF3137yRbEQzSw1zcPvuQp+8gfib2dkENWLT6Zo1YYviYjOOC5t42H4+No/sOjMTGlSWojJclgGWVKGKHy1d9xKK5kNRAtqfv8vh8jWkqNnBTGHmhUONPTovIWpQwWDOzB4q189lwQxHuyKDe9zbgXdGjLAVgAhExPRjubfDk8ZMiRaffW50oKc28A== 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?TDBSjbqZBRWohYYY55wBEfW2xhpt?= =?utf-8?q?rOzgBadfh6qyrOke1XOp+bwy8/G1pncjaYvUOWlVd2sKJixEH1WLJmylKPYzSlQbb?= =?utf-8?q?2k2HoG0Kf/OeSqWiSp6Sjy936nkY8KbaSgwwtc7P9cCnzWz/6NlRgKLKcY7Pfqn9A?= =?utf-8?q?thwZf23c/qND+vADRi1Wec/w3Yzdc3LUSHDE01cD6Y1FHT6b3qSBcDI5BVpaAf6P8?= =?utf-8?q?Q8VC0KV6p7jeUwAIFOovv6LZuZakLSCe/FQ6YH/wvgbHI25oYPUHJETP00qKxODC8?= =?utf-8?q?Au395JsvTZwOIv7lmvnKk1el7Iksucx+Ky2jax/ScA3/BuVSJb1u7dwMb+w9W6WHK?= =?utf-8?q?gudhKHOH+pRbTBdNafkTW7BsTpalCIEtwth2IgT7dbPLA7MprVNFK+knso8UW8Y0w?= =?utf-8?q?sRkI6L4LBP8AEDeHqHlcDBVZMIFswHJ2urkkXB9VV7Ti7KirUfHVbLK5ym4STMSo2?= =?utf-8?q?WAHZ43LQJ1ATHx6g05pSYXNOWy/Uyoj74EMWmavHeREF5PYACMNZ1vv1RxbOGwFbV?= =?utf-8?q?Jc3YnRx4mXQWfLjaAcN99aNAP4DiR1cRcL0NrZnYcv5uWAUZ/+BJKrtASUMArsPPl?= =?utf-8?q?EK3fD0VJyNlc5Iy2Ncg1yqv/T7q1+MlLmDdbr7dAClCJ1e+zgKMD8iJllnRGf7UV0?= =?utf-8?q?yebqf6S5AtmApIiqjDZgbAPoDISHaRZuU/toC67KqjkmUlrhcpXfSR3K4Pk5hr85s?= =?utf-8?q?7MUfYLBwL5RnNly9qrFE+Op/mjS9qFLa064Bg708Ep8ET7V22BcdT339uuL3Mk/fB?= =?utf-8?q?ofwlUk/pHpKcn9qKxgVutvlyCgXR3v6LVSt/OGBAiMLgIggH0KUt5Me+jnmT2ybkI?= =?utf-8?q?FG1U4scdLaP3KDRh0m5OCNTGypNOO1PBEcGxwbU1wxTBb2g5prpcFCf8dVe3Adg8f?= =?utf-8?q?MhRB3xFLBZdZwiWzo0TCzc/EToVFChM0ccxx7EdToD1oy2OnSVzW/BkZTSksDx4mr?= =?utf-8?q?Vx3Mf5jBr0kOKdN/iy8I8VJB+CEUZbVNuZvve9A+KX0w0Mv9oVQYBSWJ6y0JwI6HH?= =?utf-8?q?BSVDUyctQFA4YoZwua4gvQMHllyUB6OKtcFgEblhiqHz0Z+9XljoM3JfIwQ6Ox9Oa?= =?utf-8?q?QYUq1H22+9cIy3FQybaCCbeWaelWcJc5Ni3SArpKONegZfSyPgUusDvDdAOH4JQJy?= =?utf-8?q?0+4IOc+9cyRG3j3CYYgv2pk10QFvx4j1HziXx29Jc00WHjRYQEsLZvUrX8syH3VD/?= =?utf-8?q?Vp4pd+hY6Fdya/WE+Cr1RyHYKpYRCXjQcGe7lAobFVNdMdN0Gsj0QCmsbs/m+Q+QY?= =?utf-8?q?14vuUlz9KmszPxMMXnZqvVjmRNZQ+9Q+ewdGeJhNJVnTRn2s0qQH2gEDOrVAl0mPv?= =?utf-8?q?ZgXIHx+wYuaZrfTQjLR0pq0rzp2H8JH6PneFMyv+iuu2u9DzSMbY4FTG7jDMKB24K?= =?utf-8?q?1ymg97aKv/x4w68qYOMyuqshniwWyKBShnEmUJjBsYSt1Ra1q5jLrTGlTJGbeRMns?= =?utf-8?q?qf7/R2xDroIEsP96Z2K5B5g3xQc0rLXgKVtM4FVCT2CiasQUHpaPaTDyN8nMLhDzQ?= =?utf-8?q?madE2n503vdnN7WYJjyo4k4+E08pdMnqWg=3D=3D?= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 496feece-2dd2-4573-0151-08da81eb40d0 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:03.1968 (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: JWtGlpUPYpQcnkRbpW9G/qlCABE/XaAs6MtJvqKn07kjrf9UFXd0KU5R9f5BYtw0jrX3Y605V4tqTjsNrer7hA== 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 lzop 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 entry.py and ftest.py Changes in v2: - Add commit to add lzop bintool tools/binman/btool/lzop.py | 30 ++++++++++++++++++++++++++++++ tools/binman/entry.py | 4 ++-- tools/binman/ftest.py | 2 +- 3 files changed, 33 insertions(+), 3 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/entry.py b/tools/binman/entry.py index 8562a65d30..ae3e94a167 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -1157,10 +1157,10 @@ features to produce new behaviours. """ algo = self.compress if algo != 'none': - algos = ['bzip2', 'gzip', 'lz4', 'lzma'] + algos = ['bzip2', 'gzip', 'lz4', 'lzma', 'lzo'] if algo not in algos: raise ValueError("Unknown algorithm '%s'" % algo) - names = {'lzma': 'lzma_alone'} + names = {'lzma': 'lzma_alone', 'lzo': 'lzop'} name = names.get(self.compress, self.compress) self.comp_bintool = self.AddBintool(btools, name) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 911c955cba..2cac505d8b 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 = ['bzip2', 'gzip', 'lz4', 'lzma_alone'] +COMP_BINTOOLS = ['bzip2', 'gzip', 'lz4', 'lzma_alone', 'lzop'] class TestFunctional(unittest.TestCase): """Functional tests for binman