From patchwork Fri Aug 19 14:00:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668115 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=hx6kKr+v; 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 4M8Nhr232Nz1ygd for ; Sat, 20 Aug 2022 00:01:32 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A7B0F84B79; Fri, 19 Aug 2022 16:01:11 +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="hx6kKr+v"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AD13A84AA4; Fri, 19 Aug 2022 16:01:02 +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-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70071.outbound.protection.outlook.com [40.107.7.71]) (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 005D684AA4 for ; Fri, 19 Aug 2022 16:00:56 +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=oKKw6dTfO2xRZjk9hl0Q4MK/WX7TLf8xbOj3rATLLKJlInVP6J6L4tNNTgA/aMdE0Tau4YwCeXV+hbnxPbbJcGDedl3F5xsIPBhq8tAd0fC7xdZxfzz7kc03Csc8w7ygUyuYuvTmG21FNgk3byN6ur86KKt/pULoi9aBwd19DtuTKA+EcSPVI1mjrbWGOVL3yD0Qco0zakoP3xher5ddW6df/BcGqzLw0irnvfG5ORufnc6pQBNEMiAvGz7ODABitrHR+3Dyx7mVXlznonZfcAOoDm6zlHfIh7sSqDqXJTHT7dgHoZYmuI/Ew3A8l6+41OzuSt6NRk1Omy1cJ9svJw== 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=c3pHTbqiSrrXubSb4Bj8JmnJdG0xquJv3R7gL88cO0s=; b=A5CUN8fnziqqr9rBHMup5HzIi8ru/1IWXi7HaaZVMkZBpHQuTd/oHZLEudiPQJt2ogpCSelyD/qGjfITxrJT3cjRlcWMbLKRqN0zev15kXsQc5Ay98nDdq2/U437HEIiqaDkmQYF6MNn1i3jRpm8iYpDsp5k6jsDWQXkauLd/f36Q6dsnN2rDk/An1BYG0uQcQSL0rp0Dh80q49LnrCAajqdgQm81Zw+iPefg8d/RuPCYc+1e3NMhnsC8uSpLPEGYsfX/Y/jP70Jt18vCKxY9Uaa2x9i6L9/tRZsL6q5FSCnom5IvzMO7l+/MuBlZ4N6MbuA+UJgcYK9GhWHVsoS2A== 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=c3pHTbqiSrrXubSb4Bj8JmnJdG0xquJv3R7gL88cO0s=; b=hx6kKr+vd9UQz3j12pw6DVuOc3Ut9uqcA+0kRUVRPbZeJ2YpN+1h0GldgiwlYUSS7WfUiWzNAaN6Ku6bITTZVsptbEHap5kFiXsFkXdc7SoykEb1pTSJFxD2h7J+8eQO9UCBrIDNdmNNpnr0lnW9R1Dpw0OxsYFbJYu66J4pOVg= 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 VI1PR0802MB2302.eurprd08.prod.outlook.com (2603:10a6:800:9e::17) 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:00:54 +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:00:54 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Simon Glass , Alper Nebi Yasak Subject: [PATCH v5 01/21] binman: Skip elf tests if python elftools is not available Date: Fri, 19 Aug 2022 16:00:15 +0200 Message-Id: <20220819140035.32760-2-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: d0339c83-a28e-4c33-2b67-08da81eb3b4c X-MS-TrafficTypeDiagnostic: VI1PR0802MB2302:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HsoUqDfSM9WFVfILa7K1UudQzU0UXaEqOgUpCe9ELa0PIYkNZskwDrbWf/IPlfs69AjugxUiOJssTv2eDEMH5Z1u6Q/0p8vpoMZGV/NZD/SjR/vk5fYIs7EecOzKuGdxSe4G3d31lhlK8WCI7OzUcEtCwsYV//tY7qIWeAu7U0X/da/vYTvmihf20htwL4FHZgK3jjqSrEPoNQTvyCfY7pyI4enokvIw74xVeIPWSJ2mAec5yJSFTorXmGYoi5od/f0Unll1l+28feGzdR69VjkwsW0pO3fbSEYc5vEpgPPtveqTZllm/UNPeswJbJCwEtYGtCQBTXkWI+UUoqgJlMk8AN8Ps58Oc/AFdflM3Ds52aqup8Hlr/HYCJ3NFTQYl6ExKoCQrVXY8t1eC12sJl2IYWKOS4/cVKN5XO/mD87xPSsMuKZ9OxfsBKoaG5/2A/58+Ush8/6ph7d0Us748jc7SFEcmRWqjq7rVu3NhEXUK0pNYQsF4xi357UhKqvowkZ9UM+b4Jcu7Pdzt6S4yuEDW9euL8E7U2ZWQ0H4V3zRS+XWv0qrkdyADxJa0ER55b6FKnyjOJNwYr5ZtRzlH9sJGqrDqqiLlQQjvRQV+fjslMfv7LqZE4aBx/c4hSd2+D6CeXpgzr/9y/ustfDf3X9Z9etPhW0YqTPgQHOarrr7Tg7M59O+CcUjgc5PYKk5vboh4UIN9JHATMgOWn4PVcsVdMipmRw8JoYQ+Rim+xDZLQD23rKaJrzR1vdac8LBmc9U4XQT428VNuEJT9tKDp9Br00qaFUuyiWTu+Fd/hc= 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)(39860400002)(376002)(396003)(136003)(366004)(6486002)(6666004)(2616005)(478600001)(316002)(2906002)(54906003)(6916009)(36756003)(41300700001)(86362001)(1076003)(186003)(38350700002)(83380400001)(38100700002)(26005)(52116002)(6512007)(6506007)(4326008)(5660300002)(66946007)(66476007)(8676002)(8936002)(66556008)(21314003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EZHyqqk352lq7gTcxRLIvYP+o+8EiJs/zcnsD1s4x8ZVT78J9n8oYNLXmbKaphq/6/URJNIjIFkIaarsN1sDIUnaPl7Zw5NeI3euPof00/qu7hJIQeE9TWe7jtKCl4ISmNRzdbQ/IUzTUmQ5krZJ6hDgEATOakWhGkbZSL0x1lfo+4PXIgeugjc4LM2og8DNDsZ84M9SHiz4ewMM7/kzcCruek3B14NnReagEfTxTvYgeaw0DhWi1nTPECmQ2iY8U6OetA9sBnNSb9iEygkRCJ6j57VwihfKGSWgyoB0zQxVY8JbquJgxrLSeh/lMSnu8pBQEjWe47mxaLHrXyBNEWuAncSWc58JnPFrE8pmVHQstFIYAl+f5Dz5ioYmHezbFFYr1zB4wMqs6d/jv6wthtRRaL9akhR+SunBvtuHbhyW56Un4eu+n3XQP+wlxiwHqPZo1N0S/+QOE45spxhYch8qO8tpJOk716i9Jt9ns5zUb5f92r37LhHVdXnN4DArfPajWpQYAVXg740OAusKD1SxPeUyIHD/oUSrUAOXc6zijRZLn5WZFxGOC5gPtk0mxghlf9Yclq8RcPAg2EOiY0xJo5Jdlhax9rmILeZAuZ8ou0nFatetW6tBosDFJsYjhn/lpwffZ29mlyvaiKHmdGt5rJNz+POKlLmRhdyxROqq2hE8v/do7yLg3u895BtjBVaVUJoHQopHShWRSOfvTZmP73KtGa/n6zAFogitTZZyaXp0nnYWfy1vEyw9J7jqLrMcYqaEPxaGBUWgUQoQB440WW2Qpy39ZI+O8tSZQasSf0EsMHcbd/mm7T+hC7FvGC5aoCkxf3ejT1vcA0T1j4iSQWbSkhdM+9NYB8NwuAkP5Ug12RYJTPp9QtZI9uC9rxuCh8RArZeMZZOMU/pCPRO/W02KVM2X0Pg9b9f1cySdUOncTzf9qpQvq4jDrgprnbsdaYcHOu9VYctqI/EtUUDdIwgtqhLPi/+DlKoyZDT8U2aaT2pT1gUVkzf5dYxfuY1PSQuX9gonKkYr9ySmvMjLXn/i38myQRV7sNUTz28ttUJ84vLnYLoZKdz7Pw81SFDMCCe4yGGhYLs3XbvemgSnaEobCulA8FC+1IN19ZH8pgU3uZcmQ5m5gex6kBWbhnlBqLk5VGoXXRe/vuxr1VULbYq82rzbbqCutllZ0HZxjpE7hKhHCa/1QYkTSZG00RexVQy9ChcNno3SHxgGQojGFwngDnAz0hEPwLMv3o17vBx3x4EEeoJ+gqfpmfnAb7aU+JG4LgFmx1hqiMzXwt4PwpH981ySSpVT7rYqePle9UoOFhTA/abHDxM+WLLk/VQeh6GMYztrK0XSHKV4rchMhWkqYj3r3bQiL0/DzRWVZJ7RwFyk4vmKw9JEpiXC9x0ynZgDLkCxC5w8kveNQtzvXYqHi844jXwbtav+OU8y/btk1MZYiLiJ24Q918qdcOrvswJs2iOtpSxU8mR2uSBDEw1dg0Ymo2alHT6o2zUdE7C1pRNInPLxvgorrnxyOzxMLXshP/eU5yCy3zx4mBL0iZJE9W7jJwld071BIlztrzLL6bI/0Yz2f3Y70BQzSL8MgMLKc7p4sATFyNSgVA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: d0339c83-a28e-4c33-2b67-08da81eb3b4c 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:00:53.9585 (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: 7JLXRSsuj3KAhDmLX9jEoD5V+4cUwo1u/fdoj9G2txB8MPxK6qq0r2ekB+KMkVWNyAnA3EOCQLnxs8PB13RvOA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2302 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 Skip tests which requires python elftools if the tool is not available. Signed-off-by: Stefan Herbrechtsmeier Reviewed-by: Simon Glass --- (no changes since v2) Changes in v2: - Add commit to skip elf tests tools/binman/elf_test.py | 14 ++++++++++++++ tools/binman/ftest.py | 18 ++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/tools/binman/elf_test.py b/tools/binman/elf_test.py index 5a51c64cfe..75b867c2be 100644 --- a/tools/binman/elf_test.py +++ b/tools/binman/elf_test.py @@ -122,6 +122,8 @@ class TestElf(unittest.TestCase): def testOutsideFile(self): """Test a symbol which extends outside the entry area is detected""" + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') entry = FakeEntry(10) section = FakeSection() elf_fname = self.ElfTestFile('u_boot_binman_syms') @@ -147,6 +149,8 @@ class TestElf(unittest.TestCase): Only 32 and 64 bits are supported, since we need to store an offset into the image. """ + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') entry = FakeEntry(10) section = FakeSection() elf_fname =self.ElfTestFile('u_boot_binman_syms_size') @@ -161,6 +165,8 @@ class TestElf(unittest.TestCase): This should produce -1 values for all thress symbols, taking up the first 16 bytes of the image. """ + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') entry = FakeEntry(28) section = FakeSection(sym_value=None) elf_fname = self.ElfTestFile('u_boot_binman_syms') @@ -172,6 +178,8 @@ class TestElf(unittest.TestCase): def testDebug(self): """Check that enabling debug in the elf module produced debug output""" + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') try: tout.init(tout.DEBUG) entry = FakeEntry(24) @@ -281,6 +289,8 @@ class TestElf(unittest.TestCase): def test_read_segments_bad_data(self): """Test for read_loadable_segments() with an invalid ELF file""" + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') fname = self.ElfTestFile('embed_data') with self.assertRaises(ValueError) as e: elf.read_loadable_segments(tools.get_bytes(100, 100)) @@ -288,6 +298,8 @@ class TestElf(unittest.TestCase): def test_get_file_offset(self): """Test GetFileOffset() gives the correct file offset for a symbol""" + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') fname = self.ElfTestFile('embed_data') syms = elf.GetSymbols(fname, ['embed']) addr = syms['embed'].address @@ -314,6 +326,8 @@ class TestElf(unittest.TestCase): def test_get_symbol_from_address(self): """Test GetSymbolFromAddress()""" + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') fname = self.ElfTestFile('elf_sections') sym_name = 'calculate' syms = elf.GetSymbols(fname, [sym_name]) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index fa1f421c05..da9aa9e679 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -4807,6 +4807,8 @@ class TestFunctional(unittest.TestCase): def testUpdateFdtInElf(self): """Test that we can update the devicetree in an ELF file""" + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') infile = elf_fname = self.ElfTestFile('u_boot_binman_embed') outfile = os.path.join(self._indir, 'u-boot.out') begin_sym = 'dtb_embed_begin' @@ -4858,6 +4860,8 @@ class TestFunctional(unittest.TestCase): def testUpdateFdtInElfNoSyms(self): """Test that missing symbols are detected with --update-fdt-in-elf""" + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') infile = elf_fname = self.ElfTestFile('u_boot_binman_embed') outfile = '' begin_sym = 'wrong_begin' @@ -4871,6 +4875,8 @@ class TestFunctional(unittest.TestCase): def testUpdateFdtInElfTooSmall(self): """Test that an over-large dtb is detected with --update-fdt-in-elf""" + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') infile = elf_fname = self.ElfTestFile('u_boot_binman_embed_sm') outfile = os.path.join(self._indir, 'u-boot.out') begin_sym = 'dtb_embed_begin' @@ -5344,6 +5350,8 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testFitSplitElf(self): """Test an image with an FIT with an split-elf operation""" + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') entry_args = { 'of-list': 'test-fdt1 test-fdt2', 'default-dt': 'test-fdt2', @@ -5421,6 +5429,8 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testFitSplitElfBadElf(self): """Test a FIT split-elf operation with an invalid ELF file""" + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') TestFunctional._MakeInputFile('bad.elf', tools.get_bytes(100, 100)) entry_args = { 'of-list': 'test-fdt1 test-fdt2', @@ -5440,6 +5450,8 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testFitSplitElfBadDirective(self): """Test a FIT split-elf invalid fit,xxx directive in an image node""" + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') err = self._check_bad_fit('227_fit_bad_dir.dts') self.assertIn( "Node '/binman/fit': subnode 'images/@atf-SEQ': Unknown directive 'fit,something'", @@ -5447,6 +5459,8 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testFitSplitElfBadDirectiveConfig(self): """Test a FIT split-elf with invalid fit,xxx directive in config""" + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') err = self._check_bad_fit('228_fit_bad_dir_config.dts') self.assertEqual( "Node '/binman/fit': subnode 'configurations/@config-SEQ': Unknown directive 'fit,config'", @@ -5470,6 +5484,8 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testFitSplitElfMissing(self): """Test an split-elf FIT with a missing ELF file""" + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') err = self.checkFitSplitElf(allow_missing=True) self.assertRegex( err, @@ -5477,6 +5493,8 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testFitSplitElfFaked(self): """Test an split-elf FIT with faked ELF file""" + if not elf.ELF_TOOLS: + self.skipTest('Python elftools not available') err = self.checkFitSplitElf(allow_missing=True, allow_fake_blobs=True) self.assertRegex( err, From patchwork Fri Aug 19 14:00:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668113 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=ckJ/abZQ; 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 4M8NhP6LwWz1ygd for ; Sat, 20 Aug 2022 00:01:09 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AE32084AB1; Fri, 19 Aug 2022 16:01: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="ckJ/abZQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1267684B56; Fri, 19 Aug 2022 16:00:59 +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-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70071.outbound.protection.outlook.com [40.107.7.71]) (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 2B032845BF for ; Fri, 19 Aug 2022 16:00:56 +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=WnAw0Wg3NNfgqm7j2V/nFIrF+50rFGSwno00CK1o4d333QeHjBoOSC2DyAj80bAdI41wUlzLdUPN9GbqyXaidTHzUCi8Vwbv3lC7kPSfhrgUeqS5UzqY8o/1dqlivR/X2H9GTGPCr9fxY7rslxCnRNwYatqqshpSl010JUPH+P8uWzUHoN/N677IZElw2h4VSWIUFs71jtkMKuOfm92QsJnyf8MQPp7mv3lb1asyTnZw+D7WpGXa95gXlJKSxUy9x5gqxrerqrFYe+BaGxUqBzhm3cLSCecKDJlkj+2BAFEmD4CiYKIjnqVzESswtY87wanqK8zfDfaUT1M50DFJPQ== 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=NL3KDXufKs5rE2mSOxRrxl10dXs6iafeof2SMvwjrRM=; b=bBewnpw+sHjQWbZo9vLfr5WbhVLoRN03vis0LYGtreN1BbHOc+QveMF3pn7n0XmRjU3TN/nqYdy1vH1xB7eRmH/yDgpqyOAzKlXVM1/fvQgI3gC0DNpuvav7A5QgLntI6LwtXD8yIi1tmISg0U75RE3tl35zLQBwGPFNuSbnDzJA7ALQouIDzMwaYG9n8ys1/aNVaOkwjKwL+dO2kIeOMa89zG+wqmn40SnzcOQx7keIoC9GJeRRJcXDUPT0eexCK+6WsKm7/oGou4LTkX+CBJyMkIj1ImtYBx6jLooT9LTgimAbc3oDy5ekzqnjnI/8p/bpb/5UZ9yrj0z3owA/DA== 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=NL3KDXufKs5rE2mSOxRrxl10dXs6iafeof2SMvwjrRM=; b=ckJ/abZQFeAbN3voRnI5Ko0Z7oTld958jX0CaVxpvtfF6ehtzZ09dqHY5VPRiCI67UilQvN+6DbCpPTGZVHo1Of3KslDtUwpwR/ej8UhiVOSkbj5YthRuw/tgUxIlOE6TqmrBC8SEBIKZjNbq5JrdDttnlYLgSQ7zb0rEwcdE/g= 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 VI1PR0802MB2302.eurprd08.prod.outlook.com (2603:10a6:800:9e::17) 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:00:54 +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:00:54 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v5 02/21] binman: Avoid duplicates in bintool lists Date: Fri, 19 Aug 2022 16:00:16 +0200 Message-Id: <20220819140035.32760-3-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: 2faa47fc-65a8-44a4-d540-08da81eb3b9a X-MS-TrafficTypeDiagnostic: VI1PR0802MB2302:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4XxKxN2h9GCGStWAKsF6F4wAi7kx4YNq0v37K9C9K8yr23YSIdIWY3A3LZob4t1hHU9ao5HJfVDfyerNc9ywRx6h/wZERNtAjh+7bz/6KrzpZYrddjmuJvnLWq9DUpwaIDo6bYv6ulOrPdrW3ilduCpS04MqwUzilASmOaif4YY9wyrRORLnHoo3uNsJo3cm9YNhIqOeZbxEodLOaUZhMl1PiH2q+fJ+iMOd/Tz86hGRQ0YPEOSECrA6tKpovfnFMbsBHnhzRqUEQLhfBZtYf0ilmSS5l75KC5WrumJZN/96BPhQmPrJEkh/8XOOh1UmWp1edsxUNI+ySZz0Q2Es1xdQi5JIEcpAVnylD958+73Zy4ARFGoSgvAo6tVGjzvcgaliJYDJ96L5/tZxNwCHM/L9r9ixwef2d/vWvzbvsA1WsxQC17tdYcxLVlxMfBOoHTaWTPOh8Xd/Z5Qa3o1Spx5gGd7P6apCkVCLijBPM4a6/DysTG90olECuvHq8eYuvPulL88NW7j/Ke4H8Q5pAGLPT7rjlhjgXMZR11SYjOVH9myN8tJJMgszCCm3EF211MN1+OjIOU+H6yF06E1LminvifB4cyE62JJBJ+p2ZthKntX32PJjfsnXpI0sqFjdrN1lUHhAlz7EsPFsC0AGllvj4X6JoL2McokPoJ8RJiomcKXmq9J7oI22vDgUCWru4jcNhHmvPEhrL8iOyKhW5YVqP+yvF3ez2smDdLLqIixT5+ZgVjbMLH5ybH4aoDwIaiDKMt4pu/jNyYg0UB2yhA== 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)(39860400002)(376002)(396003)(136003)(366004)(6486002)(6666004)(2616005)(478600001)(316002)(2906002)(54906003)(6916009)(36756003)(41300700001)(86362001)(1076003)(186003)(38350700002)(83380400001)(38100700002)(26005)(52116002)(6512007)(6506007)(4326008)(5660300002)(66946007)(66476007)(8676002)(8936002)(66556008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WfIH8F0hNh+DEBHRGPSw/fj14+SV2VQxGh4ydjRoaZ5MZfnq5hobMFqcknnI28zSxDxb1ysreR8ygbW3rl7ERtxX/gbj1+Vs8X9nExwfIjBLZ7C2NJgCPc9peOW5VjZU/8bxsdrv/lNHVwUpffcGput97lPTk55syoisNdH3rNdr781O1cCFM7fVsss4vJuUm/3AGyyNEgx+rLTC2B1Ae2jONQkkL1+SQ2LAWDWH8ok3ZUz8r5Z9Glm91hqtkdBTI1O8J/5cUzjyV6FQ5Tr0Ph0gBCs3UFQ+UMhdndlUGhOtaXE/ux4skrtUtpRl9xnTwmNUauoSQZND6t/gWKcIPanbeTJMYAU5Da7PkxSmtN/+OlTVYB1qgG4jtWgaXtKGhN+bHGWmL/NUF1Qaomj2VigJEK5srK87/eabkHid4v3Scm+OrTUkXDET1EScAR+HIEkq4zVcYrJ+YMKTPQMkt+77BvqZc5pKRUbarqdUEk73ZDO6M7tSrHzwKIBFCgnSrHT1jyU0JuqAJUD1QuzAmGRXa+gC9h0MeMVW0edprV29Tf6exL2lU5fLKn0UB1c28nu0QgDPWF4puzhWMzGW/gypsYjnpL/wcR9ydEhJj2fm355hjVYBmWlTgCryMiMe/nk48fDzC5ObXx4R+JZRdzya82ypcWeqeJYO4pUsakvYLGfF3wXA9TP0ZfjWYt0gkzvnfxS76a7f2LgMZKcf5BKIpipcPyCHm6kjmEH6jWKxX4u3v+BpneyN+cQ4mfgGDD5Gw4xH4xq77ZVKhl2as38UEl/OPjXwGCfcDy96t1YtuyAXdne9HbpWBgFmOrEoaLzJG6F5A15ZpjvYzjqKGKjRMGSHJhu/z14omycnJ1P+KAJSUvnChYRTKpgxz19WYWjZZtnclgZf0q518cjvvpVCPWYtDCtQDgXoPlSqCQ81XH2Goq8DCx+KonR2MNIL7QW3hHpPb65z7ySVB84uYJ5rXYkc8hFwGe76yWA8xeQZPcO3lcEHSM99t2GoUA6UWxyuw1a0Q2mvgF8/b83q03qSLLxI6cMYaHzdCmtQsrP5XVRoGsoJeGrPSJN2pVbRPfIJ925Bs7xRtJFG+nsfjsju/hi7QXBoLu6bR1P3FOMYXD6k1sttCxTnDgUH8LWHfepEVrdk3rZ6LZWmuQLM7x8RUHzOpM1G0zTPfvaPZEL+A3OmGD89D5NQ2QsjopBAkAKgIFgks4shEAyS03uz3KsBRrMuLG/K3D0TBiz+CAOFIH1ugjTAtWenjnu2Vcx3S9WlGmVjcLgH44A5QVWTFOcWlHkHYNpE8Zh1zhpaamnAl2/2VZXZNSpQBD3AKQNwz5MosoHHhtNatSnCBW71DfTSbacLs3udan6fH9O59fxOx7DWPf/B0gihKFWqM8XC2G6u/kq25C/2uaD87ENFeLPcltKCMlRomcL2TvRsgKSXdtaiku7dL/osHCIIi/76+NB6uBhTmKg3SNSNgQ8StqQ81CvruwxRaBWUqzXbWPm3JZX9g0v5qX/Tynq7XfPalUivMrSA80BDAdwPehdxftYJeoctIz8uiB/W+lcs9oY90wUBlyfbPPKyGz8XFH0adT/pavwVNI7ZinybE2w8DA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2faa47fc-65a8-44a4-d540-08da81eb3b9a 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:00:54.4897 (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: 95H4HgeafRzFSvnk0RCodqevGuas0zsRl2Wk785yMxTxtziyM6tQsV6C+s+OAddZRx6EihH0Ld1G4Om/Pp2MpQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2302 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 Avoid duplicate entries in the list of bintools used by the image and the list of missing bintools. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v5: - Add commit to avoid duplicates in bintool lists tools/binman/entry.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/binman/entry.py b/tools/binman/entry.py index e3767aefa7..8f846e55b6 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -1047,7 +1047,8 @@ features to produce new behaviours. Args: bintool (Bintool): Bintool that was missing """ - self.missing_bintools.append(bintool) + if bintool not in self.missing_bintools: + self.missing_bintools.append(bintool) def check_missing_bintools(self, missing_list): """Check if any entries in this section have missing bintools @@ -1057,7 +1058,10 @@ features to produce new behaviours. Args: missing_list: List of Bintool objects to be added to """ - missing_list += self.missing_bintools + for bintool in self.missing_bintools: + if bintool not in missing_list: + missing_list.append(bintool) + def GetHelpTags(self): """Get the tags use for missing-blob help From patchwork Fri Aug 19 14:00:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668118 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=oNvgYKcu; 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 4M8NjJ0QWsz1ygd for ; Sat, 20 Aug 2022 00:01:56 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 03D7684B69; Fri, 19 Aug 2022 16:01:19 +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="oNvgYKcu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F060A84ABE; Fri, 19 Aug 2022 16:01:02 +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-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70071.outbound.protection.outlook.com [40.107.7.71]) (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 32CDF84ABE for ; Fri, 19 Aug 2022 16:00:57 +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=FHZRGi7T9zSvyz106szG06htp6VU11GERQ+if9nDbOgrssE5EuieGSbYRw5pruiQVGjSC3sBrCF6KA714I17+X0Ws1HA67J/FIudvhjA5Dz0KNYgTCskHhyriHuqMWlqHccJkCwBIetSvMeVgwbrz3V7VL+Rkl7zLiaIZ/ZYRpG11N/EExbkGuOtwCZjDukDi7CvXpl8melw6M+mA37D6aRAIZASQcIRuDNjm3qWTM9rnpXktqJiPbJTpzPulvG7vdoHere8p+LNuT8/TmizCh56VcXbMVfSWE54M9IUOJFyIxjJS+metkIcOec8CqOqGYCa8WCgro6aJCNMx7kkjg== 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=SoPVELyNFr5jczGcFJni57pwbP+oIitmYnrBA5jwzp4=; b=Zig10CJw4HmdYlGrU7HJn2Sxe8X5XZwQ22+jcVn1hg6OGM8x83xkd4WDhQJuOslh52/tphdzaVEyN3NS/ABhCKpi5rfIz2x/RQRYkFoXO4DvRAWlyhhw0QTZ+ocH1SBIkDcuYHw3yyOnTBAVAv77rHigaQPRy2m0glIO4UjHksy8AEg0yqpdlT9gHNOLqfoDLfupHl6WuGlWHpy+chmDIxcUPBaXwkLS5KmkLLpquZJyHe+hbb7mx6Q8RZBv4FNegjkhG+l692jVuzWKflmefcVzONgOz7xP9wIzdFNp6tZorsu55lMznjkr/U8LTcHIdVkh9TmUwH7pXCnfC/VFpg== 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=SoPVELyNFr5jczGcFJni57pwbP+oIitmYnrBA5jwzp4=; b=oNvgYKcukgmZ5U6UPK4AyV45OhR/aHwyokfWTTl87JaxqgCJ0Eix0NyuxjJbpKDKPlyNETbISg2HE0LneL2mfocdDtcaaHZo/bZ5VeHqhMDb0qVJwNZn//nxPBDTH93H1v8yErAM63cl+fhSaUxdvnGnThv9SKrU6RwB27e0tUc= 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 VI1PR0802MB2302.eurprd08.prod.outlook.com (2603:10a6:800:9e::17) 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:00:55 +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:00:55 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v5 03/21] binman: Forward AddBintools calls to sub entries in cbfs_util Date: Fri, 19 Aug 2022 16:00:17 +0200 Message-Id: <20220819140035.32760-4-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: bc895332-f226-4b14-7f2a-08da81eb3be9 X-MS-TrafficTypeDiagnostic: VI1PR0802MB2302:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ddgodNUDNUumdLiPP4RPyA8BZWCUXumFcNiQTBtJkpU8j7zD9IL7SPwhKbzpogXJMMUz4i88dJ9Wjjv5eEX0Iq0BTEWcd1RpODfxLxEhOTa13kESG0Sqza8MvI1HCQrpRH72IYv7UA7Tq+lnp7krRe7xT3m4NG3sUH1jbQbXmg5Gdbx0sa7aBPO5XjWSy8vp0msE7BHzBvCZUDbDZVjctm83Xyq4IaCbN6VZ+9aktXCpV2ukB1hCbvVMYh/QSkG9G8cfJqa1DwYn14Vznrce7P6LtNqmDMFLiIsW0NEf0phYpW/LjmuWKg8Sp2EXYAo6BS/U5BA3upeWyLwWPwNNcSV6tP1tINZwyrQcTs63S5rpXxvWpjSIi0lLJ1lSQ9n2NyPoZM+KuqttSqFRHN6xfmq0pQ+C8G7ccT/gxPIHGejUBBiy1QRfHl2LMm2OyVodSa8DVBs75HESCOHSWe+xNoS5OSHIlwWv7fAS0tKDJX1vMzCO8qlueUopzHkfn8BbgUR3EyLPXjy3JW6bM6tOVLFU3UD8dSHgXYceu6gguHxb8nMnMSxjX9Xup7tC0MPFMUNdp4bM8R50T2Y9pGI+uPHO3g1WMHz5CIGqGPTaxH1Otmliw7UHgKpUBiAe2qIPdbf52yo/UO2CcM8X4Qwj8q0xynPSCqWhKSQ7BpywGLxeoCt4W7d83gxUiHwhIifpN3kmB2CZ4wh9AN5CGRuLVWw+HagTiYp1zcbFGw+SWquPNZzDGtMpEebXtL+/mHIeB5ArNofULZJliCtRct+B8w== 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)(39860400002)(376002)(396003)(136003)(366004)(6486002)(6666004)(2616005)(478600001)(316002)(2906002)(54906003)(6916009)(36756003)(41300700001)(86362001)(1076003)(186003)(38350700002)(38100700002)(26005)(52116002)(6512007)(6506007)(4326008)(5660300002)(66946007)(66476007)(4744005)(8676002)(8936002)(66556008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dv8LEBD17tFhNSMYESJmSwsB672NOUyPPYry87vNUDornnUhHtTwD1ukFROGRa4JspVaZe1AvvUiO4yYc+FdnQGd8JARQyzvD75blisvlH4KCR5pu5cr8cGYfcHa3HIyXBvcsdvG3CJ39n0qlNlfD3bhWod7NaDtq/lGdmuYlk9ZUFp91BQYRebXfHXSh/9WI5YdZ902GZZeSf7Sl3SpJY1BPQKwlz7zb4KSvezKj6kAQA5AMa4pfKY9uCPRKMzDi/ypHZ2rk1splRoCNa/gGpm+Wd/b9sPMM90OgzOdOezZ+myOsL6pn9WCHx+WhD6YtAXxGxtAZ+VY/StNeIGh06v8YUVF90JjZQyLjQ1UCyN9E4GXG7U0yIwbIY0XSJsJRtn+oLiH3P4wvs466e8VwUsu5JgJ+6hXOuCA8gJglOYUMHFxzlOcOr+NGzPbD6pvxWB8r85X75rZ+njYKlQGP4EfDkOTT7R51HYkclDipUnYqUxljTx4WcJxcU6sKKOgfGPWjR0rxrQfBJyi4LmM+JXyG5hh3gicYu3cKqAgqNMal9/0dviBYWYULI9gv9nXZVZJeS5CmlGP0pCKgR0uZGfjGAwRPMlxi9YQKqt+Z8TbdjWgFuLoGjjNu+R2adAEta2EKmneNoXwfo3k5D+yjzhjS+I+85Dd/1lEv8+Y27c05EpbaqCjdTPB8svxh5RW23lc+DIg38NGHeFvbHQ2fJCAfOCc3BDmwYLf9VNtjjhXHca2JSLolM2NNGlJnJqZICUL6eIJMJnLYQd7sJ0GSGLj50oQuFGT69obgVgKfSuot+DOcjCUMEQjQlg9Hya3IOqG/rd+jHowMsCbvq0nSl7U0R5jXvn/n/EHfbS6kWyGu3URoJVfvLNaZ7iJWndYrkOPHrIptUDE0nTdJrROD/EHIfYOrIvj/ufIB70MddB6z5Pv9hELSErzlDVSlapfrDBY2wqfojVwHN0NLwmdgHcw0WLOeBkLZjjoaaxjQcAt2W0mZx6kb8VGEiWV/qjZWAnnUB5JBndZQP5QkElpFSm5Klcizlr5EhW12cdM2siQugZJxlBpoCLar0/GNCi18vxwHTqsisMUMgJl0nO+jvCX9Pc1ZsGN1gHX4ROAMilsnVGM2WtQ7andgHbomq6Z2CihqFyjLndAvhnXmaNNWBx4IfBHTtHbXTpgbFV9xuDBdFBUSw1aSIgBMZL6ClaeEoFHlj/ez9+/BB2WYJiUOH1zaS2fiY5uQKnuxTfgl9vodi/BicA+LAGbYAPp4L38367l+j+L9zV3STi56JlSZlKcySwzGbswNQbg1Q85wEx7RnX2vQHgZj/m7cKtXfDP7nbXJhXKtLVpKeB8dtJO9RFzmGh7O1++3f3SjoAMSgEm8he946KknYU6b/JOCgVfvJu6Nvn3IseIgomIHzf6rRqsz9HJNH7jdMe01shTQoozSsBnY6gAYlaXT7d4jhgKsTFwhvKkm8MRDU2y0p2/QuHvkAf/p7OnjB3/y0z+LWQRbVywXBlOQFaEwrCi6Jvy4fsx8bJ5Gqp+pSIepoAw/fjY/ysSJqXaxLBV1dDy9BdU+8owzoVCTdP4sIZu93SqnDycPvWiZL4wwvLctoVSkA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: bc895332-f226-4b14-7f2a-08da81eb3be9 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:00:54.9895 (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: JYAALj9bmbWkUn87b0G88Dgif72alx5qU6PE+9kHVdWMXLcJO2DPvBzXccpmNVlB9aOLjqhImU83IWEYjovCcQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2302 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 Forward AddBintools calls to sub entries in cbfs_util to collect bintools of sub entries. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v5: - Add commit to forward AddBintools calls tools/binman/etype/cbfs.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/binman/etype/cbfs.py b/tools/binman/etype/cbfs.py index 4a1837f26c..832f8d038f 100644 --- a/tools/binman/etype/cbfs.py +++ b/tools/binman/etype/cbfs.py @@ -296,3 +296,8 @@ class Entry_cbfs(Entry): # so that child.data is used to pack into the FIP. self.ObtainContents(skip_entry=child) return True + + def AddBintools(self, btools): + super().AddBintools(btools) + for entry in self._entries.values(): + entry.AddBintools(btools) From patchwork Fri Aug 19 14:00:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668117 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=aA1t/knq; 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 4M8Nj366Cqz1ygd for ; Sat, 20 Aug 2022 00:01:43 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9D7ED84AFE; Fri, 19 Aug 2022 16:01:15 +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="aA1t/knq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7024684B72; Fri, 19 Aug 2022 16:01:03 +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-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70071.outbound.protection.outlook.com [40.107.7.71]) (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 641C284AEB for ; Fri, 19 Aug 2022 16:00:57 +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=fXh3531jxXyUNpoVdYpmqHK/oDFfA1UJ1gZTbLzwl+syRvDBEm7hSaw811R2ZmesVETy75bPs2BuBfy8PxpqUrS+6v3Qeis792rJe4gHq7RStjU1Bm82sp1tS2w30QKx+csF4CmttcwqgfOd3P3tfTC/0jRnwkKFiLSLcNI+YdtmTyrRUBzDU6pPa/XEe4Yhy9DDkgKpQegEkj9uuoOPGCh49nLqIuQStrLn7a4z2FlPgy3ixOI1dtW8dQXnqPpOavuMr5FmsmCIwGcs3tXj8qBzT/sary8BivbH54tcyPgEmLvPX9z8pvfvT2+gHNDpSFCdkBvGDIFUamy/gnh2mA== 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=b9yPh2QR1Pzp93mYWfCo20s9NEb33J+WAIj1DTNdXHs=; b=fVncSpsQWvie7qskMrf+Pkx8YqXcJFwFhqJpRTKmBkYYZKzaKetDuRi5tdmVsttdODJ17a0ou7IBsSYls9a+Z39jVB5iu3Lexz4F7TKZMG7diIDhJJZaFQdYL6lln3iq5p8UjI2k5li3gN8WVDfnccDaToYqSjdNPD4Rb8mDNqnNnvIix7ExRXb2jeY3gaLEItDceo/FCooiHYSBr65Vlrt6LbFD9eLdRxI4zEPaV2G11jpWqMZNm2lgcjiVbHrEsaKgnce/jnR9Aqf1dipBQ/k9+3DjP26/tmimMjhUEjcUZBomiIsIFjhV2P0t7i0sYsmq99Xrc1tDd1qxsLlNNg== 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=b9yPh2QR1Pzp93mYWfCo20s9NEb33J+WAIj1DTNdXHs=; b=aA1t/knqvbnJHDvCAV+EcJRPjXqffqCRpekpjIgx3zYkR1QayGMXuzY4nZmPikJngWjLWJPRR+f0TEdt1ud0A8lcDauL/t05RZdcSI9sRIDK3cdWyzpgPq/6Hdz72UCb8eGhgLIriyy6mdV4/E+bH6w98aByAWqJzL+1Ilbyc68= 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 VI1PR0802MB2302.eurprd08.prod.outlook.com (2603:10a6:800:9e::17) 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:00:55 +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:00:55 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Heiko Thiery , Simon Glass Subject: [PATCH v5 04/21] binman: Forward AddBintools calls to base class Date: Fri, 19 Aug 2022 16:00:18 +0200 Message-Id: <20220819140035.32760-5-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: 12d3a027-cd9d-4506-c1a0-08da81eb3c3a X-MS-TrafficTypeDiagnostic: VI1PR0802MB2302:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7upSCn26E0z3FkDuIhmf1BDUy+E/2d/aW+pGsoS4zTc/CTGtKIx6dy10B+hV5kKyl1L/LARSMLbiRWaiM8FltrVihTZa9iD6PhMA1IGMMno0uXis7jdJU6smwHJW7uIUFwySnaw9feHm7CCPxT8d/XSNj4wWrmNk4gYAfIwmJyZhVQDUbvyRfLTbbfQ34qL2LTj8VfGG5Pup9In1jr1I8Xde1nq4kuPiZ2fkncteZkskRxp3k9Cqa9pOf8XqSCartbSBHRz9+fn/tMRoePLioTTcomYn5M10k/9GxYf51tdK1i0oD+kxpJXvZOkR+k4maqyFNUyHOrZNx3hINFQHMmHEHvSkliDT0mgd6Y+7j0FLT5KwNLQh6hO6UYsBRMXAFgGsgiLigRUjocwjjdg43JSRfBe2GUT2XfvaRDm+vEtJXOqjt87d7qQSGGOeO5Kb+QHysiJkNpoobDaFuMs5tRmfZXVsHgmRZN1sa7dwPwZ0Kx4On6zCEwaUFyF0y9bPRyOHBAq+PJQbRZl5MF9EIbn8wvsHfmLpJu/h4DMLbfNPM/b8V2xarGE96SAghVJnFdXU3BDmgD/ugh2+e92kL2VSArygO8FHVX9v7NUNBYpZ2h1ATz2kDcmIvDDENPegmQjnf659oGaUR3DNBZzj8Fu4XwhpLKrDRocKGRrKSxHt4ea71+z15cHaj3i8bJS0cuTcjx95TGOucaWG//tJ3ZmESiStYQMxgCby+1NDToKBhbXa6QvU2CIWc+4M/fwBXa9bxWyLebfXKq2Rfq3Aww== 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)(39860400002)(376002)(396003)(136003)(366004)(6486002)(6666004)(2616005)(478600001)(316002)(2906002)(54906003)(6916009)(36756003)(41300700001)(86362001)(1076003)(186003)(38350700002)(83380400001)(38100700002)(26005)(52116002)(6512007)(6506007)(4326008)(5660300002)(66946007)(66476007)(8676002)(8936002)(66556008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IztdvvF9jgXw8tQexSV4cbr0R94s/CYCzVusACRzxgOCawThFKkXNiinBiVqJ9iT94BvLROHLc1UaS1UwR8mMLsjJSjKzA3mjrLrISWH0YNmoi9NB2RsxIsUKWXHJjSrGfM1KUq5+5ZjYzHYF+LAaZdPRseC5vsB36ZIDdVDe66lLekDuX5Ix2h0vob5Q0OwFfPU11fmEhLUopVYnLJxaeL+rMmgF0opUIvzNSo55RsIrLArbqV73zEAtHzNJmteVhhUqwEClYhqXSkZwWaSqAFCjPN9ShPEJmly7iLco/NUj38t3Utz4hodk3qnZzh3mNludsRm30JHDeQ6sTBHUgnj3X7iJG80zTDSyeN8AIR1uIOGIeiW8rgOcqhxyhhZVSaO8HBqqc13YBiBgTKVW8x2A9/BRd5MXpxt1KeHUds55IalXDckgHIQ1/cmpxQ7I6Pz4nqugnfHSHfslljfDVsNWXzPTNyGhCXysf9ELW9TfZH1odI1elbx4rI2M5833NEOLH27sB/9EgDIPkr8NgcZT2KGC8rOntPoOmQSBGbhWGP+v8Fbd2zprsITyP65+gJAAnYkacCU0omjOUpzqOAUws+uqkO5wEcf3kfZ6mRxr/63o9QD5G1ryxYxhRTKN0MlTzmnqtbWSx1R39gHjM03eTyo166Z2ZOQdh9IFOZaUFIxftBvgnT6HuzHSGvBmSoz7HCtfXnl+hkJummfBYagy6XI8B5hVeCGx2bkyUAGCgCNK73kebPvM1NOXEEJRK1NK1muN8hjMmluqyZRrqiB63s3+hEZVH02lBkaUCtJW8z5QEnndjD8y4T32JYsZftur16+vYVA+3h6LrYyNHMzJHz/fLPAHiJXhFDTgKSyBtukderGy6zotD65d8Wo/Rk5w1JSEFF5BBR7z4Gw5qrLrfKx9SbdnzGPz9V21Qpxi1JWJcKZNsoXzJ+stOAc4F/+sXmENgoG+cDthkTK8Wtfw4Q2eBPt6eVJ3cIYNmrqksEU/2onnYhM7st0HbmOIrjwR9+rKpFNPtSki9DvMVbPZkWk4JlZc2EjOXOVXlvbYWWZ+IzuD7+vE3UlIFWt+C6eNIn+nHVjIpQZLc9uNnzMYKJzhK9MBtaORTtydmDieu6xgBqpon8k9nNJ167DBrg3bQFJ+trJFxLgpBg/X4aI6/jROn/gMnroHNqA2NnZAQTmvbXnADXENznYaas8PwvprTePOitwqttgv5vXYo2ClIq6be64bt7c4UFifdyDaFXYlOiLXYQm27mrzZHbU3ope2+A+NHAkt4Hr7Pk1zOxhi8CRY7+dP9j0DgiDgEPjwN50o5E7Rb45Zq330CBtnrn6NJ9K2O6b4GOx5HBssYzvOPkpL7SiFja+Y41++u8J/6m3BhfqklmmTQ9mmQE9LgdzcXWWNKQUz5ovOZch6zR0iHaspS6V2aoNAOSlpyN+ENBZaFCk01+xwBtk2pOsD2n51ljXSZbVdSuWJVEMldHd2lrc0DiEk9/a7wpPePnsW4/EbhVBmsiYu7orN082QkT5duAHi9sol1VS3fDd0lBCOGyl71v3RVGgS/HNeXVFZWCFS/Rb5hwM+WxhouAaiBGDD6bUCj7KsiqiHEq4w== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 12d3a027-cd9d-4506-c1a0-08da81eb3c3a 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:00:55.5221 (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: j1L+Fvw90gl9T57fr3jcHO7ttgao1T29KBBnewZherqxBFqhavbQKjyza8oJ0rijBm3xnGE+PQCiolGASfloJw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2302 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 Forward AddBintools calls to base class to collect bintools of base class. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v5: - Add commit to forward AddBintools calls to base class tools/binman/etype/gbb.py | 1 + tools/binman/etype/intel_ifwi.py | 1 + tools/binman/etype/mkimage.py | 1 + tools/binman/etype/section.py | 1 + tools/binman/etype/vblock.py | 1 + 5 files changed, 5 insertions(+) diff --git a/tools/binman/etype/gbb.py b/tools/binman/etype/gbb.py index 7394e4e5d3..ba2a362bb5 100644 --- a/tools/binman/etype/gbb.py +++ b/tools/binman/etype/gbb.py @@ -100,4 +100,5 @@ class Entry_gbb(Entry): return True def AddBintools(self, btools): + super().AddBintools(btools) self.futility = self.AddBintool(btools, 'futility') diff --git a/tools/binman/etype/intel_ifwi.py b/tools/binman/etype/intel_ifwi.py index 4fa7d636fe..04fad401ee 100644 --- a/tools/binman/etype/intel_ifwi.py +++ b/tools/binman/etype/intel_ifwi.py @@ -144,4 +144,5 @@ class Entry_intel_ifwi(Entry_blob_ext): entry.WriteSymbols(self) def AddBintools(self, btools): + super().AddBintools(btools) self.ifwitool = self.AddBintool(btools, 'ifwitool') diff --git a/tools/binman/etype/mkimage.py b/tools/binman/etype/mkimage.py index 5f6def2287..16a4eb4744 100644 --- a/tools/binman/etype/mkimage.py +++ b/tools/binman/etype/mkimage.py @@ -105,4 +105,5 @@ class Entry_mkimage(Entry): entry.CheckFakedBlobs(faked_blobs_list) def AddBintools(self, btools): + super().AddBintools(btools) self.mkimage = self.AddBintool(btools, 'mkimage') diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py index bd67238b91..48165abf6a 100644 --- a/tools/binman/etype/section.py +++ b/tools/binman/etype/section.py @@ -899,5 +899,6 @@ class Entry_section(Entry): entry.CheckAltFormats(alt_formats) def AddBintools(self, btools): + super().AddBintools(btools) for entry in self._entries.values(): entry.AddBintools(btools) diff --git a/tools/binman/etype/vblock.py b/tools/binman/etype/vblock.py index c3ef08bbb2..04cb7228aa 100644 --- a/tools/binman/etype/vblock.py +++ b/tools/binman/etype/vblock.py @@ -98,4 +98,5 @@ class Entry_vblock(Entry_collection): return self.ProcessContentsUpdate(data) def AddBintools(self, btools): + super().AddBintools(btools) self.futility = self.AddBintool(btools, 'futility') From patchwork Fri Aug 19 14:00:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668120 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=SNTYXpPN; 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 4M8Njp2Yfnz1ygd for ; Sat, 20 Aug 2022 00:02:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9739184B5D; Fri, 19 Aug 2022 16:01:27 +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="SNTYXpPN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8B9FB84B42; Fri, 19 Aug 2022 16:01:09 +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-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70071.outbound.protection.outlook.com [40.107.7.71]) (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 947A684B27 for ; Fri, 19 Aug 2022 16:00:57 +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=aPWpHXD7MtkSiCpBFdCu7rvYQOwsKgCkZ5N8JEmlsuIIofiXNNhuDHrkL0Ec2fZqh745Y7vVA5ucNDHlCfEQ2xc9iUfxwaMAj2fc9PInSBnjlPU3B6/gJnkgVKko6lHGCHODl8Pe1OYsCDoqcmKuGm6+/LLx2Q5besbATfLvY8PQBasiiRlK9uC+qZJzbLuKlTu3tgb2aXIZ7HcYj2UgG52vDtQJCBN4WQQyTlk5oQNTWmIPhj8KZbPxWSmbqYW7piEVKIel3hizNk6y0qcdMGRjKRgvDx3Yc4/OccVgpWvYClXofiKgKhhan0pq+RnSRHJ7Okn9XGFnH3QudOiIlA== 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=/CMhbj8fL3g8r/ee4SHDK0Pmca5wV/L/7QPbqW6F5eI=; b=e+mBVivHX3ryKkheVFJfA4OD5ufnHyK7DGQuY3sPhO+l9bKgkVv9+Ci3rSAD5ftwJZc1UyESig+O4iiTQDl9OZ+LEZ5cFt29T2MhGHdpUjAVXIMsl4H9Fw2kTew7Y8e1jqINSaQ1bijYTSAEN92eWCYFVLYskfCPwSqWnSszSdbtIimXqtGPcQhA78ndA3lGDQrtQ4YSZ8lz34iUnk+b+GIr4bomOlocVJaOfhPDpKEm5x/cEcdChbGR/5hoO/Qdx/g8F9yGmqn/qOfnSMHR3pmpyxuOuxTGFahPH4YHBqrYx5CV/inrd976zwafuAHaXVTd74wxsJDxinCiDJQdpA== 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=/CMhbj8fL3g8r/ee4SHDK0Pmca5wV/L/7QPbqW6F5eI=; b=SNTYXpPNjN+dhpK6AFR+4lmSJ/qy+M2jrISHaYZzSBm9ruxGn89k+AOr81+mnnM6BNE/oDQHwgSywU6gvHMo3bZd8Hzpy1MDtzCq7UVFwwF8dY4zBfTQZ0tZfzYNKH9htSRrl30AaXqdxnA6oSVbDCl6ezNJw8DoRvw3ONvoI40= 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 VI1PR0802MB2302.eurprd08.prod.outlook.com (2603:10a6:800:9e::17) 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:00:56 +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:00:56 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v5 05/21] binman: Collect bintools before usage Date: Fri, 19 Aug 2022 16:00:19 +0200 Message-Id: <20220819140035.32760-6-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: 89ae394b-40c0-4af4-4be1-08da81eb3c89 X-MS-TrafficTypeDiagnostic: VI1PR0802MB2302:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ETgxUTzN+uEAfKJyirQnKX1O/xlRVY3pv0LXinKmc2tqfmhhwik1TTNL6BoQsH2ER56hyTtgxgb1eAsQWLMNZCtOPlnvdCt9rGDaIxU+O6qYUvU5KtBcu8MSFLT0DspSF4JfssipxBi7U2nec868uak9ykAUu0jeLUMO/c4hvKPeQzbbcCcRi8sAah8e5I7N60rshw2FD7s3+QjBbf9ZICbWmGWMtWbxOKnWvb/ergG8J5VidxVQk3Ije3GLrsKOupUiy7hO9UtlXXVMKWve5CKhwUwgwZC+fT5AYbjAAO2C8lnT9610u2RdjlIHdYFdyminm6HX+et1Z6uGqv1rEQeUbnyPo/Q1hAW1fjG4rSUaWsp7zABU2Y97n64foMSeX0L7laX0zGFzK03McDAE2h8Jaq+2ugN0SxUZSMUP2wQkRXPK44/t8M3ArCyoGMovmG1lJYNPd5A0BswDXlGwOtySY+0g5Uz/2Hbk3nXHyNvEavgkyJukbM97Rg93CVeoYHdzHA10RMDrad0Fp6DSuNug27by5I+A84h3cG6VqqHa5lr0YKk8gNx+ddLLUO+uMCOVmfwnGteHaEjk45CnTDMo3etAS2QYHVLlfnb2Xe+0IuGqgR2nmYffM+qwG1HV+yhFrOSK0sRjNR0q4NsyF8K1HYQlTTyRCGpRQlBLX6ru72IG8PHPMvx+G9KjGgrWG8h+4GHz5jIA0i8sVM/T2KhsCITj67Kb9g2cd6tHplHY23T4Fo27afvwxtExD+RbUbVTj4C+fSX72c9SUMNunw== 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)(39860400002)(376002)(396003)(136003)(366004)(6486002)(6666004)(2616005)(478600001)(316002)(2906002)(54906003)(6916009)(36756003)(41300700001)(86362001)(1076003)(186003)(38350700002)(83380400001)(38100700002)(26005)(52116002)(6512007)(6506007)(4326008)(5660300002)(66946007)(66476007)(8676002)(8936002)(66556008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nntheBwDSsUP+6NbipJk671+KaWGG6xruqX7D2B4AldiAF+6SckPPxYOxSRqmGbJU1QjIyw8U34S1ac1rooWiTmkjvzXjtySf5YEienGUlF/Pbw4FjyUzelPsZeUr4XkajNhi89M75TmmndB3fMjnrwrmKU0XQWcdjv66llGO3jMX/QrzwhRPVObQFdwgDjwKj9TQ1pl7xdd8T2ywLNlc1bAHooeJSssbKjQu0IR9el8QWyrmlPywhpjJybrmjGpv8CK6TM3B+0QK4GMOkHdngzW5Hyh/Lc69IipjKk6AUG8/K11/XFSoCjdr7N4+ZJ2s9l7Rl8KjE+N7usD7Qw/zGfuJLUIskwgp5TLyXj7FB9+b2tbOSAYiOcxFUHaXQa74cAEsgGQ6K5qEdbOdsViMEKld3EbFGEhYTy8MwIpzwrrKeKB6iPG1tjpROFgT/2b3azUWLv528X/NvIV/cEwJm4qOrPxU7EB+AFWcvpRuzy+wwlp2GnJXCCnM7eCiIT3uqJiJe7GSij8LpeQDfwNZGkOTQNNwgL6Nah7nblSXzoC0MChJuAwu9tY5P5KHCA/g9+Ky5uT6cg+ysSCdGiO96FvbYdjUnwU0GeiSTSSTFVFuU+bRp61gf/mIPUEoOkDeLucsW1kko2ppCmBtam2Yao2TPXvH2SLofHLBu2Ur8K65iYN5hWgjE1cWahgN8MX2Ns7kwAeZp77juv59mqNP/yqxyP+hjtiA+CBigniMBoEyRnids88ddjx6NblKeGMFPRU8o+pAOscBFFTjv9VdquvMxE2aqR7kOHsAoAAAyddrhOKqNuQ1RZGFWk2Lq5DINUNKDZdq6TyG/A/gBPB4o1GVoIdWNMtEu3BG28WUndZ2bqy/wn2+3Dq/rKto1AWu28yotUtFTYfIDd9WismNSlJKPG36jSPd7BaxgsOqQOqeklK2wpcaGL2CpH1i5nf1yB7oZnlN3L1dKePP3QO929OCNfLrsPTXSYbqGbM/OhEj28HFu9118+RKn5jB1Ae+IEATZYAjgAF7C2VNgIe0Lr0m+vQXMqWuVZ70QLm9qWz/H1BlTcqeqNr3+UUnV7wVmNGFItZXIfxiNXXpHcaodHdHjhWKrUEA79xl9cpA2poH8aC5k77WCpu5Kob0qmhKY5zB/ZLYbWqpzGG+/V80lXjVmSnZWkwYcIBrPM0GtGacbMiE9x6ycbaBRt/yS3d1N7R/m1zfbZmeUx3IEbo5sRTgekLq1iRerwWV4n5uy70xEXi0NrrCJqXtKH55YDQzNSpT0Jar3Me1IkqYtHTQUlebhJLDkQpci05Gp27SAbV8bRjh7P3TP5y27HNso5to83JpyrKRWN8CAIb3VhmQt4DOgjObZrfAXhTFx6mehFFIQijiDcMEs5y8LS1M18AAMGy/fSw8vTgr5yHgaBYsEkrq9+1/rCcvoB2xgLeeyAhSCrE0T0+YD4IdptMSzVS7zjkfZ1IkmHwVKZgAihV8NeZKvY2A0S0q63pYODr1QAT/eFXvECDfwRPXDZ69T9PUr1nsDX/x0HJbctohJ22mGTy73JEmHPv1Xyb9/YIpt+0a4UWxkbMMUcYWTXnGzsS0EJOEk7GaDmXVMqygHbUVg== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 89ae394b-40c0-4af4-4be1-08da81eb3c89 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:00:56.0680 (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: gGxtvbsrisEVkytYknshe+xPTWBpBepGJvVF87DknPqkrlLHD/sY8GRwZhLMDDHEZh5O7OUclm9OOKtAHDzN9w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2302 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 Collect and thereby initialize bintools before any usage but after generation of entries. This is needed to handle bintools for compress and decompress like other bintools. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v5: - Add commit to collect bintools before usage tools/binman/control.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/binman/control.py b/tools/binman/control.py index ce57dc7efc..f8b1733b14 100644 --- a/tools/binman/control.py +++ b/tools/binman/control.py @@ -215,6 +215,7 @@ def ReadEntry(image_fname, entry_path, decomp=True): from binman.image import Image image = Image.FromFile(image_fname) + image.CollectBintools() entry = image.FindEntryPath(entry_path) return entry.ReadData(decomp) @@ -251,6 +252,7 @@ def ExtractEntries(image_fname, output_fname, outdir, entry_paths, List of EntryInfo records that were written """ image = Image.FromFile(image_fname) + image.CollectBintools() if alt_format == 'list': ShowAltFormats(image) @@ -370,6 +372,7 @@ def WriteEntry(image_fname, entry_path, data, do_compress=True, """ tout.info("Write entry '%s', file '%s'" % (entry_path, image_fname)) image = Image.FromFile(image_fname) + image.CollectBintools() entry = image.FindEntryPath(entry_path) WriteEntryToImage(image, entry, data, do_compress=do_compress, allow_resize=allow_resize, write_map=write_map) @@ -507,8 +510,8 @@ def PrepareImagesAndDtbs(dtb_fname, select_images, update_fdt, use_expanded): # without changing the device-tree size, thus ensuring that our # entry offsets remain the same. for image in images.values(): - image.CollectBintools() image.gen_entries() + image.CollectBintools() if update_fdt: image.AddMissingProperties(True) image.ProcessFdt(dtb) From patchwork Fri Aug 19 14:00:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668119 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=EZgdL9t1; 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 4M8NjY39Qdz1ygd for ; Sat, 20 Aug 2022 00:02:09 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2AA1184B73; Fri, 19 Aug 2022 16:01:22 +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="EZgdL9t1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A31CD84B79; Fri, 19 Aug 2022 16:01:06 +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-am6eur05on2068.outbound.protection.outlook.com [40.107.22.68]) (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 826A1845CE for ; Fri, 19 Aug 2022 16:00:59 +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=XyXAvfCfBaToYDKDjRDFZOsfXl5eSua5+I6YrLJdd7iOElvrupxD5xWbmpsl82f2r2BjbF2q4OqOdeqF+8tSzvXzvENAznhLnBnmoGRO7+n0imMjz04su8xpnCKMYb/i59JO3rJJrBX6eGmuzEvFfcdHb7pkmo5m2TTaY2AoI9ZQAKPMf6Tu2fNC3wvaZJbrkp4J8B1s7DHzIvyQYddyKEx8SU94B7vWzDl2QD9ajJ1KeqgybhG8pcIH6T1UVgpWGd5YES/2pPPasP8nL+R7JHsUcAOts+qYFStRL3prTfFYyHNkXfA+CRP4y9GpCOxs+/7+e5wgJfuIa6S8Ot8qOw== 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=CIy8RmL8ThvdXhuSOm3qJA4eC8JHEDkRGcKzOyDxK+o=; b=HkkcAXmzuD/IfoGiiJeuykqEqgf+U/fjqRbYmTDofN6fozzD8TWM3ThiSPVwz4fFO7oxG7Hao/aqnMkA3ppsCQkkCaRy3fouOOl+zltZpBySi4qEkq+3mLmt5PNsofE2K7dmH3CjqEAVBsNpVgzIAUAjo+BBC0BnoIPweyc3LZnDEGh1PER7EYdzvDR+xsVYHLIBmRkyjSsjdg7SF7pk5oBdK+WObyXx2vhAkqmdqh5wJ8ZSbfspUEhgzp0IeAZsV8HuqcVk/Fn3kxJeEbUxFGZXp5AvjumC3nQ80QYUlmXcB1g3mL+73e1f1dLsLfO4FYW+doGa1uJAo19Vrzdteg== 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=CIy8RmL8ThvdXhuSOm3qJA4eC8JHEDkRGcKzOyDxK+o=; b=EZgdL9t1NyZLVVGFC2B86geYZMCzU4mI6z5wxyv0YDsNytS5stqojpjHgLOZ38u4+jokopo0c92p5Yw2USa/jRF4H/2bBGnP48sbtFK9GzfLGJm5rL8VN2PmZKTqy4ANGtZEN72kpF3Or0VbBSygU6wh9wSuLw0mxkqZ5nxNo3A= 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:00:56 +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:00:56 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v5 06/21] binman: Check only section data in multi section test Date: Fri, 19 Aug 2022 16:00:20 +0200 Message-Id: <20220819140035.32760-7-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: 4361a81e-c597-4119-901e-08da81eb3cd5 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: Hw+DUyQwKhsXZYU5iWMy+XQrQT0mXQXFoWNJJ7TAN9yJwiq22Vn558cAmPr8m9Tpkx+B2k1CqPd7gAWY2xF4ZuZQXYLEHXfk1fcQVapZdxxLNY/7MjMsFAB4uCgfFmpa4c7tGQvL2Fs7HftLwsHMZ2Xz3772R12LCrB9Ib7/AT/bFc/Q+zYkdozrEAxKJ0JTbPzxueKXyekuamtKB5SSlhAdehrhNh0HTb5UefwZMGddASU2j4BjAEP6bBkkD6pfKKVlWQE72VWSXC3OEeuEViMcrhUiyat3HQgQMqugo+OdYcBD3o1chcAod6pzbkewhqwX/AbTfLL1zSid9cRkOmU5CGU5qtwEGWY7FhxRTKwayq7os3ubxbUKHPBcSGzJRBCI9PX5bLFI6gRKOL6hrpo1y/C8Kt+3cg3yqAhqNfrAUWscUN5Kr/Xzk3ilnr90KHo5gCm7HCW2cE/bXMC3iTmmSqkEZXyb3JyM64cQzvcBzgTmF71u7UkUTPClrXMeV59zVfpyQPWMZIUPVIko/s5OBJEVReniuUykckCNkO4oDGYt8MyoagKRC4Gq573J3rY/wLzC1Zf42ZlW4VaP1QyEoGZ3ifZDRd0moVUBqjsLV1YBYM9pj4NJa58OWx6pYa9N/NH21QoAmbQOglqRIkTyV08WqBP+7DniYegeIwowc5m/4vDO5zmgJqazDTXozENXRUYzn89MiYRPHTIzAnWGoy1FG6a+kojvHmloqhsMxzccfDdw7x5ywGWJHMGX/gyKbJlNnzzMyDjUEDKwLw== 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: FPPDJhVws5vtJeQ06KcvwTs7tL6w1llU2mxnMDcVYqEZRMgZxIKyEonpmMaZ4ujHRAHaSnVoNZWcIR+r5Y6WzebahwGXGzAy+XhDzutGwdwVNZgQQi3tmiZjLRKbwPbpisaAgm+3P7U7C7cFyPfEB+VWeWYK2nnxAzl7wYbDq7fInaufdIVKap6EIB39DnIYrHtyw1gmVAvbIIY8+IyP1xW9+swoMAcWLehnwEzbcv7j26VBOsx6aQgT5/4vzhgw4bsWqmpv0IY8DH8fo4yXhTFCJqB7UQu5cUehCUdvl9qETP01+SHBSAEd/drsnA/LubAPcvDea98Xwz0MjGECHRxLww78DF4+bE81NGr/sRfyeDz2IlF8uLpMVroDE+CptpiEALn7Bpz66wT82TIrpbgGFkubh666XW/Ixtwrc52YmEDnp71dHl3meKx2Bqu4LI4amzCRfnj/mclJIrgTmhzx4C0DiZYfPzGxTgmfKarkemitYwfW2qaBIyIvxE+IvQ40NRl1L+wGD9cRPsvTnW6zLIl2K6KRUaFPf60k+1lnqDxfa2tBo/V+6H/0A1YYjUD8G+ExU3n94JwtK+33AvfO4DVkq95+LsVeb52I+mc01DgSjAodeB7W/luNsiuk1g1ma9TfvFEsLG8uo0tc2vPiGgdPQlNgEhl/cdSMbdecBzXt6SI2APeu/EfU2AfasSK7lF4QGR/njk3CZvz9gvJqpR2USTSxjfpzuzXr1cfBvjp452QXx2UD4P+blcYZC4H1O5mt3fpnhWAqLLdpvcRe7BJwZnUMO9BskAzoC5FoxhVVIg1MwHNlatIRmoMtVG4Z9J69tuJyGfhRj7If2yP2nUOEIR/ccWRQaA6K+UIlHytXfdW/SCxtDc66LaJFgZMw2HDqRb0fYTZqwEihyB8kt4EYjdM17TERPPTfUyAcUDETjnTjOnu3ABitZlsnPRy0LN2E6Ui/2+WmWzCWYd0VfUBGy5QiqrKXwhss/uUXIzKj8mze54E2C0gGx+8HgQzbO7nf6zPOKbvR6MaQiZYpAIPQzJirWXHTjhGANyayuWuQEGJjE3LjGLYIz5zjSVZJVei3CcwToeGFe+QtoczL+GWIMpumH5QaexycwC9j2zS+2pl2u4f7PjyNTpHDlFvmeu5lxY0gV0nnyOgSIlxBk6GBdTPJCf2hb+dBUx8tJt+C2ixtjbNvkiMpJp37EXe5RHl/xuR9EFKJFIveJGOWb5xYws7eESl28X2+2G8UV0zY2MpXTBm7W6QRuXJnYoIcgQ6w0B5Jp7GQkRc6KvnJ5aoQgT1tB7ZdDLOAe+07YFZlUnbIldags+/uG1AjiX1Wcn/TNcYefjKIj8MqEam8dYZsCnJ+KNGN6x4MnRpqtU0uSaOLCdJBOavtOfYAjJfs/shbH/HJAzrrvtWIFcoHXW92fTyjY3qWOLiRnCUgBHj6phEQoDGtJAKc5YZ+AyOeBYMlqE65ZXHvtNIANqo/S973Gk7lgGxw957Z2nRTaGbaJYJ1TqR5KGs7r9+G9gPz83INzluE2jca4s5tP01eAwhhT1zkrVhsF6YfJ2bSsbo6AsBrt60bfieWPDhOdRgmUavhDGIb/d8Ktk0dWQ== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4361a81e-c597-4119-901e-08da81eb3cd5 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:00:56.5835 (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: G5Ss88tpsTuw237Ki5vQiZCWf3m52jRO57fdcqfK5vVkAZdigx+XeNGIoQZuF97wQ/VMbSInRBM8PNfeafAwXQ== 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 Check only section data instead of the rest of the image in multi section test. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v5: - Add commit to check only section data in multi section test tools/binman/ftest.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index da9aa9e679..293108d738 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -4427,15 +4427,17 @@ class TestFunctional(unittest.TestCase): rest = base[len(U_BOOT_DATA):] # Check compressed data - section1 = self._decompress(rest) expect1 = comp_util.compress(COMPRESS_DATA + U_BOOT_DATA, 'lz4') - self.assertEquals(expect1, rest[:len(expect1)]) + data1 = rest[:len(expect1)] + section1 = self._decompress(data1) + self.assertEquals(expect1, data1) self.assertEquals(COMPRESS_DATA + U_BOOT_DATA, section1) rest1 = rest[len(expect1):] - section2 = self._decompress(rest1) expect2 = comp_util.compress(COMPRESS_DATA + COMPRESS_DATA, 'lz4') - self.assertEquals(expect2, rest1[:len(expect2)]) + data2 = rest1[:len(expect2)] + section2 = self._decompress(data2) + self.assertEquals(expect2, data2) self.assertEquals(COMPRESS_DATA + COMPRESS_DATA, section2) rest2 = rest1[len(expect2):] From patchwork Fri Aug 19 14:00:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668121 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=IpFfT2Cp; 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 4M8Nk21tlyz1ygd for ; Sat, 20 Aug 2022 00:02:34 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 23D7084B62; Fri, 19 Aug 2022 16:01:30 +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="IpFfT2Cp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 37DE684B44; Fri, 19 Aug 2022 16:01:11 +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-am6eur05on2068.outbound.protection.outlook.com [40.107.22.68]) (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 C5DD184B5A for ; Fri, 19 Aug 2022 16:00:59 +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=WbEAnhUClXub98WBiWjFUPgiO38QftfNW0T2jDAnAqqUCV8TcA0Lk/hfy5rk6GWuwtHSrJQgyovJHhtRlWPapZ4JNMGQIVSbo840txl7WeMfG9nTvDCJ872Zmk48+/lBe/5q9R9BJsJo5kU04hDsokx6fV3S5pDkrlBa8SbdOsHqpCB/lJeh3cQr72KL/vykPubDkBWGx3BDnY/Z1BjrH41PnN+fSCFJEcxTCoXyHYgVHyABoH/ZaHHlkuQX87g2YC5KymGFe10LXakKamSg08wWytBQbQKIxLksjLYFsuE2Cs0NIXPoJmPLpKFtrb4TAMdge6ohDEE7dbyA4TpFWg== 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=X4reHGVTR4IwrW4sH7XF76HfUBfZCc99YCN68cZToM4=; b=Smm3c43gDcebFhTwNVvvgeNlCoq+Sy4XHol8LeLuxtHSgI0c/XRMlZyrEbF8sch6J+Q+oiqVWpHbUhxhnpIRm+gLHx5oTWERDy/44//bxUmKWaKw64qOg30DqUKv/R/5TH8LWy8Rp9rkJuY2VKgYXH8Psa0qVjDmoh2KsunYwcNuTCnrYXsS+VpYAIpCP6hJZn9RB9RZVXJgwyjy3M7eleP1i+Mq8BUjvRmSaAj6iuu/g6QYb54u6GCTUmftNuJpNLLksy1cmd5kPuGkheAT5VNBT/aRbYTQ7RUTvdV5rnOOPXO2r5dQPdqzpkyiaEjTeb1WGJ/YoIHiuCr7QgBa9Q== 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=X4reHGVTR4IwrW4sH7XF76HfUBfZCc99YCN68cZToM4=; b=IpFfT2CpBfczAsWCxMCv/df+AmBO/zabAM2rj1PVMc36GhUYubFa9zIpHAeOWhjFbY1EtwnknDWfRsX05Rf+FHETCJtQVhBZh+vbu51Z62CwgJJB1Sj6NXY8oTHwxu9xa/P7C2fXv+r7ru0IgiPFi4gcSNPmuMLOmUdqj7PRxf4= 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:00:57 +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:00:57 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Heiko Thiery , Simon Glass Subject: [PATCH v5 07/21] binman: Add DecompressData function to entry class Date: Fri, 19 Aug 2022 16:00:21 +0200 Message-Id: <20220819140035.32760-8-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: f812e125-bd2c-41cf-69de-08da81eb3d3e 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: I+ibB7cOJsWCy+q3e640Tdoot9q6cU7faXrRFJX3jkdP/qLOTF8YDCDhrK52N15vlB6ekHse95Ti0mnn+wHCpV7nkdk3V3uc2JT2TtVmI52K2aEBMITRxtB0Xb0hjl2yZa9spAZAwL6oCT8hx8dcqOryT+ge9qtx7UbAdAwmVzOL4s6zEVBmn12eqkNnrR7Meq9jgXW0j5Ey0fxNB+QmQ3PdbR74GosSCC/qS37Th/IqrrMATZyR8TODRrXPNJGtewmsrXYFNreuybY91hUFZv3abxp4b7c4QoY8qddPnIjkRFuETqbgUSGmY0HnZGl8hvi+XzKRVgDXOfNp2XMF3bVWM9mD15BLkCbHupX4R3l7S15kCFn88yk9yYiophFTynXKauXehc4QyoJiM63xO1dYGIlq28HyTnKDT2lDlcoI9vZWNPQ37nob1LwH21ceiLoxbtLA6qCLOWgCsUVom98b5ndT+Fcbjq48n55ZgPh3K4zBGdPykjDetDjTjj5i3H6gUwCBa8EWef7lqlbPtzJALTVw6YYmupuR8wMrqV/PS1wSi95qwxd91A2ScogcdxKNxvqyfA3nIi6OOBMKGzLYzjAIYT6iNEQPQ3PHLWq3pkP/8fcD0YEmDM5zfWZMD4dlX0RtOdZoG8c6qwt8t80bEBREUo7RqF1YKEoff9+wznlwKH3AcwXZWZ8jz49E7YKkoTv6Do2S9qSOHraaDLZDmFNG3QXoxNQZ3ThmmHiyeWMIj2JEyL/j2IGAE1V7tFaCPTxTXvlE4Sltx7i+DA== 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: MqUmv7xyBQJSJxT+L210wf1NgIGg4myjTmlZ0hmSY4KVjZvCYnvoGgYMckF6elK0e6t7x2oUwyXoc0w0hvA4ddX7PDXBze8LEhP5LX2qYrXDN2eC7nrqnV4mcWHJJnwDY4w7gLE2Xam1UuYqBGluviGIBdEUCsZNH8EmfKKykRqmVCR/tfg9o8t/NzLZAmiCP3x5HbheBk6J3PzFiRY+mQiJPeqbmPeVHXZiTJkmcZmKqq0AJqXYzGCVqkte6+/Xgf+hDqg8eH42B+Y0CQ8G7uYZzuJKYo3yaxHtEG3MhXypEI+7hHGBcJwW44ZPW3le3vXaXBK8I/WlPpM2t/c8/TrdtcKWGStM5jHHrPxU6395dzN9Ksuxye8ZwWZlUiuZiCL1L+WCXAHO50ykl6y/4lZCojXP/PxwdEAE1shSA1Y9LUHGnXorpJb877yiYyvr8fy37yOEafLrmV1Swbmqp6Q7QcnE0wxTLQFngzDhry36/pvEuiTBY2han1BCufBR/rLd8FEHdeM8YJJ8qWWUL9fHAZ1Zw2HGgAAnUp9QOOi890BxxUje3cjMrj8corrV+wmMz3nYT2peI4QBm2ybniqgnWpda524QBBdAlR0wWSw+jjAGLcmwOmWzueJnMbpnKsUusQkcJ6Ge2aLMcwXdAFlNWGF6WlTLkX71cmH2f2vP4d/NeG2YXeE6waNoyVZRxGFUY6k56bzLwc8i0O0bx+dycjAiN5chSeuCl2O9enBcb2DWcVVPrtmmquTZRKeBEpOTUlBA1qP9wIb9ElDcq4RK4pruvvHbiXS6r8c+MNgijqo+KIFJcNh1DwOBMXPO6oQnwUKpNNDqVl6+eT387Cvip8fvxh4EkhvrhF3cSA8od725xWep7vB+S/+mI9/cSSrZJkwELG7Gs2+I3HmCLShj+8KDBxmoazqh/WKLvNddhI7TZ/l2asJJadsN1sgAaQV7tiLAQo+6vbccfOtssIAyiRDVrdb196YzK7WjwQSkEJHA6TRhnbjgapJ2lohvwXyaMIP+0NNSuBm228sVdCq83/yQccbI/cQhZBLHP70T0lhRUX5jPqunwhX7Se7Gb2wTrrS3kR9lRWR0QBm/bXU8wPvlx7UmYPlr66qfltmu+FzCgLpaH83v/ix1NiuFzF/QECwQYWdVhiiErHsjBA+L4aLDsCYsUa1jwBgNg8060OPMB4Vu4MMsYUcM4q5B0KccsJFMtkDbD/3gYi39SrS+jv53jLbhsi6lCFxWj1coauHDAoB97ThmjgjYIe18+VihtFVPWYD4IAinxdu1okLUUF84CcABa8tKKo2OQ3LxTfm0+gM1lDKYlpVJLShxiPonNeK7kYzflU/+YL3iMkKpqOnQf0dAsPn3r9baifjzPW3Z2PwC6Ea0MU405iO9DPZuW6IGoaHDOllQfXxxW4Grp5EJysmVCRP3p3NZ/cukIDzWj3aqFIuoNX7le9zd/mkyZ36SSLxRr76HlC3eR7FWOIUQz0YCL4KNaLAFQ+3OF/1zUCgG1bupXLd5QYhd3aajcM8MuBRXaMS0q+GwNgK0fWn5Abcwee1RR+JyF9aoY8LKe5T81V9xlLaG1e7fYJuZSAaFsDYcXLYfDkluQ== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: f812e125-bd2c-41cf-69de-08da81eb3d3e 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:00:57.2407 (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: 7yN6dniqTBRaT9iSCuT3NDhPTlfkKWIhpdVcnZNOw5t692bP6evif6xooVgnX7II6+37zMcna4Wqpv18S+quPA== 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 a DecompressData function to entry class to allow override in child classes and to centralize the compress and decompress in a single class. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v5: - Add commit to add DecompressData function to entry class tools/binman/entry.py | 15 +++++++++++++++ tools/binman/etype/section.py | 3 +-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/tools/binman/entry.py b/tools/binman/entry.py index 8f846e55b6..6d58410e91 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -1086,6 +1086,21 @@ features to produce new behaviours. data = comp_util.compress(indata, self.compress) return data + def DecompressData(self, indata): + """Decompress data according to the entry's compression method + + Args: + indata: Data to decompress + + Returns: + Decompressed data + """ + data = comp_util.decompress(indata, self.compress) + if self.compress != 'none': + self.uncomp_size = len(data) + self.uncomp_data = data + return data + @classmethod def UseExpanded(cls, node, etype, new_etype): """Check whether to use an expanded entry type diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py index 48165abf6a..b9b2f25345 100644 --- a/tools/binman/etype/section.py +++ b/tools/binman/etype/section.py @@ -13,7 +13,6 @@ import concurrent.futures import re import sys -from binman import comp_util from binman.entry import Entry from binman import state from dtoc import fdt_util @@ -777,7 +776,7 @@ class Entry_section(Entry): data = parent_data[offset:offset + child.size] if decomp: indata = data - data = comp_util.decompress(indata, child.compress) + data = child.DecompressData(indata) if child.uncomp_size: tout.info("%s: Decompressing data size %#x with algo '%s' to data size %#x" % (child.GetPath(), len(indata), child.compress, From patchwork Fri Aug 19 14:00:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668139 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=MmYgzwY2; 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 4M8Nmv08Nnz1ygd for ; Sat, 20 Aug 2022 00:05:03 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B5B2884BC9; Fri, 19 Aug 2022 16:02:18 +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="MmYgzwY2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A938884B72; Fri, 19 Aug 2022 16:01:22 +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,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03hn2246.outbound.protection.outlook.com [52.100.13.246]) (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 92C5884ABE for ; Fri, 19 Aug 2022 16:01:05 +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=Ss7dWA70LNrWCdTh6x32WSSXIjgk/gFWvdu2XcXVnldXjpfd9P/KmbFz1aoKyYlpvz8hSipUjvP14/n3aSaaA0M4s05jF0iqHs+TjEqLJC8xLi8IouPI30x0Bp3Qqh82EtbcaI5C2XNp2QOpNQNzktUsUHWXb3roix//qRb9YrjeJW4A81mP+gza3voavkzeTYACzLInye6SEq/AVrjLC95XK7d3EG4dOLi/GnAcbYSQpu3E/lWFUYwu7f7oJp96n+djp7iGlnLySyjB5UWbiJolNor6q48V25f0H3B0Haw+U4OGljjc9KP21PUtGTN1zG3NxZ0+1pLM9mZBAyY4Vw== 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=WWSP1Fw4t+a6Fn+h4a4qcBJRGHcR1x6hL2gTMg87wac=; b=CiYjK+e4B64krcpTWVDVNZ/4kc8+dPXnMK69Auyeg1MLCJ5wS+geddHr0sexr1ALS+jDbRDruQE2LPvmCYHiiupgvYoq9iR1KaF3+iJq9x01e3TflkzqyaJHxRiVnEjsAt1/0PNUlO3itlNvXAykV9GArbguS0fzWlAlCeaJDi3Nzo6omflJzdXSitA5o2K7co5bCoVPBVLu++tgf8hlFbgw+2lo/esoBj1PolMZ7oyMU1uVhwJ+vOhtf8zJiIiEI2arkoXm38WTmhEe5z0GBi8V1Jl96GO6XweFIORxvUAQafsqj7ry/CNZCj1EH6XvxRurTsDOVfZMOdmOQsmguA== 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=WWSP1Fw4t+a6Fn+h4a4qcBJRGHcR1x6hL2gTMg87wac=; b=MmYgzwY2OuGxD8J5khRw1q+nHTgOlnd1ARZ4BV28g+bjnON5W7r/Z1OEIEdLCHTkYkkvQOrpe9BAFHBanzcA9S1mgQzqsKmrynZ0y0C1E0NiFiEMX/awVyYbK8vemYTBmgoEJwZFh4Aou3DyouUMLJ57KFaz06bpyfUHfw6Lvf8= 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:00:57 +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:00:57 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v5 08/21] binman: Add length header attribute to dtb entry Date: Fri, 19 Aug 2022 16:00:22 +0200 Message-Id: <20220819140035.32760-9-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: 4417e81e-6f37-4b1e-1923-08da81eb3d8b 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: p8qXTCw5BgR8RDL1EzsLUTl/EDmkwhl6acGH1aTwB/AVvjAPr6NjnrntkrUuN18vw1vOWj9Q6URrEPUNe2quaFRmFK1ZdrT1S0J6NYupdp12nlPOlCtqo6hRugUbB+x2jTBiJzU+iPaVLCXTmuKHFpagIjx4cJUnkbypKzxSGzUU06JEbGkixKgn11LBw20bo5DoSg7cRW2IdqmiBcunx+MKurLdPvcnCT1wlcUboGJKkrJ7nLpjvND8jyEWgpc9qI/urUXYWBy7on8nkp+8rIrVmP1yU7UL483wXcDn0qNo3TMO3plHNnXOkBVZmSzj3RWt9Fl99ooYjT5RkYJdvHnLQ/eikhejPIAs014xKlraPLG3UPTXRbowSMQ+/GjhgzKVgWHxaPnzJaVVvRSLgMt7rfgzq+Zy2cwJ7PAZk1YxXT/sL5F03GmtDpNjxvhUf4p7vFJw7JvOXdiuyqZ04mDLGM07/Q4jQd5RCRUTG0aOhLsTwaofjHCWGVnjkbMVYwI/sl/ZyWTzg+RI0rMC0W+KkESBcKURFeVgG0QmlXVpYZIeaNqkEIcBSNKVhUhjzYGxiNkg0WrgFWmYs8HY1GdoNBk5jmqUl9PD1WkXe56T41rQY9sZxGW9Wvy1OaHhuT26UkYk81cm8C/kI9dWiOaqTOdrepKGQN8fVkweM+PO+DnGsPYmxtgpaDV4ShM10K7RPyjNqLIZQsE40Perx+pwZ63sdEn2YG5Ax4XUR7sQBR0YgvySf1rvMf0KbwpLAG0w26GTrQVLLexfchKN58FvZyrzH2BEOxTzdtHadIne17Ipn9E1Lrv261wf8Yv31Q8b6hZAg254lrEVFKo98ab+UEebNcdJNpGXJrDvToYVabIghItAxtcUTJi7VkhcDiLW5QY1wQ6Krn7JtNRMqEP+IOu776rCgSmhrehauFImxRoCi05uRwftt9O2qdoTm70QnykOFuC7Afi/JK3ipc05xxsqGVC9hlb71m/ScwCZ1qESg+reDeBxdQ3kwUHoW9c5jt4roekeqMt/Jfuj0N1lI02ibDGT8zW0JtcpWpb2RTvX5fq1bDK/q6groavicFUJnC7BLiyWpbNBvs+iTd7T3dNgk1a3SMwzPCS2DOMRQi3Aoal84/VePJW+6f5vxXlD5odhwCqfYluajE4umFA4rcnBMSdHW2MtC7cPuYM= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:5; SRV:; IPV:NLI; SFV:SPM; H:PAXPR08MB6969.eurprd08.prod.outlook.com; PTR:; CAT:OSPM; 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)(59833002); DIR:OUT; SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nVNrm/FhJNH6GSCrgiscl52AkKFNe5stVDCCQc7gOIIN/g/l8HzvMDB7fGxrWOv4QNLuQivCsyr29GZMTFPOwPb9zOm0AnRlk4M3Fi8PFn9aaciCW+7/IHKo/QIHXZ/OuijdAfzK0HKH2TCtWwbRprc5Rc7ckTbXdj/HJ3RokHLJxo9QQ88lAeCBeIMmDW8TQTNdrQA/e1xC/pJpcynH3cg20y6sR0IXW8UMK8A117zrNu/dSFSlLArpgU1g6pTrgYPxTN9fyIVNciyUtwLZr30+YVIeQpuefG8gpr5JGcZ86+eVJOmveDwqk8eEwXQiz6aer0lwd+CrPWF9aySsdPUlEv1FVA7CGCZyv3c5aJenekV2vsFTX2NogMJYDkiFZy7hw+H7RiHeasxFesM+n4vAhiP/fMthFk8gHXgE1fjv+iP+FXCdNWUJzq612bCu0kK7+eS8gta8qmlpZVjSrPKcmodLn4Xw7+wFhq5Y6+2sgJi8aQCKu3QPgsSNVVPGUyCsyOYMFYOyMvZTCM4PX3OOLcER5tDlH2vq+Qg16SXpnA/QapEBJAE1nNQ+AIfmwqOqkRw1k5nrEGchNQ2hqENhBmd5QGGFIodI5dc222etaXAVttN+sOmbTVpcI80hCYrcKJ7FYv1p+tjW0TW8KfrCZyhta+xAO6Gh+v+EhoOd5SwIj/1NYhHShkERaQQIn2NLswfwPD3aMHtu6tRM732FCrhG3P252sLCSLzV1ysjCTmoWZntqEZUTdWAs0vD/9Wn4TP/w466SZ6yUk4o+HQ1WANwMy/ujlA4f2ASmJ42TwF/Exu5Gk6hmyoC7gdT2OFhrJCbON4MmJxg1VmeiPJ2EVXhEAOQItaGGZoNV756TQ0CO29IUEt8URW0iSXw9qvVdXJD2CvMS210YI8dKg8zUlwI15bKsrjf0YNaC7/Ij2qwiAGLsrfjpEjQUFJBzMiS+Z1d1Q0TJV/bwCVdxY+xo+T9pUooQcTf7ES+G13I4wRlKyxL7Xak+TzHW0vuJCWiOXsO6oJtgQ77Iis4NAiJRECR6ihrD1NSMglWrRvy16iISc8M/R1LBmhXXHByhBLhoqwiV4YBdpDkFMAqEvxPFTmitHbzRwko7tkyK9Q4STocqXTieZgP7m/mdEd+mGGz6WlmHfjUjHk6YR+4RLQgKyjneRSPfW+xLjNc+Xfq/e/Wg+VbWxiQjrFE1gs8+aTkhVU+P/XAkAZq8p9t4Ot5pD9N1Np3n++M4Wzng6uFHyAhFTdxW14wzy//ZwUisAgAsf2l7ELqv78DmcsBgSDDQeDoV/PvMslFPsLehdC6X7mL+30WzHcGtqjJk+Ap+tMInAaQIj9fy9josFhoVRKRhLWTbe2mLrB8MlFJHXe4nDY+3GCMnlCCnUGvBVnTQfu3qfr0XYvcajtho484ShZ0fBzoTDZhjmqF/8b0FTTaTNpw3L5PxRgeuwkrtZPKkBSLsZ0Y3SCIY4bz720rOBOzouqTLQ9tEkYyWtJ2phkxkwIPGtD7Vhq+EVR4grhnmgL5AwoMoe4mYhY+c8BKVOUqY/oUlj+iSrUAZgjovXVJ7twHUaYVgn+sQ1TwDqVgpwIjjo5kksGdlUz6zwB5ow== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4417e81e-6f37-4b1e-1923-08da81eb3d8b 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:00:57.7420 (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: 4YbT6AdvFh62Cw5RZtPjx2V16TP7Kn4mEglMb//ZvCTr6DSgIGkk7Hmw3y9mmjcIJdsivJaeIjY2q/yDqVkthA== 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 an optional length header attribute to the device tree blob entry class based on the compressed data header from the utilities to compress and decompress data. If needed the header could be enabled with the following attribute beside the compress attribute: prepend = "length"; The header was introduced as part of commit eb0f4a4cb402 ("binman: Support replacing data in a cbfs") to allow device tree entries to be larger than the compressed contents. Regarding the commit "this is necessary to cope with a compressed device tree being updated in such a way that it shrinks after the entry size is already set (an obscure case)". This case need to be fixed without influence any compressed data by itself. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v5: - Fix decompress Changes in v3: - Move comp_util.py changes (drop with_header) into separate commits. Changes in v2: - Reworked to make the feature optional. tools/binman/entries.rst | 3 ++ tools/binman/etype/blob_dtb.py | 27 +++++++++++++ tools/binman/ftest.py | 39 +++++++++++++++++++ .../test/235_compress_dtb_prepend_invalid.dts | 17 ++++++++ .../test/236_compress_dtb_prepend_length.dts | 19 +++++++++ 5 files changed, 105 insertions(+) create mode 100644 tools/binman/test/235_compress_dtb_prepend_invalid.dts create mode 100644 tools/binman/test/236_compress_dtb_prepend_length.dts diff --git a/tools/binman/entries.rst b/tools/binman/entries.rst index 782bff1f8d..c9336d1bb4 100644 --- a/tools/binman/entries.rst +++ b/tools/binman/entries.rst @@ -216,6 +216,9 @@ This is a blob containing a device tree. The contents of the blob are obtained from the list of available device-tree files, managed by the 'state' module. +Additional Properties / Entry arguments: + - prepend: Header type to use: + length: 32-bit length header .. _etype_blob_ext: diff --git a/tools/binman/etype/blob_dtb.py b/tools/binman/etype/blob_dtb.py index 4159e3032a..5a6a454748 100644 --- a/tools/binman/etype/blob_dtb.py +++ b/tools/binman/etype/blob_dtb.py @@ -7,6 +7,8 @@ from binman.entry import Entry from binman.etype.blob import Entry_blob +from dtoc import fdt_util +import struct # This is imported if needed state = None @@ -17,6 +19,9 @@ class Entry_blob_dtb(Entry_blob): This is a blob containing a device tree. The contents of the blob are obtained from the list of available device-tree files, managed by the 'state' module. + + Additional attributes: + prepend: Header used (e.g. 'length') """ def __init__(self, section, etype, node): # Put this here to allow entry-docs and help to work without libfdt @@ -24,6 +29,14 @@ class Entry_blob_dtb(Entry_blob): from binman import state super().__init__(section, etype, node) + self.prepend = None + + def ReadNode(self): + super().ReadNode() + self.prepend = fdt_util.GetString(self._node, 'prepend') + if self.prepend and self.prepend not in ['length']: + self.Raise("Invalid prepend in '%s': '%s'" % + (self._node.name, self.prepend)) def ObtainContents(self): """Get the device-tree from the list held by the 'state' module""" @@ -58,3 +71,17 @@ class Entry_blob_dtb(Entry_blob): # will still return the old contents state.UpdateFdtContents(self.GetFdtEtype(), data) return ok + + def CompressData(self, indata): + data = super().CompressData(indata) + if self.prepend == 'length': + hdr = struct.pack('; + #size-cells = <1>; + + binman { + u-boot { + }; + u-boot-dtb { + compress = "lz4"; + prepend = "invalid"; + }; + }; +}; diff --git a/tools/binman/test/236_compress_dtb_prepend_length.dts b/tools/binman/test/236_compress_dtb_prepend_length.dts new file mode 100644 index 0000000000..1570233637 --- /dev/null +++ b/tools/binman/test/236_compress_dtb_prepend_length.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot { + }; + u-boot-dtb { + compress = "lz4"; + prepend = "length"; + }; + fdtmap { + }; + }; +}; From patchwork Fri Aug 19 14:00:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668122 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=tHzLvlPn; 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 4M8NkF3Nn3z1ygd for ; Sat, 20 Aug 2022 00:02:45 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3B33984B72; Fri, 19 Aug 2022 16:01:34 +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="tHzLvlPn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BAB3584B55; Fri, 19 Aug 2022 16:01:11 +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-am6eur05on2068.outbound.protection.outlook.com [40.107.22.68]) (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 072C984981 for ; Fri, 19 Aug 2022 16:01:00 +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=MTJgjDohyECIob6ZY/6ZzT+jjf0m8xZekFjD+4vgUpcDbPgGspH5xSdyW60N669WcZjh8fXeZSSzgKcLftS/luuvBUEHyrVBXh2UTX4PdC/4NKCbos+sRyDwkhDwknqh39etlEZQqk2q4vN1WsEHdQtr+UKVkHKrPd+maSV2udb2TUnp/B4rpBCtnWHfFfbSxLfiOf5tK587LRKgJ8gto1FbGEKGVjIbP/Gpt+VmokRwYfWlQvDjPlzXu+eBgqLvVo2Ya5It5lPeacjuxV4HNQk0rnyIPn0ajPOXIBN/wUIBLXoZTnFJuljcmyvyzE8EMYUygqgKQCt69Jas8FpmXg== 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=pTX18/YswGjYPWCsGlnujFUdniknIpk1tv0Or4VlDd4=; b=nTqwrmU2eYJGYnFuhBepv3ft47wLZX/Wo+0NEKwzhrIaoUnJZbtrohuRHVAPw3rBoRp9zv8ReLRkGzP/2sx9DhHJMRgAJdVFzMSnvarI0fEOWAiEtIdpf3TPNrsV3eMsrBHq8plhlvfkewy6wgt+xErcpIxmWtRV+R3QUCgww8dT6t5r/9iWE6O2xKgkaRKkbSXdyQyH8Ho7FMEdJmacOppSMVUtCzI+TBPIEeML6Df7RhKKeZcpWSFjskGguLVYPLAqvb1yKAuVAsTUY/fuqn8F/Gt1j7lXpJJh3FUyMriasMiak53/KF8QxMuN1/+aKyCIstgxRN8niHfhJqxjjA== 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=pTX18/YswGjYPWCsGlnujFUdniknIpk1tv0Or4VlDd4=; b=tHzLvlPnZTuHGwupwLd/yVrxOg1U3TVTM4fwbELMLfiT1Roz9oO9PBGBa7HoHPIDzoqoIqwZHNe74wUasz6e0dJiTIj+IsoJ9evmvThOPYE3vQIsgYg7OtnsoQSnv22GWmBzkCOqXxBcMhSLFCARHhd9Fg9u7SbWd2xVNoUPpi4= 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:00:58 +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:00:58 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v5 09/21] binman: Disable compressed data header Date: Fri, 19 Aug 2022 16:00:23 +0200 Message-Id: <20220819140035.32760-10-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: fb85cf1c-c943-452d-8782-08da81eb3dde 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: OP7HJU/xQjA5C9PazuAPQajjI+UCO/tc9xNFB5H+NRgjt6yYjNArRDYd+3dJpxCu+UP3jvJTbAhy3CSSFYf6f3vNaPagK6vqQ/kHPnHWLNm+3/hGhxb2WV35xTqhpzYRGcvZHJHfpeblofVQNytwpozucOwBqkcytbSfa8SUxsgeSg/GTdNeZ2sh76igGYjL2ijWhHz8SdtXEeKhOlwJnzq5i3MqmBHDedNQ27314pvY8bif5HPNgBoR5ZN8djooiDMHLjhcglzCcvLLDMugHGT/jMw+71RpMDCTkTgTmS4Eppt7iIJcnJeeKngeDq9QvIWsr63OXIlTiOZNl/hktshUd/Zih++dHO+jvlcyF33DuA8aVewFxYATzIZ0eQZmu5eJPUDilSPz37Yw59YNQJGqk7QW8q1T7mlzOwjezKWCV/42YOjlniMCAE/jtl2wzRok9grQSEcHScXhmlvga9TyLS7nVzNGk7MiNpJIaEquGw7o1Va1+p7lRib4NtkuEsGaJsdesfoRF5z0TeopsSb0r2C4aFtqsYiuwDc8kJbIYDz8fwnbRFElCKclmPmJkazYUcTgVTtzUMkZsdmqHpzQOWvkY66N1FMa356Ix+9tTPRdsMLvQLRTPICg5XmW47PUyMjoXXaj/5IbXR78FuQXsVbCTZWZqUP8y1aInBJHK6oIyJ87tPyUTrdqpk9fTpLq0ZQM3cEhmFHISmtb00Vua7OXDbvAV7UrnqOyjxx257H4gM5C7Vf6UKZbdRzJDD0vUOoLDxLNd5QwQQeUUw== 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: s3BaEbFQlMFyU627M2lJIUOR48GlN2hyBxnb70sAgjFMt2a+VmgcnsLBR6CLnqX+WtiCZJgspZHDTT6yHs/ipxDQyMUlhBiLR/HD098SnCaX1wkA05D5vk876f0bFT5qnicmLLqh01DqhkPUPnV3Nx6b8SwmGtiCQ8GU+FS7dqOl0aReo/W13zNfWl36jCLObanYU8VzntGR1HhbsrWtZjvSRMWGAcFLXLt+RLXohSwt8vjGUSu8qMoQgShQLBqahpay6OU/8gTGWuv+1O0MRNTf/ivTSWtYZT2DTL3nURGYK2GIdToD7va9N22Qe9It5yfq880HJxMGrSws09ZZRvzZYGSK1C/jgi9fML+sPV/fYP1eoLXhpLlJrciklC0rWF0mXW8B26Fr87BdPuA35YAjOKfGqFVExnxRuB5Fs/++4pjmoCQurtjyeSHrwo8u11dynWQgbT6vjDprVTcPklgim1m7NJ3LMBuyasw3IYfjR4kJKOOSnl0AmgTTe5+vPtl8JInSV2z4LMsRvcq7sdWxFIpCUGXZ93vo47VTHRoVYXWhMPnXvC1fQse8w/AhJwJYHuM8R80tdIuZpMys/4VdML8VeU58xJ+qqc0fmoUPWo3y/PjhH/8sZeqniM8EgeYKy7WdJo06uLN0970h3Zv1XVQ1YnwtZzYRMaGT+LYgZ0F4tw4z9DwZ5sO3JezrWmjLAG4xvY68mNCgAm59pTXH8CuJ1UHNI+zkh0+lA9LCoh9cWl2MiFvg1j6QjMbgNlnz7G8f5VNbAkWhy/qNDSXdWdBWYS1JzDDRi1t6SRW8Km+TvBtCqXXjr8sqMBFMEbZp25P/CwsO98emmWfsrx7w47kldSXUXlWwCr+b4yhjhuiLaJ7xb0bB0bXC/dU2xxebRbSQ2Xf58OTc1eCcBEpDAOAsRpky/opCwcb8j8cZbEbBMhu/AGUpY7iBr8yMt/MGqFb0oeXRpuXeo/8TJ753T3a2g5xrhxIuS2Rswwd3skeXx1KhhGWPygfEyez4ACEFJl/pfIjkPNsprxJXuv25PUeZ3J3KBFDLVlqo57A9C9xndkvU4MQWiIm4lABLnnyVhBbFh53LxNagI367ODkgqaE1d4M3m5DoYBmINMA8XCmI+xFyqQe/0OsJ0GZBDYQic/4VRjjeoPVR9lSFTiPk4ZlsMlNEj/8N8C9y/cDi1vb1OSDjvJ/nG32h/EDp/mG2l/7gxRDbgIsOUDfhSzyfa58Istb4gSsXP5zQpyISe95ntwCcR950h/DymqCACZ7fMNLmwaf9u3ad/GuE6qCjmn3pyZsDVR4PmOGmMJw2AWocWoH43A/zBGcrsWP/lLVPDHzQacUgIEgHrbOsk8ZfzSu3ZtF4akgA1UhTLa0Z0A7wLMW8PkAKAwhB6c/S3BML2KlJP4w7l6cTaoQmknse2mRy9Jpif6PFrx87D3Ql1p3BEPxB/4FTZaYXneVK9im5BvZw/v0YCImypWdQ54AqYsq5oNaq+Z7zN4qqcmRwuKPAWfHKtCPzutq08M6/Kcx58fDAFJWs+PtltkZzwX1ai/WNhP8/5TgFETFWUR3e7sPGoPglSAltwD7YlzBna8vaBrfjbNk/CX4ssXkFfg== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: fb85cf1c-c943-452d-8782-08da81eb3dde 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:00:58.2575 (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: 4qigBmoUmuYOEqP9oToYtA+POY7+th2aa7YcYD2eyZe1SrEPJuYJE/4JnF1LBHxJ8Pm6wCfnAA3Xkw+i4QkYqA== 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 Disable the compressed data header of the utilities to compress and decompress data. The header is uncommon, not supported by U-Boot and incompatible with external compressed artifacts. The header was introduced as part of commit eb0f4a4cb402 ("binman: Support replacing data in a cbfs") to allow device tree entries to be larger than the compressed contents. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v5: - Disable header in testInvalidCompress function Changes in v3: - Add commit to disable compressed data header tools/binman/entry.py | 4 ++-- tools/binman/ftest.py | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/binman/entry.py b/tools/binman/entry.py index 6d58410e91..ecce721ac6 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -1083,7 +1083,7 @@ features to produce new behaviours. self.uncomp_data = indata if self.compress != 'none': self.uncomp_size = len(indata) - data = comp_util.compress(indata, self.compress) + data = comp_util.compress(indata, self.compress, with_header=False) return data def DecompressData(self, indata): @@ -1095,7 +1095,7 @@ features to produce new behaviours. Returns: Decompressed data """ - data = comp_util.decompress(indata, self.compress) + data = comp_util.decompress(indata, self.compress, with_header=False) if self.compress != 'none': self.uncomp_size = len(data) self.uncomp_data = data diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 6e63b7c27a..edee1f3984 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -1967,7 +1967,7 @@ class TestFunctional(unittest.TestCase): self._ResetDtbs() def _decompress(self, data): - return comp_util.decompress(data, 'lz4') + return comp_util.decompress(data, 'lz4', with_header=False) def testCompress(self): """Test compression of blobs""" @@ -4427,14 +4427,16 @@ class TestFunctional(unittest.TestCase): rest = base[len(U_BOOT_DATA):] # Check compressed data - expect1 = comp_util.compress(COMPRESS_DATA + U_BOOT_DATA, 'lz4') + expect1 = comp_util.compress(COMPRESS_DATA + U_BOOT_DATA, 'lz4', + with_header=False) data1 = rest[:len(expect1)] section1 = self._decompress(data1) self.assertEquals(expect1, data1) self.assertEquals(COMPRESS_DATA + U_BOOT_DATA, section1) rest1 = rest[len(expect1):] - expect2 = comp_util.compress(COMPRESS_DATA + COMPRESS_DATA, 'lz4') + expect2 = comp_util.compress(COMPRESS_DATA + COMPRESS_DATA, 'lz4', + with_header=False) data2 = rest1[:len(expect2)] section2 = self._decompress(data2) self.assertEquals(expect2, data2) @@ -5219,11 +5221,11 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testInvalidCompress(self): with self.assertRaises(ValueError) as e: - comp_util.compress(b'', 'invalid') + comp_util.compress(b'', 'invalid', with_header=False) self.assertIn("Unknown algorithm 'invalid'", str(e.exception)) with self.assertRaises(ValueError) as e: - comp_util.decompress(b'1234', 'invalid') + comp_util.decompress(b'1234', 'invalid', with_header=False) self.assertIn("Unknown algorithm 'invalid'", str(e.exception)) def testBintoolDocs(self): From patchwork Fri Aug 19 14:00:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668123 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=TYd1f2cR; 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 4M8NkV1WhNz1ygd for ; Sat, 20 Aug 2022 00:02:58 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8C65F84B8E; Fri, 19 Aug 2022 16:01:37 +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="TYd1f2cR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CFED884B7A; Fri, 19 Aug 2022 16:01:12 +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-am6eur05on2068.outbound.protection.outlook.com [40.107.22.68]) (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 3BEA884B5D for ; Fri, 19 Aug 2022 16:01:00 +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=FKDykljyjMBL7xH/KRBxoOAVYPJc013euzApp1FovwT2c2YkgYT67woSQPqDj+S1153oA+m+74FLiaIC8Rh2kZCgDYm8arbsTwU89Rdu78G0GFfuuevWgMXSoyl+2gTr4auwzeYVVr0nT/fKDRvGLxvEoDLOlSD2yEIFgEDZOMbkaejufYoUVfeMsOL/hBHqZXRRx6N+eoZrpU+Mkiwp01S6JLSjU8VBz2wovZTQcUehoz6P7SU5+bPry7xzyeTOOKHLdsYrHD0WUtiQnMD283ACYI2nKkErEjc/W7SNSqV+/KQuw4ZrAAskgv0tEC4/pe1Uxvck2K705ReFNAXYQg== 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=KaANWGlbaO+Ql5LWzDyZSQiP9NfvG/bVb5eRK9jnSFY=; b=JNE9FHDRYt0RQnFgDxRO2mxeWaWt3x6Du/UjliBbk5wCF6aQBYvXS2g4/JCYOZlh4pjl3tGPa5h04L254Xm8zZppuD4uqI9qdlXN2YmqE/5nr+KDAF+AmSA1pSM/SIisz8DOETnolaps0JtAf5T30FLcH2d/joiVjnyVEuqCPXjpRN7cM6Sr1APrNUdHQbl7yBvI6bmHGjwki9TWGjB4Sm/E2sS6ycug06f6naZqVq2rRgLU703t/ytTBza2syCEorxL6cHvyyAAAomhZY/Uf8q2r/trO1SfL30fiMaDJ57zuS+xJ6cSRxlvB5eig2fpG1UcP6nZPMhFpQTYr8yUXg== 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=KaANWGlbaO+Ql5LWzDyZSQiP9NfvG/bVb5eRK9jnSFY=; b=TYd1f2cR88QPA2Y2HxaBGnn1qTOqaLzI7Os9SmQYiKAqyjvcOjssq2MVWuHMMw2HpY5MZs/ztQ3TvHPs5W+E8gyS8DrZEOfHCRetmiGYG8JAx2hejSlxdW/pKu+Ur9iCHdjGjYz7IxjRIApz6FekFYtcX+d0ISDW3wrVKJFsc5g= 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:00:58 +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:00:58 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v5 10/21] binman: Remove obsolete compressed data header handling Date: Fri, 19 Aug 2022 16:00:24 +0200 Message-Id: <20220819140035.32760-11-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: de32fe51-1071-415c-6cec-08da81eb3e28 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: J+5v/Z5b3IYGJK8mV7qB+CsstnwS/g3ZSVgKu+XDrJDniQmauKSH/g67u+4oS4HsYGfVHTeibzXgB0cQWE9t4BG9EyAY2zn1Y0MNSQ2olA9Gk6HngHhF6ed6BXFdj7lUcjlhtm9heqNim2YiUWw8NNYJOUjnl1cs2Ox4rtc0pgSgIkCLAr/KPUBp293eQD38hRuqhhqoJpEAi4OISHSk4SbQh7juYrdZed2D5Yb423li6+R4DRupAFhyJyAvrspixTygwX7A160ydMgwtxdk9tvtSkbfsNMiEnfqPZOwxtmJFlQCO+ORzrCw+eIzr2ZzeiNWYJn56HUXWI7nmOmAZLa1HXEib/oqU8n6QNVSJv1Ujk1uDpmKcdqI+qmori2/Z8e/GbC6ZRXZBvCCp45jlmvun9y4OKgODt+PbnF6Cr0UElUW1B12EIpP02NLQiui2tovnpV/FGy9vVNMZC5yKzk7a+1MVZ1hbMHKqPbuIZLBkIdQQbjJsfA1h32547Q4t+fuNUT82M6vlduXMF4/0EefXD7zRIGqr7dnftYQ9ItbSCdjQGLKrAXaO6vIleVnGkX8Fyqa311YFz9VezE+Yf9i4QJ9yZZpcd4j0qlwxAbmu+3Xf4iBxf2Ra1wgavKDR+SBh2PBkC6nytIrvap5qTCkruri0UJLepkbZCHLMk54TWjL0pHPYiSdyF+XQ4nkDhro6kU02Spm0olcy9BgZQm7uXWmvMC2I31lRNS1ltLoZavXWmCVeyW/O6RWfFKfwHc58wsCzzwQyYQ6z0KMng== 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: Rv784MByNcCrwGit1tSdmSGfRVT1Qtm5PCAoQ5aLpgW//28LlgMhbyIwX7d79VVZTcP99Lx9odg1NVdpCI2Wa0OKzrA5MNkMCrx5zKj/sHNSCLJGwJwg2a8w3u78Lm4AKcq/4I9trBKLqlXpVSq2OeGUnpoFr1AfZLGgXp4pCZSm0v3JfqeSOZWR6i0Y7ahOaoN+I14FVI6d7RSABe8sdtWMcYOhFRxgvw6Q6km93RV9jL66da2uK+jKGtCNwSKa7uwRsL5Eyh83tqftYl1jUUrtDqPnqt/GAaXeXp3QM+UcObzM8ZW8gykCOM3RAQta9MqHU2gRyk5Oc0+7/TFDnximRkIVJbIMfo9KIyeEJfQ3kSQxvyjKoP/fOnq9USFIFYIxERwFWczOoZgTMb6pCqrDauEJeTNe9AUTlHuRMinH9JMuT8cyrqzeB6w8j5dOb8xiNb7oZ+MQ18Amnvgfo4CwEo5ktE+y3E6cxPjYP+EeDvL8RWYOaW+pp7xegwTTurxct4gKyQpxNxVmKCrFGnkm5jEq8OFpQy/qsHVhTmMu3px7+YW2akOzSt2CeOtHBVGiev3Sb3Em9Cm2p4BNxIeS3ENOZdUJ9BDQFAS5h8og0Pvzr6bhaHMaAfX1FYfIYlygX92+pFilL4spQYLfRUABEDwdWzqwsgPiYWNkjr55qcOHwddOjVlD/Ck7jrH+J33irJqodOX5iuDflQJpntO44lXRjjCgMqBUT9wxCQqxCmhlqcRiWdjCcGoxtb8cFpb0geRANBkp4QvTsByObSoQIVlahl4aRyVHSGwolZXk5PHVPdjGujT4T/0M2zh3O9dIU8mbBNG8BZv8ESDedebcJ1/Hj8MFiQxeByKfStthdKXkG0xpTb/7i3QfXXCSL859arqgCfSo+qoCZVgZCuGNkqTtLs4gn2TtdEmEUVHk3jG7KHmwo+Kd20CAHOlU9ZbQ8UCIP1kjPsM+12ScWy2cnqUzuJHGKwOHmsqYrbfn5YMw47r7pWFZVYk7+Ea9iz5y9StEQjVbeyeN6fZbjD3zgzN/KvhSfKxflC9aGfVpIiGdDlonJVy8AKcm8qZhTd71DP6Xd0dwY/91jUd7AdwYBCVFGsigQgXM2HI+1PlmtW3jIPnibZZ9Qwxj0MhkoQsaYmeuxYKhCTk7NZQnIz9f+jc21xHPro3Ggnzb/7HQ6u0uHlweRT0yMXrfXu4VGBBzammxfBxmVoMTUx5GjCnK+PBGtqlKZjYOFYJ7FoQPptBDV8jlMplced9WJBI26ckDtXSq19dIppfgapA/8hm5iEEBnszL7J09IQfO6XzZBimBLdxZqzFx54qHYkf/P4VpNGfMcGHxPb6QeFlt7ndfsJp6R4Ncl7ioScrZ+1f89vWCcmFb7C29Ngr/5VXhm6tUE9hrJAhIG5jYc75xMfFWTf37F5fsqFLQpAMIhfUtI1oq0Yeayv5Q4T9rCrOjwuiJrceaSLy5+9/rmb4h1+qF3EiHHp0L4vPA0LUhtOrsHO8tIG6xERVKR11eLe38x51+KDBM038BcdKwQpCRP8n6Y5bP1uoogUbrnSMtfAiitL0mNjE5ZwCMqxovZDEHsCWLZBRFrveNxv5w10weOg== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: de32fe51-1071-415c-6cec-08da81eb3e28 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:00:58.7574 (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: ni+EBk+hZW6VjRYfiUd67cga47Hg3GjjuW5/CzGTrT+OkbH8ATj8q4okYyKBtfm7GaqeU69SOpFAEDsRAZV+Sw== 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 Remove the obsolete compressed data header handling from the utilities to compress and decompress data. The header is uncommon, not supported by U-Boot and incompatible with external compressed artifacts. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v5: - Remove header value in testInvalidCompress Changes in v3: - Add commit to remove obsolete compressed data header handling tools/binman/cbfs_util.py | 8 ++++---- tools/binman/comp_util.py | 11 ++--------- tools/binman/entry.py | 6 +++--- tools/binman/ftest.py | 14 ++++++-------- 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/tools/binman/cbfs_util.py b/tools/binman/cbfs_util.py index 9cad03886f..a1836f4ad3 100644 --- a/tools/binman/cbfs_util.py +++ b/tools/binman/cbfs_util.py @@ -241,9 +241,9 @@ class CbfsFile(object): """Handle decompressing data if necessary""" indata = self.data if self.compress == COMPRESS_LZ4: - data = comp_util.decompress(indata, 'lz4', with_header=False) + data = comp_util.decompress(indata, 'lz4') elif self.compress == COMPRESS_LZMA: - data = comp_util.decompress(indata, 'lzma', with_header=False) + data = comp_util.decompress(indata, 'lzma') else: data = indata self.memlen = len(data) @@ -362,9 +362,9 @@ class CbfsFile(object): elif self.ftype == TYPE_RAW: orig_data = data if self.compress == COMPRESS_LZ4: - data = comp_util.compress(orig_data, 'lz4', with_header=False) + data = comp_util.compress(orig_data, 'lz4') elif self.compress == COMPRESS_LZMA: - data = comp_util.compress(orig_data, 'lzma', with_header=False) + data = comp_util.compress(orig_data, 'lzma') self.memlen = len(orig_data) self.data_len = len(data) attr = struct.pack(ATTR_COMPRESSION_FORMAT, diff --git a/tools/binman/comp_util.py b/tools/binman/comp_util.py index dc76adab35..269bbf7975 100644 --- a/tools/binman/comp_util.py +++ b/tools/binman/comp_util.py @@ -3,7 +3,6 @@ # """Utilities to compress and decompress data""" -import struct import tempfile from binman import bintool @@ -16,7 +15,7 @@ LZMA_ALONE = bintool.Bintool.create('lzma_alone') HAVE_LZMA_ALONE = LZMA_ALONE.is_present() -def compress(indata, algo, with_header=True): +def compress(indata, algo): """Compress some data using a given algorithm Note that for lzma this uses an old version of the algorithm, not that @@ -41,12 +40,9 @@ def compress(indata, algo, with_header=True): data = LZMA_ALONE.compress(indata) else: raise ValueError("Unknown algorithm '%s'" % algo) - if with_header: - hdr = struct.pack(' X-Patchwork-Id: 1668128 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=tWaNIMIO; 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 4M8Nkk3FbDz1ygd for ; Sat, 20 Aug 2022 00:03:10 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6D26F84B98; Fri, 19 Aug 2022 16:01:40 +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="tWaNIMIO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D5D5F84B55; Fri, 19 Aug 2022 16:01:13 +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-am6eur05on2068.outbound.protection.outlook.com [40.107.22.68]) (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 66DB984B56 for ; Fri, 19 Aug 2022 16:01:00 +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=nCpH0T3DMyVYyL9oQwwKamttqgiXruzIK0BXS6+jtN9yICxW6SKpoqZZTyhxRxqGs+bTamNIqfYSAf+/POahI64C2Ll72I3ACC9iC6G2Aojb0PT41MLIdSoL/TS+jfFLZGVDXT94VNY/n4RAIEAeifFDqdmoaUvAxlZQVFW1g4MpRlBbMOG863AX4ZPzEPMLVWVcijNhXAfjPNx2V4ez6pWa3fimDUz2/mfBIlBV/9iuz0QjOIcTIrrGe/qVDCuxdRtJ30Y0fXC44IvTTiPTHrc3rC68d3u/G5/gInpF2JsmBJnqAUQ2Voiwm/kxNzEcV3jXQAhi7Hbxv6GefvdimQ== 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=ysIUWARNRYmUcq8NgM6ot6WgUS9dHteNXQXXP561KSQ=; b=AOShPSj+pA+Iy61nlJbWuazdhOF73Y5fhO0cH3Gu+4dscNB8OqXzWZnVOgqi3SKN5v+MkWh1LI16Cqqblj4cG7EbiaT/pQf6gL/+hPdOZmQRI5e2o09HFZSgB+/jCbHtTnCXy2cztTK7rwY/Ybgunt9HuQiTqI5UVAOCDBtKA7jbTAcr322KiywywdudR0a82CfZHuLRQwhwOM79KohoxUEP8XAln3M15Qbrj/O2ReZU+FgHC0wdenazcbLqVdqTmPDdZKS+26m6oSr/NIJ4U3IVHJdZdcGXlpEpndknz/g1MnxJSN49VMK9xoid41Ci9GQ9+ul8IhIF+0CuE+UacQ== 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=ysIUWARNRYmUcq8NgM6ot6WgUS9dHteNXQXXP561KSQ=; b=tWaNIMIOFgQ/99AJKCtUHsfPbvtY7p/GnrLVs7wij7wR4OrSwhaI/i8qNFL6W5dtI8PUQ29sbpPiZfbChmOnlFOxvoI+PBLDNGgC6VVVZXsUfQAaOpiPW0ROr9XW4PLUpDGgmnLKKKg+b68lFjWWkl9ft6NUgcBtLefUpl9Nlac= 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:00:59 +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:00:59 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v5 11/21] binman: Move compression bintools creation into test setup Date: Fri, 19 Aug 2022 16:00:25 +0200 Message-Id: <20220819140035.32760-12-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: 8da073a0-8000-41c5-8104-08da81eb3e72 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: n6P1PENveIIPw7/zmxvWon/gqPUC93/2+YPaeUU3yyAOiv856HWbriTCzhRwojnQrVInu/eEThjcFs+fb/d6rYt3vVsMBU6PDQKkv0FC4N3XPfsE2i2Vv5mJLVzboC+4VCSofrYHdzMd5ob8QPNY5hCatGsH0eY0Pezccx60K4TTcEj2nsotFxJenvf7e8QvPYpkBjSvZ0qj8R/IMmDiU5LPakgAHOdnQ9EXERAc5iIDw4ekVvmo5nVU2Soh8Jqf2pA2vLa6MZ6B6yDHPS2rsjRvJ1M+aPyWyGs37SVt8m4HhItN05nzMaJ1ZbEsi1LeAY29Z1EyGRhvXftXYATxrLL7JkpPaPtpVLm9pSLfGIuXIbHgH2RmzEHEM7/NqHvbLrOYhMC/g2sNkrBCiYOQsoCvtilTPya9i8BIbImaI4S4IVoq/3EYOh4PG2tUPA5oZV9lQdFW5guhdhHKD1aB/c5kAgaPYecUPcVERDHLxORIIHKNxuuXcPe927+Gwud4jEsI9sP4zgSFOuFgpQi44T1qRhxZdNTv6q9wx5HvPJ/m73WuPvN0GEGj1+KTQf7iZ1gWotK/ItqdnWcDDCPoQUc8OfKoidDX0QCUJx8MJiok4RfWcIbxqwDj6Ql+cffMFDEF5oLWtShbP5mJefWfO/T/bOrTONMzgzTTtyBG02I5N9s7CAx1ZTqiNzG2l1VwlIUNkjrdxqt292MFYEhdaVoV9M4eoaR919V207trGkliLBAIcmMcF+3gnz2/ZH8sI+ZMpiwhxT6wDfggiGPP8g== 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: CagHewAyJKTGNxABmjDHdBhgnq027+l4WpOYzWJv5j9oXc9royvA+exLN+GhjmXxCDnB1b0lEZh6EuXDF8u8vbxFXA5ECyAsWRL0IsZCP2Dk48wQkBqW1/Et0P/CGBO4GIoOhbi0OZHHd4PW5yqhuO8FD5ojnxXQvQRxznqceKJCInBiO7/Zw3xJEwpMJmIXbtdfhq+hGXRjF/QgX10vC8iR7lntdd+GgQsyXmIZao2asfO8Aiyh17C30uX/LjGQEzlIzEvPVZr6u4cYkimHDeXwPp5YCM2kzcE6kKxrlHIM9bY1ZIkP9XDrwe+WirU8S4QG8xOkSZ4BihLYkX26ZoSxKFoQnsK/5DnYkL16TBi2NMKkq/8WuxuNtS97TTx51j6MKpntfppJLkMQaAwzQB+3aWv6dFp6Tg3MCSqTe4BO2J87UhL+fjXRwLb9KPeRN7OeC7tjJDXGOlynVCAW8dQwVQYGK6gdsOtaK7Z0VxIZmZoIdWc3V2fCRQVaFyozyf/bEonJpsHamSAJHKeN+jR1MRRcMJyxtqCOf0zejL8T455K+X163Fq5E4bX5or2wHCWnqP9kDwAxgalBmkKILzOBxACkUlFtICycVXJZ0jxXOr3I9YWfqspes501mOhdzUnjJDaM6bW0v+ORti0NLJrAghRlpJT97fn3PbAga6rFyiOoIvI1GUdQ9dnUtbH9KOzruWczsONKJZ7E8Kav3Fzswu8NZaK6HQPo9bJrJrKE9OHVS86icDXWDAUFn+z3gAwqC2zSdi1oINgZhrVCEPmxjz9Dich4rhS+bvv09Cd/i0GWDvV22UPCe3RatmdvF9kM3dp0KfFrgTC3x++7qUTHVb8h98A2WbgJeGpULsJ+RhbFKi2U3QSrCpSYWTrcHf0dvWm/FHSwj26jUICgRVzeNrFWaDwtrf2+zWQOvadAVc3eOZgbDS+Z0JdTVa9MeszpKFWa3mt+bLdhne6Y/XmK8pkL0QVUQWNNKWHuD8nWrinAQ+G3Jqv8YuxumMAYMjQ8ZSZ/Id1ksfcOEibuoWZcBhhMG9PQaodeyHe9KJBkUid5j7N/UxXuwYuMTtCsFDl2BBIwWhha8cgXlaJBhHqXLCGtY5WDvLF7tp5LzBeZkiOBjomyYJqmBio5PbFUAj2aFsykp5qZdlruPcHCp27D02UKWHb5gYY4cL2gTufkCDcSl7OGsbRp3xBo0fjGw+ur6oO1kZdLpDdA6oL9rue9CKbS67LGUuqUd0XAgozcHQNIPS2+ZxH6SEDnIws5Kb9uPe0HvAzgLB3911jrmrAJEYOlPr4rqHO+D48VwzQBBiqw8uIbG4Qs9XYBKMfgaRE1ys0N7l+1jZFOijZQfWZKpWcewUAjczrfHit8aofWQJmMA2n2LrcMpSLD+Ibb+arEjDyIDfFXBNXYHg7RT5iJFNz7b6Ms3PHJmLLUHCfatiPFQ8RYI85gKmhPjSxDrkvpNl6Gc7h+ITWgSSWInYnIuWhY+0RupzAAIEaN9cWLnwHZNtwVpvkBLFpcGsC6Njqx9wFRmkkHPESUCloN3d2HGbf4/mtuaSpr3yBnf6bhp1G/KtkZOXkWj4Niml6HxgZ8JTo3KwShR94zqUnSA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8da073a0-8000-41c5-8104-08da81eb3e72 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:00:59.2586 (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: IK6VvwCJgqaMXk8ouR6gFmJ8vqCYzLhZJ500Nqpo6Mx7SdwTOrTYuqYe62azszP1LVifHlOWu3x+Sb9lDn9MXA== 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 Move compression bintools (packer) creation into test setup to reuse bintool objects between tests. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v5: - Add commit to move compression bintools creation into test setup tools/binman/ftest.py | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 1538ca3c4e..7ab9289a88 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -23,7 +23,6 @@ import urllib.error from binman import bintool from binman import cbfs_util from binman import cmdline -from binman import comp_util from binman import control from binman import elf from binman import elf_test @@ -107,6 +106,8 @@ BASE_DTB_PROPS = ['offset', 'size', 'image-pos'] # Extra properties expected to be in the device tree when allow-repack is used REPACK_DTB_PROPS = ['orig-offset', 'orig-size'] +# Supported compression bintools +COMP_BINTOOLS = ['lz4', 'lzma_alone'] class TestFunctional(unittest.TestCase): """Functional tests for binman @@ -212,7 +213,9 @@ class TestFunctional(unittest.TestCase): TestFunctional._MakeInputFile('tee.elf', tools.read_file(cls.ElfTestFile('elf_sections'))) - cls.have_lz4 = comp_util.HAVE_LZ4 + cls.comp_bintools = {} + for name in COMP_BINTOOLS: + cls.comp_bintools[name] = bintool.Bintool.create(name) @classmethod def tearDownClass(cls): @@ -242,9 +245,13 @@ class TestFunctional(unittest.TestCase): cls.toolpath = toolpath cls.verbosity = verbosity + def _CheckBintool(self, bintool): + if not bintool.is_present(): + self.skipTest('%s not available' % bintool.name) + def _CheckLz4(self): - if not self.have_lz4: - self.skipTest('lz4 --no-frame-crc not available') + bintool = self.comp_bintools['lz4'] + self._CheckBintool(bintool) def _CleanupOutputDir(self): """Remove the temporary output directory""" @@ -1967,7 +1974,8 @@ class TestFunctional(unittest.TestCase): self._ResetDtbs() def _decompress(self, data): - return comp_util.decompress(data, 'lz4') + bintool = self.comp_bintools['lz4'] + return bintool.decompress(data) def testCompress(self): """Test compression of blobs""" @@ -2855,8 +2863,10 @@ class TestFunctional(unittest.TestCase): def testExtractCbfsRaw(self): """Test extracting CBFS compressed data without decompressing it""" + bintool = self.comp_bintools['lzma_alone'] + self._CheckBintool(bintool) data = self._RunExtractCmd('section/cbfs/u-boot-dtb', decomp=False) - dtb = comp_util.decompress(data, 'lzma') + dtb = bintool.decompress(data) self.assertEqual(EXTRACT_DTB_SIZE, len(dtb)) def testExtractBadEntry(self): @@ -4427,14 +4437,15 @@ class TestFunctional(unittest.TestCase): rest = base[len(U_BOOT_DATA):] # Check compressed data - expect1 = comp_util.compress(COMPRESS_DATA + U_BOOT_DATA, 'lz4') + bintool = self.comp_bintools['lz4'] + expect1 = bintool.compress(COMPRESS_DATA + U_BOOT_DATA) data1 = rest[:len(expect1)] section1 = self._decompress(data1) self.assertEquals(expect1, data1) self.assertEquals(COMPRESS_DATA + U_BOOT_DATA, section1) rest1 = rest[len(expect1):] - expect2 = comp_util.compress(COMPRESS_DATA + COMPRESS_DATA, 'lz4') + expect2 = bintool.compress(COMPRESS_DATA + COMPRESS_DATA) data2 = rest1[:len(expect2)] section2 = self._decompress(data2) self.assertEquals(expect2, data2) From patchwork Fri Aug 19 14:00:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668130 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=aPf93kUc; 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 4M8Nky4599z1ygd for ; Sat, 20 Aug 2022 00:03:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 27DBB84B9F; Fri, 19 Aug 2022 16:01:43 +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="aPf93kUc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 607E284B67; Fri, 19 Aug 2022 16:01:14 +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-am6eur05on2068.outbound.protection.outlook.com [40.107.22.68]) (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 9189F84B5C for ; Fri, 19 Aug 2022 16:01:00 +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=I7sp0k7Opi2IystmgSGxKdBC4yQWYCxBCFzEqbFllRtjOBhk8J8g/vh30IWFbhSgNXPFaDQN5m0r3Zt9HQ6djmjNG9RzYmWCGF8D6uQ8wuxOdqsT50QzPg/pyMB/uFRFCdXx3GZXDXpNOkyj4b0GW9isjbzYfNP2FiRGNtBc+2qDB5zUJV5lmG8Iixk4bsfZ2WMBSLLRWzETzec2wQtKf64Jm4bwHcOjr2kXLjvzjhYE9TH6t3OHUYPFW8AKe8KZhNzn5FEFt733XE10dzARxxljOrHxMKDQZO5n1BtBQVmDoWG4aFXaD4eIbzzjodGnCe6iNu9fYqBZZoX5GDsrGA== 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=jXd+FOhQLU1L8Wmi99snDbnb8jOnqncx1XkwUmw/XM8=; b=AE+YU81/P+kFoSd0PT82MSuyn5bQpG+Bof4lIGUS9HHvpJP7QGHHBx3i4BVBS6qMmYUsclE9+CfgOchjqyHC13X1BZtJmO/xvA2B621jy3p3Tu8XuHgXE2d8WqwlXFP47Rbcr8amEwg89hsmqCHFv85ETf8hLEjzSTOeOqnB0aAbDWd9LLbN3J0lEcsllo/RnREtkXA1hlj70ATeuNz3mTFAaRYbx+LEeiBXRNk+6qcA8qOiA3w7ZycHITrXv13tB5vRq0PdVyzhULR/ZfPWDWUtiTnwdtrxbx1l+/OMhUFTwYGAokAbz0dtTx1q/87AX7sxo26+8XEk505wStCAAQ== 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=jXd+FOhQLU1L8Wmi99snDbnb8jOnqncx1XkwUmw/XM8=; b=aPf93kUcBNQQzuN6A3OkqIkPAjKP3cTkiEy6/d2+3tIWEAIpclEQ9H8wje7lq/w2pq+NPIp0AUtNRrlS77KQW9/mtrQCgk1LR5BOBWZ23KHnyK7+qj8XvtXCSfH4r2CO7AkyRUiPRQDLlINNHcvQAI6W7UeIz5BxdCnhL8DhHRI= 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:00:59 +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:00:59 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v5 12/21] binman: Select compression bintools in cbfs_util class Date: Fri, 19 Aug 2022 16:00:26 +0200 Message-Id: <20220819140035.32760-13-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: 377243c1-0997-4610-2d2c-08da81eb3ec1 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: IgEGkDHqf6jbV2En4A164haMzc888orO8VYfk6ZkUOUWOkWm2XmY6yg4K7yNPflQlz3KmuU/d0SN8zOx72h/Ub+WEVgl65Y3zyS28+fOCeKscdPwO88IZXiY5bXo0ZcykPROYwGRoUMdLWujI8/puo1i+nUn6GJosjK1YX6TgFHc8UJbFdp88w66f0OToXyQq2SSgudw0wHaourI26dmi3mw/vno0yw2iNaCp+6bhrD0y04mWFnLGeuEiAVsCXezCpAH5uiSaTkvRKJ0OTm3qk6Fc5+dsnrWCNjt08hYr7RBQzSU87M6yR9QynLB12AuPodo6PYnXRIUYWJVxeJBnGfuPOTwe9VnlMYa04ni8s95SRkomiUbIQ/1lwYlk6psFpP5/Jt1M8grhaAhRYKNErFJDvbPD/zMkxJqBsG6nRBlcJyATUDFWe87L4iyOBfOz3xYsW9OCNZuZXVKQEhA8X0hpTkxDx/xeqJFqnzGUvKKjTn8BOaIckMZ5qeGYCc9OsHAL+QydOLEVPkXNlAyF+NZ/9YU3GSJLbFHhOanV8WsJMJehtTOccf14zcBThr6w/jpxhJFhPwRJ7MMqG6NN+yz8jxG2bcfB61CtxWC6ywDWufAH33VUGDjWvL06OgJgDZ/aJC709kz4qBIXqkmzHHIehu53F0PezqUQLygB8rr5nDWyKVe2Pfjb+rX+iU29TL8SUR4Dfyv5SheAYKjRXYtr+CN6/3oDc3NwlCkq/3M6hwzerSj6gcfYUTacBTyv7i7xOD0SzP0Psz2HYYJEA== 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: Z9CsX5eRT4h3kpPLzHzfJECfLdWO3gNC+7Ki8lpTJ+FPmEca7YsTTUwc53D3KpiDhVygfHpmKY/5LFba/9YqQCBA9TgAAanLT9uxVbyBA7U2kRfB63rOTR8mDgWCtS/9kD7yEfvr/MK44WblFstklXc+QY1U8SQNERJoWT6ot1li7XTx17qp46akDTJ4UxpLMkVaECw67gk3iGwsJ8cvzmQlQZhPh+xnbk8z1HTXvSj2dO/SAFuSCTkFdgsK/osOU1KAkVZ3wGNMQ6lbn2dej0QP5qAk2aJdbGZWxQe+4cV0K5TJ9IPgZQU20IW28ccCBwERTqS76Q4zRoFZnBurunxd16or5U33UxfiA78vZHq+OtsWB7Wcce7nKA6Np4D5vChR3pKMf4oH/fnwSjxP1QmTLkKCcM2oWEBpPiqdcf9bdmSkxQLyXf5yJqYkYBT+/JeWzjoatfW2yBUslrTrRmhLTWSYIp6r1vRGmJKWdrwiitTNPKUtAe2qZVD+HjpxC4ZVC4ryAKmsf/8xC+oR1mVj2r3jSZG2YHAuIORNLhb8F9REq+HP26/voQmDM+BsdKFPyf2KyDvWEzeHN1Sdl3t0utncdkmLhcFKznjibH19NYP9kCrdGAkEVu7niaA/Myjhvk7H1MhMJJwrYM7jKqQve+TdPDhgAjALt5xvY1uqZVDO3uQvbPjhDrNRP/sGzJQTfpbE5xG5ofJDy3F9a60OaGyFJBXuEhurfpNMMdYEHtdjEvUqml/7vdevWh37XClRFSSab4fjKtFu1RxJsPzVfSdH2bXCnr6bIlC+B2l3XD/vq18/ynYElgGFCQTDe00QyaNs0fIlLlftgW4RzYoy8HRMwzTD5lkUhDVjxsFUT6bcbZdc6w5jEswrOV+6f4kC0BoqXieFRBOITTDYHtR0t8mCGTDybFBaVJE8LJ72i+ch1d7rLkpvIRGAIAGHa3rbAAZ4hCJ3muN2xGbetHEpAsrr6mv8gvGKjqumXY1sGn5+P1vpC1K+Tblm1nnPL82sIBSfCT5p3K4F1D/hxq56YdMVsBb49tpesI+PZvn3qGYm2xDB6mvZBxeDcVbOdk+hRn4D3yIs345BXrYApCnw7vqHqLdlCrbOx5/rHBHoxXWbiYYvYutBjQx3HLfbpwhmmw6v875hZn8G5En673zTS8NQsrccoqJJsNCCNzaG+7a5khaxsFB0Ir+C5EzhEEEsvTIfxA7JA5oymRYiKVf/z/kLnsoRiPNx9WojCgYBdcBUnih97snLY0n/wxUTKpOGh4JDShlZzMOkiJBZQ94LVaPPfia0fd+5oPXzdYtApVIiBavJNlJNplkv7XMepPX40M9sFKDVB6xPc7i2+jYRh8Yv5ARsJLWaMMstRFjV8K+oE20eK8+qAD1aDlWspeZJ69dqztGFEZChWAxLCmFiKbXaPo3L/IhxKR3TU01dLRutzjp59QfPub7rV/fhi/DGDQvzmvv6zVEnLPV2iu4YyXrWBKht3aB3v/E4mP/13DwXDJr9qwSfiV6UqJtRH4QXt67hVEhEsBrDehTJpMNsmRdNsCMeLafyY7oMVL1LgNlVBGO6mRhXxKziGw8JvICtJDlLjxZEzlWC8S0edA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 377243c1-0997-4610-2d2c-08da81eb3ec1 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:00:59.7585 (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: StR9ywnncABK/BoxKxI226/cMjkCRhMgmOWGznFMgrvJPgjhmhu8rOriUdrkmB56T1XlPr/Y+WIZwSV3KXvmzw== 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 Select the lz4 and lzma_alone bintools in cbfs_util class to centralize the supported compression algorithm evaluation inside the class and over multiple classes. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v5: - Add commit to select compression bintools in cbfs_util class tools/binman/cbfs_util.py | 20 +++++++++++--------- tools/binman/cbfs_util_test.py | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/tools/binman/cbfs_util.py b/tools/binman/cbfs_util.py index a1836f4ad3..7bd3d89798 100644 --- a/tools/binman/cbfs_util.py +++ b/tools/binman/cbfs_util.py @@ -20,7 +20,7 @@ import io import struct import sys -from binman import comp_util +from binman import bintool from binman import elf from patman import command from patman import tools @@ -236,14 +236,18 @@ class CbfsFile(object): self.data_len = len(data) self.erase_byte = None self.size = None + if self.compress == COMPRESS_LZ4: + self.comp_bintool = bintool.Bintool.create('lz4') + elif self.compress == COMPRESS_LZMA: + self.comp_bintool = bintool.Bintool.create('lzma_alone') + else: + self.comp_bintool = None def decompress(self): """Handle decompressing data if necessary""" indata = self.data - if self.compress == COMPRESS_LZ4: - data = comp_util.decompress(indata, 'lz4') - elif self.compress == COMPRESS_LZMA: - data = comp_util.decompress(indata, 'lzma') + if self.comp_bintool: + data = self.comp_bintool.decompress(indata) else: data = indata self.memlen = len(data) @@ -361,10 +365,8 @@ class CbfsFile(object): data = elf_data.data elif self.ftype == TYPE_RAW: orig_data = data - if self.compress == COMPRESS_LZ4: - data = comp_util.compress(orig_data, 'lz4') - elif self.compress == COMPRESS_LZMA: - data = comp_util.compress(orig_data, 'lzma') + if self.comp_bintool: + data = self.comp_bintool.compress(orig_data) self.memlen = len(orig_data) self.data_len = len(data) attr = struct.pack(ATTR_COMPRESSION_FORMAT, diff --git a/tools/binman/cbfs_util_test.py b/tools/binman/cbfs_util_test.py index f86b295149..e0f792fd34 100755 --- a/tools/binman/cbfs_util_test.py +++ b/tools/binman/cbfs_util_test.py @@ -19,7 +19,6 @@ import unittest from binman import bintool from binman import cbfs_util from binman.cbfs_util import CbfsWriter -from binman import comp_util from binman import elf from patman import test_util from patman import tools @@ -50,7 +49,8 @@ class TestCbfs(unittest.TestCase): cls.cbfstool = bintool.Bintool.create('cbfstool') cls.have_cbfstool = cls.cbfstool.is_present() - cls.have_lz4 = comp_util.HAVE_LZ4 + lz4 = bintool.Bintool.create('lz4') + cls.have_lz4 = lz4.is_present() @classmethod def tearDownClass(cls): From patchwork Fri Aug 19 14:00:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668133 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=UQF/yX/r; 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 4M8Nlb3sHKz1ygd for ; Sat, 20 Aug 2022 00:03:55 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AAF1284BAE; Fri, 19 Aug 2022 16:01:52 +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="UQF/yX/r"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 540F084B7A; 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-am6eur05on2046.outbound.protection.outlook.com [40.107.22.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 697EA84B5F for ; Fri, 19 Aug 2022 16:01:01 +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=BGISSV9FzIM4jB6U/sv5KRsG9mcfXYgN+mnjhlEDBF713NezHeYWe05fhmKnX9bt9xy3NnI7ZLBwQh43OkCP9RMqDW5kBzj2t30vWGDkpFYNW3Vs8Kv4FOk4V3JpiUxi4BUnOPIfAPzcbWPyBDPC/9pQ2uQ8ahCeNLUzKzolKj3PfXMT2ysXSr6RS8uHApX8TP/eMIaWJ09YJFXZPqZhr8EYMoCD+okk868IjStYOm3x+SekXj6jrljvsC4ypZZai1CAPNV3iV/PlmYt8Xd5IDPDVMyAN7F131COR0YpwCHYL+W810FqIz7Jp1X8Py2dLd3lkjKdpLsFwU0S1gqtUQ== 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=mIcs8eJ+7yMNgG82tjwRZj7ZvUBlnj0kWCSqfo/FYc0=; b=h2B7Z/vvAO3F/wJOKPGPDiC0LaXtmWTWBqyw/4qj8htDU/hOiUpkB9ILlktJ7RrKzy7C2NHyZpKTg57JPUJ90Ztc19q2UKyOxY7mMzyPIFvU36yFwc3LcNvqb84ngsO+U0o5VxiEqj51HGnteVcLtDcjWvf0+T5fTQ7fOYMMCwfsZF6v/pC08GWih6rBMWXdCNE/GFblo0upwjtIwEi7RMFbrkWwjpSdKWOYAGosDvV0tFigYVViKPhKle2jcKsONsm2fraAOBHcljhczibh2G+tMsfxj9mW4v3WOhJPppIk3RVlmOBUhjR7e493z+pBaCUGjfhMaCK+skoEc5xY6g== 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=mIcs8eJ+7yMNgG82tjwRZj7ZvUBlnj0kWCSqfo/FYc0=; b=UQF/yX/rW1ooqXqM71ldXPN+2BsfGQjIrBUzCTHa155YMwAlVvkOWJ/T04OTlg3sjcyx+ZVyaCjwj+v7bE1cwg4QB97z9djIUPRIvntk5L83hZZO1XoB3aos4rddqBTWxHgV1uX4tlnnzSSXh/qjdA9DsXPtdmUuXHyg5xRQMbQ= 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:00 +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:00 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v5 13/21] binman: Move compression bintool management into entry class Date: Fri, 19 Aug 2022 16:00:27 +0200 Message-Id: <20220819140035.32760-14-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: b0effb84-218b-46f8-7473-08da81eb3f0d 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: eQOcM9DPn0VODBC7XAMy7kgabWF8FXBbXpwobHhN5/mBJEZyAPbY7BoWzMs4pZjv4PmV5NdLD48iOQq3ih1fPGbJYLXv5NWddLBxFbOfHfOfecEorfq1QL8Z0Ced2HBqIGCwxghKHG+74GXAklcsd3tSLM3Te1IQUJMOfyeg1upMwQHAbfmuFjB6q+bEKrULj5eok+mR15K6nqFWhv0VyUN61oBMjdcSwDqGIW70HKzhxaoHn9/ZtBq2qy9DU43t8UPLRfozFIav4vgVG+CENwih1IA5sacfOG+YiCimzRaVS1xSpNWQ/vnHnewxLQlbecLsUfXVedgCZ4bvTPz2sdHY+Lf6csnXqh1pw357BNKbwbKktCzJ+01omTNv/FcnONbbcPtOY6YVxyxXz4VPxpauKbRxEM69a90ZVT+ceoea6Vwqx6FSYEPpBpb0qnnFV18EoBmquBZFQZGDhc5Gen8orPuGjjfI7NpZY1kcRzTq7qH2k2lhK2s00EJhiw9qaYZzfmIrnUPIVpTQSP8gQn3JtKKoPYzO/AGQxCez1xehjGJBpJAd9QSHVWU8rLu2v1OaCoy+NWVWxsImY3USeD2t868+e8R85is/IfRJ2BrRijPdyvMu8lBSx6zcNq5/l0c9Ox0X7U15F0Q17Ub3zBzd5l8AmTYe+1MN1pJp8R7lpFYfgerHlYeF2wtdDL9o4aMyVmlMf0V+T4dYPKIi9CoE+SkYEfJayvg0X+M855K3rBsCtGHOlm/knBrtX6oF/efNIiA5uBFtr9YVevyL3g== 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: aXTxakZ3iIXS4ZsCqaDYmDVkWnOPtmMZg9W7YN1etMtgs+nvjLB5zzLqZe0viI5mhQGA0wsJLA5FOHTr7/WyquyB0MIKAetXRkfT7piNiEEks0TTqRanCLqygZi8h3q9feCL027T65IVMtpGhuBs6dPg7c+vrGRtJki46g2eQ4Vj6Teixdr0YgIGu+4MEGGUCcRjZqjeZXwupWlWbOXrxfgnz4VRlnzvup4NRNFeSc2xS9NoP5b0o9fjImySuxPuIBuTUrQYKsB7YRVA+nJ57T334E77hVesPyI8TpinIo7+/1z1Y8YZ1QhMijV65WDHfhwXu0naSd1j9QcuXxJYq/gOvYj1KKbHDnUHGdMm7Bo0AOsoJjGDZbo5s/3ER2zy7yORXgwriO35CTfJWPmpo68/CpbjjrZFYcX0LL1B3/0Z5Icch5VlntuRcek5AWe/YHwXoWb3au6tAmVjQqqZellUJQtYKUCLYuGx8y+QOWtEsj2qPfwr+XPGabNUYqKNCd2wWOiM4SdhB98XW3ht0KYhwjq6nU5AsKZ9y1XgjJJDbKf4X9yQnHjrX2snRD4YLaXdcYf4otqNP+Y7G4NcT6tsBWdQcyOfDFBpW5OYN5vItGIUpJIppirwijFqk7AUj1jOq6C8/jd3sySnQ47/muK53afaGpY6sk1W0EZeUBQqD0REMmTXXrcxCsRUJmTF9/y99AVr4dsDl9eXOs9k3VhVCXeSKa+RtckkXFJWsDFYsxo7KRLtpf06nCqwRPKfCnWoy8FrVGA5pcpMmfcHqGJDl+bT1ZetQRp/3Z0U0ZQ3mKjV9wFLpqNajn+T/O9CtoEtniunBx4oRdfBswlyIiOsQimLdvHihBj3yN9bNyyKGav/Li7LQwShp84+sk2fUrvLVKA53Tx5XCA481hw9CaXKQt9kaFR01hq+Too7ZqrHSpYXI6Z1CiKeICzSY2iP7P0x8S2X6B2KUGvGEUDfn8UWu5mdHY4Bvxl5CtLw/slQQYekI8C9EfLUC48HpH+Ao7Re6CdW6SOZOtargWs0Tr/RYNCiBHispkE5+z0zhHoEr4OdSzhG7A3TvpAEigRS8W6NxShRsTBu93BHIQAGOL9KyDp+bhvWDxSgxKoiEaBVTGFyAAy+cAFt6aQeNr/+XtasYJpvrLnPIGdeNsDvcw7/SGiTXGGiVENWFqlJpRDQunZVq1in2fAdqr1LwDNiPaXSyIFuVc/c2Uyk0RY3o3oO0L2Ab8Sp9JRWQzGvEuQLmyN2OU2gKD9l6dnCKzDk81aj5x2A9g0A27GCI9IooYyP9kxu+wbdOUMFX7tIu2OK5Hke8J/ZhRtAceEdGpTQ5s9tiZIN2w1jldMLIv0ab6LVWPgod4Cun4kADcCtr7TpUlsAfuNmP5khWjErb9UIrj2MzNd4Qf2vkph6tRFmaGPOR9wgAvh0kd4fyQItFJgKwyfV0/5KhlA+Z2uLRvKb+dcn/HCoVl5Fc+xfPBtjo5p7vLznGNc21iPEVM9aTXTJkxBltftx0itC77oWNmYXD8iGzhYHpxdJEv6A25yHu0jIdfGLV1vqns3oNsxouDk8puvTxq2JcN3Vebwf1SSnr5Aex+APOOSEBR39MksyQ== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: b0effb84-218b-46f8-7473-08da81eb3f0d 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:00.2584 (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: 9gpi/SJZB5SFkySTqDwPJfSSDAtUw4PPmilKMiPYRc0/HZV6xfefpgC9QRB/dmnlL/Mt5p8zlIxCjJ32a+n/kg== 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 Move management of the bintool to compress and decompress data into the entry class and add the bintool to the list of required bintools. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v5: - Add commit to move compression bintool management into entry class tools/binman/comp_util.py | 69 ------------------- tools/binman/entry.py | 23 +++++-- tools/binman/ftest.py | 15 ++-- .../binman/test/237_compress_dtb_invalid.dts | 16 +++++ 4 files changed, 41 insertions(+), 82 deletions(-) delete mode 100644 tools/binman/comp_util.py create mode 100644 tools/binman/test/237_compress_dtb_invalid.dts diff --git a/tools/binman/comp_util.py b/tools/binman/comp_util.py deleted file mode 100644 index 269bbf7975..0000000000 --- a/tools/binman/comp_util.py +++ /dev/null @@ -1,69 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# Copyright 2022 Google LLC -# -"""Utilities to compress and decompress data""" - -import tempfile - -from binman import bintool -from patman import tools - -LZ4 = bintool.Bintool.create('lz4') -HAVE_LZ4 = LZ4.is_present() - -LZMA_ALONE = bintool.Bintool.create('lzma_alone') -HAVE_LZMA_ALONE = LZMA_ALONE.is_present() - - -def compress(indata, algo): - """Compress some data using a given algorithm - - Note that for lzma this uses an old version of the algorithm, not that - provided by xz. - - This requires 'lz4' and 'lzma_alone' tools. It also requires an output - directory to be previously set up, by calling PrepareOutputDir(). - - Args: - indata (bytes): Input data to compress - algo (str): Algorithm to use ('none', 'lz4' or 'lzma') - - Returns: - bytes: Compressed data - """ - if algo == 'none': - return indata - if algo == 'lz4': - data = LZ4.compress(indata) - # cbfstool uses a very old version of lzma - elif algo == 'lzma': - data = LZMA_ALONE.compress(indata) - else: - raise ValueError("Unknown algorithm '%s'" % algo) - return data - -def decompress(indata, algo): - """Decompress some data using a given algorithm - - Note that for lzma this uses an old version of the algorithm, not that - provided by xz. - - This requires 'lz4' and 'lzma_alone' tools. It also requires an output - directory to be previously set up, by calling PrepareOutputDir(). - - Args: - indata (bytes): Input data to decompress - algo (str): Algorithm to use ('none', 'lz4' or 'lzma') - - Returns: - (bytes) Compressed data - """ - if algo == 'none': - return indata - if algo == 'lz4': - data = LZ4.decompress(indata) - elif algo == 'lzma': - data = LZMA_ALONE.decompress(indata) - else: - raise ValueError("Unknown algorithm '%s'" % algo) - return data diff --git a/tools/binman/entry.py b/tools/binman/entry.py index 398d5caa39..6a6c3e6bb4 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -11,7 +11,6 @@ import pathlib import sys from binman import bintool -from binman import comp_util from dtoc import fdt_util from patman import tools from patman.tools import to_hex, to_hex_size @@ -82,6 +81,7 @@ class Entry(object): missing_bintools: List of missing bintools for this entry update_hash: True if this entry's "hash" subnode should be updated with a hash of the entry contents + comp_bintool: Bintools used for compress and decompress data """ def __init__(self, section, etype, node, name_prefix=''): # Put this here to allow entry-docs and help to work without libfdt @@ -116,6 +116,7 @@ class Entry(object): self.bintools = {} self.missing_bintools = [] self.update_hash = True + self.comp_bintool = None @staticmethod def FindEntryClass(etype, expanded): @@ -1083,7 +1084,9 @@ features to produce new behaviours. self.uncomp_data = indata if self.compress != 'none': self.uncomp_size = len(indata) - data = comp_util.compress(indata, self.compress) + data = self.comp_bintool.compress(indata) + else: + data = indata return data def DecompressData(self, indata): @@ -1095,9 +1098,11 @@ features to produce new behaviours. Returns: Decompressed data """ - data = comp_util.decompress(indata, self.compress) if self.compress != 'none': self.uncomp_size = len(data) + data = self.comp_bintool.decompress(indata) + else: + data = indata self.uncomp_data = data return data @@ -1138,8 +1143,18 @@ features to produce new behaviours. Args: btools (dict of Bintool): + + Raise: + ValueError if compression algorithm is not supported """ - pass + algo = self.compress + if algo != 'none': + algos = ['lz4', 'lzma'] + if algo not in algos: + raise ValueError("Unknown algorithm '%s'" % algo) + names = {'lzma': 'lzma_alone'} + name = names.get(self.compress, self.compress) + self.comp_bintool = self.AddBintool(btools, name) @classmethod def AddBintool(self, tools, name): diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 7ab9289a88..939b265d7c 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -5228,15 +5228,6 @@ fdt fdtmap Extract the devicetree blob from the fdtmap self._DoBinman(*args) self.assertIn('failed to fetch with all methods', stdout.getvalue()) - def testInvalidCompress(self): - with self.assertRaises(ValueError) as e: - comp_util.compress(b'', 'invalid') - self.assertIn("Unknown algorithm 'invalid'", str(e.exception)) - - with self.assertRaises(ValueError) as e: - comp_util.decompress(b'1234', 'invalid') - self.assertIn("Unknown algorithm 'invalid'", str(e.exception)) - def testBintoolDocs(self): """Test for creation of bintool documentation""" with test_util.capture_sys_output() as (stdout, stderr): @@ -5773,6 +5764,12 @@ fdt fdtmap Extract the devicetree blob from the fdtmap orig2 = self._decompress(comp_data) self.assertEqual(orig, orig2) + def testInvalidCompress(self): + """Test that invalid compress algorithm is detected""" + with self.assertRaises(ValueError) as e: + self._DoTestFile('237_compress_dtb_invalid.dts') + self.assertIn("Unknown algorithm 'invalid'", str(e.exception)) + if __name__ == "__main__": unittest.main() diff --git a/tools/binman/test/237_compress_dtb_invalid.dts b/tools/binman/test/237_compress_dtb_invalid.dts new file mode 100644 index 0000000000..228139060b --- /dev/null +++ b/tools/binman/test/237_compress_dtb_invalid.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot { + }; + u-boot-dtb { + compress = "invalid"; + }; + }; +}; From patchwork Fri Aug 19 14:00:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668132 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=sWYMIiju; 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 4M8NlN6Sgbz1ygv for ; Sat, 20 Aug 2022 00:03:44 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E290C84BAD; Fri, 19 Aug 2022 16:01:49 +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="sWYMIiju"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8072E84B7A; Fri, 19 Aug 2022 16:01:15 +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-am6eur05on2046.outbound.protection.outlook.com [40.107.22.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 9B11884B60 for ; Fri, 19 Aug 2022 16:01:01 +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=Kw4z1AjPePPcyIqZT5/NIZeU/ryXROWBCh+vfgQIHCogVuHE2QSUFs47T7g7zU3PYazYwvG1j65spAHdjWnHarYTU1BlF4yU6ZbWcJ2u/IQSFFiHG5NH7Vw+T3Ono5ex0CB+O4McB1eFEIBGONCgcdf0STPVnGO+QPyCgNq1zIeSdTNfl7y7iwVv/1SxFX/83U+C4v70WlXWUERyWtNtA4BKt9i9YVZ+7eNOM54jQDlCx1tzBj2lqOIPiaU52UwJf+GyZadSv0hXM0uRQnozqN/JqNoAEon/dHmXwIfgnmvUTiLoNomIrV/I7OlyR24gsKp0uSybSc8QA606kG+aSg== 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=T1fLeaOPqsLC6x6EG5bpYuU3HfDYUtJ4yWRqlyzMvZ0=; b=gqOzK/iQH+8AYCFQ0B6yGRZdLboHpyl5UuV/ebNgSvs24+YGfjbGSLPLoxUfEhhBab160sYz9GovO8tjLgKeZqLAxcJE7reabCi4Se4/Hv8cedqMisG+goSo0+Pz1c6sAuPuBitYk2duAJFEfaaLZiIBdxm6a/9+EUAA1bSBb+9GQqhA33SUvKFvlEXd872WAAxnnBOlt3qSnI8N5wvfjS543T6Sevk+dKkJs48OqWtLDFgrninUrPkflck9WW8+9W9z/6XtRzeqytgGU+hYUNUrI2+2WP8PaKuUBmTyTUDgiPBc1cSYuGILrk8aLsYrhz/vPg27lpvbNSaWxxuW1w== 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=T1fLeaOPqsLC6x6EG5bpYuU3HfDYUtJ4yWRqlyzMvZ0=; b=sWYMIijuJljoRxYPqxGCZZkMYEll0w5Bo3aXXL/omcd5DXXigLIbcOOrZqn48mkRaKXbjcy2R1LVPTVP3PVtKnR6ZSJU0bByeq08f+dMm1h+s3JaFnYEgDJiNxHKNw9yowSAj98fd6+rnbRRKjw6TadOsTM8y/xUDDES8ssTTs4= 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:00 +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:00 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v5 14/21] binman: Support missing compression tools Date: Fri, 19 Aug 2022 16:00:28 +0200 Message-Id: <20220819140035.32760-15-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: 88926828-5b9b-4440-2d19-08da81eb3f57 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: twUOFYRBjhk4tBowEubBLBE73Rrpr13HW13w9/P3nrdIH3KPU8E9nHWg61kfklv3gB4bv/le0zwoZHPpC44lyg+uwWXdm8MI2R/+lwuHSMjJeAPQPYIl7hPAuJN2uHzE3jqUHsPvNy9Iq8Qna6CSSCiW5epBNTXPyDQtBxVeRYdHbS5pPAfXuq9CoqpANJaKzOiTdK5mJiQePQIdKUkMCbeRJOR9Zs5Q4HA1aPzSvI4TRTZJNpN5G8KuLDEybbCqBW8+vzEOmG8g85VrKAoZBObzPujFXBJv/qh/a+CoW7LHurLvNvtnmzArUZfxpN2DDEVnU+EQfJq+PBXbiQxrAZjunqD6aRLPWrC5uKrkH5Pf6w2saOqO7PAVHfhzHVL58E7TM1VLgR8xMlQryKfwb1FoUqVihk6QUD7iA1HhimLtOdJKncFRL0ALaQnqBSSoqFZXO2iMzOopKKt8EgF/8/Gn0/w29J8m/0ec009KFP6cUTtXziXR4EHvqMgZZbt5Ow+Smihq3nZz9g3qMUjCl1bSkiNkw2Lq21w9B1B4o3m43xC1XZWgHwNLuJrVjSeNjN13CrB8f7ctJEfxUolQsojgKW4RU0jDUDz6OzlHiYs6KWFR18Oop+DTdUCmIRTwXNEpqj04KNoOGIzDW1gup7YRShEAJ67r6b269sI3+ynLA5Abc8O3CmPwxTJZbe1JvdNegdKmhuwCJXRiF9cUZX4TRrO2Wsf13jovtd7aIPhiJ/f6OyDe9c4vRQzdkxPzIpK1NB1IBq69jnDFS7i4zQ== 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: saQYV12HvkByRCOMh2nig/6zsK+YOegHEuypTMjeZlIeQ5v1ro1j5xwqlYLcP7bI8y3GElxB0Bel/wySWE732rU7FztJX2HLpK4I02XySQbpOh9VJ1IXNNN3JTbV4EgXaJCbs6g3TuSXzKbWjPkfLiUQ66jfnZqhdUFl5JUzApd/+eXewKA5LdaULkKIYdkHQSb/liyRISPzKf8wxn52qLY1IBRPJs8x5Ps7sahq4/g76gSnvsgD4x3iQJ1JOOnC9q/w8kbov0ST7uoKnLFi0mEiMuNVzwiyebYTdhTTSmk3ohcAkmrqKEfbEfVdyf103QAH/2YKGkpT2Ms1QlMIxvOnQT8PHH7f10L87OtTnQMYeyfYcpM+sDgimPA3C/mTwkNx16Y5sWaRZtXtK8tOO7aVWISRrYo+sOM75q3uxUgh4wPwNsISlRh/o/mmjbIfaMTu1y7NFvMuPcbR68U9fHgRDZ2qNKgaF5/3E2KRjIUmSCxJk4+nNXOUQLKRDMvPtTtbowTR4uuUkwKG+k6psVeMf82cn2p+ApilkmZi4WrDpLqwmAHIPe82/gIFrP13PWFZ6upAFua1TJLJN2fPQSwkVx/5FJTlbPiZldZAz+Bq4UPCW4OJZVi0rE40rcYg4FpZ78P/H9uEMCho/gGQyMvp/s2/cwEUoe2R/4K6P6zxkdn2TtUeQMcREJyjIBMjbg7RhLfHTYBABfJGccP96nSMRiqvKBavtI1ppB0bL3S+e5dU4WBvDcu5vubbaqrMH1JsbkYSsJCmSdQ3p46OqF3so/l9jBC4pF4KxN8Tl+aOGgmYUkw6pcqObCHj6UIZlhZnnVrjYdUDpAUMv3zUt83b3rodnr6fXGgT76O4QoKKqya0kXUVpkZqmDln1o1WJIVzfuhJcp8jsvaTX4oGsMXkpsy3INiGuDgKqirz8l6gzIlu+qqdJGpnHmq17ZoOkSkffolTwmPLuBAfqx2ja/TZINCxPt8lQ12U/K/jZrSqWC2g7PKmJdwOKNdKO2Dmwb/pTWOutUdclth0IyL/nRRFjMNDmEHSJxSHwOOTbR9FLYFBCN7MniyIhh8xM7saE55zyrl+Z1Mi0QsLx7JHsdZ7qwLASbGFfb8VmmBX53PzWPQMbElx3VYZqhVgQ4T5bXikUo1PAtnLbOkOIqM9mwWYHnqo5/Uh7Wv2MfZhC2kuUbu4yGlbEx8AbFqeH1UdBrQbJH+P5pR1boHQRyIIOWsSyq2EasgvwmJOfnXucxuyz9MhEURlvFpfx3n4TynsdN2SeI/m0yNSIsW+STnrp6cYLXPa4LuxEjkOeaR0gPS9dKOldlTuah/gpDiRyf5/D14E92BfXf6RCsJSQ0ruUO3BR/E3h1cDPJAFiSk/xGRycEX+egy8Yh6TdQJk9WVWpkxYwgBjk4+G4BSYFY1a32ATEGeLCF4K635UVJujw8UKbt4FsB4L06UC6ttDQsrTiCjzEmqLpOU5APJ2FoCCcWbtdqx+4KWtinApsSDeMFtxqSA+WJqzKk/0/1+Y8V5TjwIAweru7VMCzQoL920VA5ymGX9AYxy1S+AKOLs+Cg75KzpeXPXLFGDtKKtUxJH1mk6rthIR7I86b/mJ1xWcqw== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88926828-5b9b-4440-2d19-08da81eb3f57 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:00.7416 (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: PoA7d2dlFwGP96sEclDcDYA5U6a578gcwWMacaSCLXSYHTDGUmUJq7VhnUivn8YiCSnR+mgeDcdfoaWpX49zxA== 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 Handle missing compression tools by returning empty data and record missing bintool. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v5: - Use record_missing_bintool function - Use tools.get_bytes function - Add support to DecompressData function - Reuse 85_compress_section.dts file - Remove 236_compress_dtb_missing_bintool.dts file Changes in v4: - Add missing 236_compress_dtb_missing_bintool.dts file Changes in v3: - Add commit to support missing compression tools tools/binman/entry.py | 12 ++++++++++-- tools/binman/entry_test.py | 9 +++++++++ tools/binman/ftest.py | 9 +++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/tools/binman/entry.py b/tools/binman/entry.py index 6a6c3e6bb4..31389be672 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -1084,7 +1084,11 @@ features to produce new behaviours. self.uncomp_data = indata if self.compress != 'none': self.uncomp_size = len(indata) - data = self.comp_bintool.compress(indata) + if self.comp_bintool.is_present(): + data = self.comp_bintool.compress(indata) + else: + self.record_missing_bintool(self.comp_bintool) + data = tools.get_bytes(0, 1024) else: data = indata return data @@ -1100,7 +1104,11 @@ features to produce new behaviours. """ if self.compress != 'none': self.uncomp_size = len(data) - data = self.comp_bintool.decompress(indata) + if self.comp_bintool.is_present(): + data = self.comp_bintool.decompress(indata) + else: + self.record_missing_bintool(self.comp_bintool) + return tools.get_bytes(0, 1024) else: data = indata self.uncomp_data = data diff --git a/tools/binman/entry_test.py b/tools/binman/entry_test.py index 1d60076be1..aa470c5816 100644 --- a/tools/binman/entry_test.py +++ b/tools/binman/entry_test.py @@ -105,6 +105,15 @@ class TestEntry(unittest.TestCase): self.assertTrue(isinstance(ent, Entry_blob)) self.assertEquals('missing', ent.etype) + def testDecompressData(self): + """Test the DecompressData() method of the base class""" + base = entry.Entry.Create(None, self.GetNode(), 'blob-dtb') + base.compress = 'lz4' + bintools = {} + base.comp_bintool = base.AddBintool(bintools, '_testing') + self.assertEquals(tools.get_bytes(0, 1024), base.CompressData(b'abc')) + self.assertEquals(tools.get_bytes(0, 1024), base.DecompressData(b'abc')) + if __name__ == "__main__": unittest.main() diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 939b265d7c..ffcd7d2567 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -4422,6 +4422,15 @@ class TestFunctional(unittest.TestCase): } self.assertEqual(expected, props) + def testLz4Missing(self): + """Test that binman still produces an image if lz4 is missing""" + with test_util.capture_sys_output() as (_, stderr): + self._DoTestFile('185_compress_section.dts', + force_missing_bintools='lz4') + err = stderr.getvalue() + self.assertRegex(err, + "Image 'main-section'.*missing bintools.*: lz4") + def testCompressExtra(self): """Test compression of a section with no fixed size""" self._CheckLz4() From patchwork Fri Aug 19 14:00:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668131 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=3n5ya086; 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 4M8Nl90BVzz1ygd for ; Sat, 20 Aug 2022 00:03:33 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F1FBC84BA9; Fri, 19 Aug 2022 16:01:46 +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="3n5ya086"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E8C8484B55; Fri, 19 Aug 2022 16:01:16 +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 908E984B62 for ; Fri, 19 Aug 2022 16:01:02 +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=FcyVrnxapO5ZzABWePBaGDzcpt/2HZGpXUeeP5Cf/0NoU2DYFpGaUJ0sDGjB64W8E/xqETYVhpUTKjH2x6HpYu6fNomrqI4nNzo9YaZC7kQzzkpx6I/zTtu8ZqWgxd6wM5RFvqg+BwP4K9YYyougVflWeLRdjwP2+FeqsLLNPcVOa93ZeLzTK7jtLBZ4Ex9j3Fg64MEAIq4jZ5pt3k6L4WPZZZCsCYRQemMz/HdMQLz7WEMSqyGhGZ4TprRxtz/JYpR1FNJ54k5vl/khEKDcmHj7HRJTyfzie1iZm3R5VwWdOyUC+poCqOqy+w16IsmEh3nAAv1HXAqAto3nibL1kQ== 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=hsrZWPUP+3QBge/4W22G/iJxI610hXeXgTn0sQTlbqc=; b=IIZu7SJGT3/BaMNT5CkmUAop2QjBox47GyyaGz2r+IDrOZP+MokzJZ4i9hLNpqUwAQI++XS47TUxFtqXueC1GjSixV4/X3ErxP1iCyzVC7CwX1hAvv6dSs9YH+nbLQ3HbWaVWKXdPPKMrQQAUbIGuaOilajXzkorD15mD0TLPCH9REgd8f5ZeFzEx/h8kBhKNtek91vkBrtjzgOm3nIhAl1BVPoICklBp0WkkDcDvVAVtn0qbK+0HjVKBCxeuLWz2KlyTMQ+IbHCNTrwerY/yNtHxIQTI4fWzdMson9D66vdiqL511rISev1N095wcxBuhS+Rj+8oh78RFSEHjU7QQ== 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=hsrZWPUP+3QBge/4W22G/iJxI610hXeXgTn0sQTlbqc=; b=3n5ya086D9qwlriKcCLFmnxSKYHt5C2jWdH/LyDJtDdGCzfVJG6kpROhf0cR66/Y+Uh0dIdvnUTHMxJ0qX4kWAU8796K21LjlZvdrEOM/5P0R+AYVC3QzNSoVgguhnwxVjuR1nIAfXrfZ7MsAvjGppPBjwauVF2NZ0tR2jkmfUM= 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:01 +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:01 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Simon Glass , Alper Nebi Yasak Subject: [PATCH v5 15/21] binman: Add compression tests Date: Fri, 19 Aug 2022 16:00:29 +0200 Message-Id: <20220819140035.32760-16-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: 2aa0f456-703e-4dc9-74c3-08da81eb3fa3 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: 4lk16L7q6P6srdScFvyUG4BNx3sNlaosvmKOWqtCBVZc3yElOJoe8GuqtHduYn3RsBpT9yQEHm262ylkAyd5rj4IKIjyFObfN574DWoCI5iMnEKWbveHkHYV+Keiix4ancVEaLxvKaQo54InHkWDwsEmwLETrNrFUc47Ux6KuUiqMMAX+9zPWDA5wlE9/galcHYN6zKtdtAR4cEPQXf/DYNrlelYCqciHpKU6vehBYtLIJZ98C7hqwlf4oTdDLEacZBhZ7yTghvOcklrDKAc1MfFcape2FpYXSOwSjrhwQ7PRHxmFP6RMaizDb0/RuOm0xwHJCzVwfSzgNaVKC6GNKv/djtGGnVco144y7+5cmI0C17Kp1RIOK/U2f2dekMLk7FBMpkbqk5HeQp5do/FBFH2/P04AlU+4S2MnmXhG0tfjXn/l9HD9n8ArxkWXQ05S7fFo9u2qY0X8Txk334jl04e7qJgwcG7RGFZIpQ4H81tqadBjclUcv+XIOukIivdgi7ohqDAa7AfZ4+1ooR+UJ90nOE1hiKNCqLtVpc1YT4GVOjCeYYT+3qLPgG2t1w7SGTRCb0Lc1V6hXHHGtdVKyVvqgJoYPC9OFOj+xbj0epaMrbwJKKEVBMUAy1y2Wp7LNJsdgp53eQ4SpfcrvkMPdAupt93jf/Hktg4z9byYZC9rVdE2hI8sSpz/5Wo4ZOWJBiU8+UTzexUhQiBf9t3h2u/2mnIQslJzBGWPh8f6o8LFuJ9fvGv/rZTCNUmir8YhOM0Ij1ocRP85zbdbieMPfcpBqOfBYTmJTBDkZ6G6rw= 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)(8676002)(6486002)(86362001)(478600001)(6512007)(66946007)(66556008)(66476007)(966005)(2616005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VFz3JFIqShZe2dXfqTxyaIx9hDSE8eKsXUwqJMoqjFRD8AtptUmBVVkk4oDuGKXOc3eYt5PeYEv6EezNfuUFt9H1+7uIw+eXe67PGI1ONvouABDeft+r35QiFdHgj/f0+CaJ19Pg0NYzvaMTM97O6lmh0mc0u92rozBoT/NUZwP7PlXhrYQB4HT/Uno6uzTAeQzag22IqKUKYmqO76RVHGDtEyrC/INaL0UUs2UOZAwf+U6BtDtcosbG3S640Lqh9fY48DIyK+IBFoaMOqSnXE+ht8jWNsIAA9nTCMhsnFJXwi6iuh6mAic2OP3jNC48p7oLu2h7zhkDARzjk5NpAZtXDeE0Zb5iFvwNcDWj+PNAwnbbLU79PV8JoT6oXHbY8ac+tchIWiTEFcl1hJOCmiLhg23BbCmOftnSphnGRZSBvhbZF3aV6RuQsX1yZwJhKzsS/m6Txb7yxVrgyJVKJqH0/48TFwep5DU2Biw/E21Z7cF2fV/VbH48+FUWYnLra08aoxj33BThMTRhcFivgZg0hz47NbkVWCvCOkNQ1wu4r1xd2QDi56XYM3xC9xG4W7L6iR284ebFOYhsNhXPMNsyN70Tzt4+f5vanAs3KIQj7+jA64wLbcbf1Aq3xSnNhTr6lZHniHwb65NKUd3IvsNJ/YBdBFvIvUxT7N29AOQJ0Qp36gYIvvvqQ2XYv2deiiuJaz5mpiomJ/aDAD8+2AqTJ8GF7dIl51ppxRucEXZ/RYtHkg9oWreF106+qXGNXjtOhaHf+26ceCG0E+8kceS4/NWYqy3v02zFhXneTB4H+OOyudGshJo/x/gnwU6JBVGLZ4yQ9hnheUhDtmVQKHxPfzCZmDgdsNcfpLqBGO8X9qRNiH8+J7O+wfzC81lqQbGGEN/b/NhnWzLKyVlNnGpkJlmUls/n1eL8cseMKzBHoym39PRlP5nz105km5WFQI7plFOljoTw3nJxe0Yj/xVrOrPEnBDh9qFpcrDeFaBrZ0gIUHqlrYfse/bvFIwWwkqch8+eRwBan7hw5/unVan8SO0evsdl+Zqu1mup5XjtZo01oJJxwreYBG8CRFamDU4rGrVYLUuriaUC/QG6ZptjhwH4lYHzgLki2Gaxx9No7vXEU4NWE+LB6TVmvJZe2PgvBr6yOhWjX6P44rbcYurq733kB7ReTkuKVF087oDhXO1hofnA0MsIe0Jg816/H3enXEvYaHZpi2BfjckVN5OLoWbH2ft1/FWBvOpVCIAYt4eA1GEub99Pw4MUzeGc1dkUf363oesdl0dVC1PZcJeBJS/VeiKbFnQ1QHom8j14fAo55FVFYjV9HmwrOtcTkXFkodO3SkdsVQN8pirKz2Ya13V2EVBIl8sTaHhh/0uuM6rJ20pF75wHEoZK7gwhgltZvMX9NTlIUfepZ+AR3FbE0WanChBoBYcgoZG5T+r6SnY3vSpf/XGW67IZhwgQa21ENUxtE4KM4lFrqBIhFzj1g2zCTirM0Q/ZHZRldIpu7Zu+yS/sMKY+h2fYb1Z/GU2JzDWLc4RkJk71L917zoMWN/3Fm0NcLT32da5MAcqgZcbvoGe44HDwf7TrCnoAcmaqjtI+705yE0GODcV/mA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2aa0f456-703e-4dc9-74c3-08da81eb3fa3 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:01.2427 (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: tXODxIdFfXo0Gju4FSp772fCUKw8KRpJcpTZ5KuhxXahabGTsBupDjAWSviBEf4yvm62xpIlH9nq5hVkwyskuQ== 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 common test functions to test all supported compressions. Signed-off-by: Stefan Herbrechtsmeier Reviewed-by: Simon Glass --- Instead of the for loop it is possible to use Parameterized [1] testing. [1] https://github.com/wolever/parameterized Changes in v5: - Use self.comp_bintools dict - Use _CheckBintool(bintool) function Changes in v3: - Use 'tools.get_bytes(0, 64)' instead of 'bytes([0]) * 64' - Check if tool is present - Rename tests Changes in v2: - Add commit to add compression tests tools/binman/ftest.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index ffcd7d2567..bbb2fa19c1 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -5779,6 +5779,32 @@ fdt fdtmap Extract the devicetree blob from the fdtmap self._DoTestFile('237_compress_dtb_invalid.dts') self.assertIn("Unknown algorithm 'invalid'", str(e.exception)) + def testCompUtilCompressions(self): + """Test compression algorithms""" + for bintool in self.comp_bintools.values(): + self._CheckBintool(bintool) + data = bintool.compress(COMPRESS_DATA) + self.assertNotEqual(COMPRESS_DATA, data) + orig = bintool.decompress(data) + self.assertEquals(COMPRESS_DATA, orig) + + def testCompUtilVersions(self): + """Test tool version of compression algorithms""" + for bintool in self.comp_bintools.values(): + self._CheckBintool(bintool) + version = bintool.version() + self.assertRegex(version, '^v?[0-9]+[0-9.]*') + + def testCompUtilPadding(self): + """Test padding of compression algorithms""" + for bintool in self.comp_bintools.values(): + self._CheckBintool(bintool) + data = bintool.compress(COMPRESS_DATA) + self.assertNotEqual(COMPRESS_DATA, data) + data += tools.get_bytes(0, 64) + orig = bintool.decompress(data) + self.assertEquals(COMPRESS_DATA, orig) + if __name__ == "__main__": unittest.main() From patchwork Fri Aug 19 14:00:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668135 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=MYnLvZtR; 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 4M8Nm23HXmz1ygd for ; Sat, 20 Aug 2022 00:04:18 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5547C84BA4; Fri, 19 Aug 2022 16:01:58 +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="MYnLvZtR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9EB4184B5F; Fri, 19 Aug 2022 16:01:19 +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 DD80A84B65 for ; Fri, 19 Aug 2022 16:01:02 +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=NRM1V2BO4VNafXH33+0DcAEjfBfDXL/Q3a6cRB8HKOLHzmLjKVd2SErGeVZIx8OVxLqBA+RzFfWNXNAhZruZrpiXe1uHugV5og1AXWkt01vi6nrsykYkQqV8QrE6BSFfw976Pfld+GWX/RZY24H4k25F73WsKmG6RYkNHyMh+KycuhPj/xzsVumoOdkBOLsjXXHpx9G5D+p21QfMTKDx+TseQDB5rHPY5f9ZDToJZCWG3nhpstQf6NeQfJ3bPKFqSjAe7V8xR9/2iuOOCffwsKo9gaoHsIjkSUNNB7S9satOglEXVAI7uO4OkH/Aj2f/9APlqVMPvyzY1h9Id9aQZg== 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=sPY0aAHW1gt7WusB4fqpphDLSymJzCkc4eOIZoPBdeQ=; b=BwN7WUyYf7HMwNGzukdUDZfcyjRUow9Q3ZovCwXz3fVAISDe6AYYU51fODo2g4faOPWSNallbgYiD54uqhKS8NyGZPNz0lwIR4OS4aMxQYibeKfgKYV60Ydx+927qN9ZiYDdTUecneHB7PACfvKpd/bgCg4ZsXW/vpRMErWNp0kmB5qHdd9yBq+ekGwori0ju/DQ3NWg790CKPzEeS156aCxcIf/ojCjd3e5etLZn83SXfEB8zlfK5XYIapJC3gmhAuXfCAKiCa4KTAbfCdmcXobYJ/he+fURicx1fZVkxwFSJ5/4qCXLr2338dw8ARyjDLLjkgErh62INJB7BuXaA== 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=sPY0aAHW1gt7WusB4fqpphDLSymJzCkc4eOIZoPBdeQ=; b=MYnLvZtRBFfw/UhNnuknTHZ0bjtyX6cFWIBZs6OR/fvyFWc+WPRLVW8CMWlKRF+trAJU+c6dyhnpr41w42UyRcaLI0poIhfdjqUe/wzbYGXJuH9R6Lfat+gvEbNDGl4AGXiUIIc1lD2oN0vC+vYXt0f++UJCWAsXm2XkAVPEFMw= 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:01 +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:01 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v5 16/21] binman: Add BintoolPacker class to bintool Date: Fri, 19 Aug 2022 16:00:30 +0200 Message-Id: <20220819140035.32760-17-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: dc35ddd3-3320-43bc-8e42-08da81eb3fed 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: 8M6XDcOh3BOmxEysnHR26RVMgwM2kGBHH2ZtUaQB5xxTvJkkAThVyYT1LS/XXe4Piy7+U2oIpV57SJKCwDgzkVmjHeGs+P+uNgxqnP0S8TEFfoOHK/jV7deWTA/NMJ8LYFGzxC7BVnmJvOCy+b5sN3366koiQQvt7wOrdZMjkDhOiZKz8dPScoWf189CChVJPlJkwQn1yYM++xf6Fd9aDD+IRzyQF3fjvy6HtGKODXWaZ7v+jF9HoRRbFZ3HyGYTEHb146RpOOnOoOkm9gaseXWogZQNlIkKSR+pnxjRliROkmG/49l5orQBL/hj275KDCX1OW7BmRmPVqN3iHUixiYibx1YB/SJ30/AIptR3jqbGijE6AjKKAXPP6fJi9qkKCWmx8tTnFGge5YJtrVOzkOIzw4XnwursoAcWfxI5quOaYfloleTkKCwbhKYuCxqsfR5XBLU1H9b/LxEVbxKJM0Vh4CWfNoV0TW+fMMzIBA+IJ/jzltRSwMNQzwkg6ODj+Ex6TDS9AftISR+r6acAvfqW/U7z/ve4MkyoUXL1BjyzfEg+pgvl3Fsuet6rBOchaOZpqc40k1jBGrBzKvnK25X184xdrIWnJsWgePWgrv8gdIDcBLGcJ6l/GE8gchXqi6TE3+6Z1I4bWh4rl0CRqQOoNvBcHlVGBAw9AUIpFcdXQ0loZGbDwKKUrrsCgOyQ1mbJJ30QRdap8wCAeIFemAwhSXc1EnOS6YkdlKQFEnMwVnDClPWl5fyPBOeTrsFc08uBLbwgxURYkMilc1ANA== 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)(66574015)(2616005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?JClC4na9P4AgYhY96y2oq867KSz5?= =?utf-8?q?qREhDKyxbOepT/z6Oh7+xmvYD9nYjRs6lQw2XQFVqnFIUURw6ja405rKXPCKCwn3l?= =?utf-8?q?2ISVYMJvSUbwgR4JvZuo+YgO0G0e2/XsKIqdU3LQ3tis6ES+jlhxis9FJ3wccc/ie?= =?utf-8?q?3hfMxaA3soWx4MRlbPuzN9QRI4NEPo664UBuYqp80EF34SYdDrWVvzxKUbIImwZyU?= =?utf-8?q?po5XA0lA/ILhlJS5R9u+/1yNk4vVmgsej8aS0fRKORTYtDtg57KgMnelYuAirJ/bL?= =?utf-8?q?jEi9vV6uwnS2IcPUxhGtpssF27cy/DePkzcOeNg+6hQH4CJvkDiRFwMIqyRhlgeqF?= =?utf-8?q?CF82QkqhTU9OFa6+dkGGYYQkH3EULJNXPhwO6ubyFqzRFdpedAxsHQip5CNt1woVY?= =?utf-8?q?Wk2/Yl4x2dLV2vRkF4rrJfDilPgjniObcOoWs4xK0HZ+Piyokg2Nednr+0Fmz5kyK?= =?utf-8?q?P0FKuBf9DjiuMywQdFT+tlf1pkzHmZLCJARcBldbwsD9SAv1hUT/jICY2Dyls4LIs?= =?utf-8?q?6EzYXu/C06Psn1HqQ0wIui2btesntz1zUuo4QyEZkW3HscFwqvYnemdXis/WeweNW?= =?utf-8?q?upE+auN86srHpoSuSogLiMUlG1Ee0pKH8meuE3T7hUwobexWTWJLROKGJkdJR2lQ6?= =?utf-8?q?HYykAVJXgDLDGas54TOtBfAyHFq7UPyA8BmLkyzGl9hBARD1rAy06edMxSwWJrEP2?= =?utf-8?q?UnouFNVZuEvJ8M/BMPAJj9zrP32CtRuGGLFfS/ELhQMysxJf3iV1/pYzYmP4Ubi4g?= =?utf-8?q?Plkb3HA/KdUZoOD+1NQDeyHdcaG6Tw/OkB0sYxGLLqursWduaSqYeNu4SJ05vJFQq?= =?utf-8?q?bcnAa8l7z2cNov/M50U4MeZgL10lX/e+PYRlsup54GfpoeosjQwVuiWJpHf4vgDaP?= =?utf-8?q?Vh0nyyQYwlb2rcfIkEN6eKdd0wep5Fv8c7YzIYtIxJy0i1AH6uj98WKq7613y0zJc?= =?utf-8?q?ItjLm3P4FEfT5bmV5YwUW436wnnTiU+kvoXQeBQCv32ijrCNynpFp0BkyZstnDEqO?= =?utf-8?q?rKB5hO3Tjtp4If+6watkPtMKbGGLjA4U8dpZG8b1bvID1pb1yiGfuFznDtxjdh9aW?= =?utf-8?q?BZrh7VSKdfeWjfXQnAytUMB+jkme/YxhokStZP9XpeNtW5DQIPTp9zf4EJVnQ3x7k?= =?utf-8?q?xEAEa2xN582hymBu4DNXMwSMjpbo4BCy1t+Y0/QsfKl6nZZPQVONe0CFtvzyZS76F?= =?utf-8?q?iEpUOTqsbaorGcd2x9E8Cr1BFdIE0nECkV63ZgPY35H3VLQXPdXd8df1jiyQ7Tj6d?= =?utf-8?q?b0TQdQVbb5HCNIi2JvQ/AWGS+oRZVrfBDOT9h5nB4qyrBXqiDltnlxlHCwV03mfsV?= =?utf-8?q?DLE6IebWkeUFbzA6+tDxYUTJtJFM3bpNUIx4CnfunoJVEe8cUiLXKyBzyKPAu4NHv?= =?utf-8?q?Qu3OsTdPdUAqTtyWvkF4YhziRCepwpGC38WcAPN6Q0x+E9mzABMwsboUwpClRdxZp?= =?utf-8?q?cqQ5lVbgsNDxRcDA7NFOduGGFEZDJeYoSeeK0URMXr22tS2tlobuSTVMXq7sChA8Z?= =?utf-8?q?JrSqdVKz4Sy8EMsIR0wOIH5I/j9nG5JQIQ=3D=3D?= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc35ddd3-3320-43bc-8e42-08da81eb3fed 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:01.7426 (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: hRaZZI6aQPR4Y04DOzCQZkxd/LegCOYqpxADLwwOwCb4w8vDDP9X3LZvq0jl7X5NlXhweAHeXxH71nRd5jsHDw== 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 a bintools base class for packers which compression / decompression entry contents. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v5: - Remove self.fetch_package not None check in fetch function Changes in v3: - Document class properties Changes in v2: - Add commit to add BintoolPacker class to bintool tools/binman/bintool.py | 106 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/tools/binman/bintool.py b/tools/binman/bintool.py index 8435b29749..ccc1904d62 100644 --- a/tools/binman/bintool.py +++ b/tools/binman/bintool.py @@ -1,5 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ # Copyright 2022 Google LLC +# Copyright (C) 2022 Weidmüller Interface GmbH & Co. KG +# Stefan Herbrechtsmeier # """Base class for all bintools @@ -464,3 +466,107 @@ binaries. It is fairly easy to create new bintools. Just add a new file to the str: Version string for this bintool """ return 'unknown' + +class BintoolPacker(Bintool): + """Tool which compression / decompression entry contents + + This is a bintools base class for compression / decompression packer + + Properties: + name: Name of packer tool + compression: Compression type (COMPRESS_...), value of 'name' property + if none + compress_args: List of positional args provided to tool for compress, + ['--compress'] if none + decompress_args: List of positional args provided to tool for + decompress, ['--decompress'] if none + fetch_package: Name of the tool installed using the apt, value of 'name' + property if none + version_regex: Regular expressions to extract the version from tool + version output, '(v[0-9.]+)' if none + """ + def __init__(self, name, compression=None, compress_args=None, + decompress_args=None, fetch_package=None, + version_regex=r'(v[0-9.]+)'): + desc = '%s compression' % (compression if compression else name) + super().__init__(name, desc) + if compress_args is None: + compress_args = ['--compress'] + self.compress_args = compress_args + if decompress_args is None: + decompress_args = ['--decompress'] + self.decompress_args = decompress_args + if fetch_package is None: + fetch_package = name + self.fetch_package = fetch_package + self.version_regex = version_regex + + def compress(self, indata): + """Compress data + + Args: + indata (bytes): Data to compress + + Returns: + bytes: Compressed data + """ + with tempfile.NamedTemporaryFile(prefix='comp.tmp', + dir=tools.get_output_dir()) as tmp: + tools.write_file(tmp.name, indata) + args = self.compress_args + ['--stdout', tmp.name] + return self.run_cmd(*args, binary=True) + + def decompress(self, indata): + """Decompress data + + Args: + indata (bytes): Data to decompress + + Returns: + bytes: Decompressed data + """ + with tempfile.NamedTemporaryFile(prefix='decomp.tmp', + dir=tools.get_output_dir()) as inf: + tools.write_file(inf.name, indata) + args = self.decompress_args + ['--stdout', inf.name] + return self.run_cmd(*args, binary=True) + + def fetch(self, method): + """Fetch handler + + This installs the gzip package using the apt utility. + + Args: + method (FETCH_...): Method to use + + Returns: + True if the file was fetched and now installed, None if a method + other than FETCH_BIN was requested + + Raises: + Valuerror: Fetching could not be completed + """ + if method != FETCH_BIN: + return None + return self.apt_install(self.fetch_package) + + def version(self): + """Version handler + + Returns: + str: Version number + """ + import re + + result = self.run_cmd_result('-V') + if not result: + return super().version() + + out = result.stdout.strip() + if not out: + out = result.stderr.strip() + if not out: + return super().version() + + m_version = re.search(self.version_regex, out) + return m_version.group(1) if m_version else out 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 From patchwork Fri Aug 19 14:00:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668137 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=XrRyJ2Og; 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 4M8NmS4v0Wz1ygd for ; Sat, 20 Aug 2022 00:04:40 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5BA7E84BB8; Fri, 19 Aug 2022 16:02:06 +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="XrRyJ2Og"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DDD98845CE; 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-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 6699984B6C 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=KudPeSvCizSqLeQytJNxJQJWCG7V0x4elGgZW6lPiz16044naKBkvrdJUUX1zvxheEJQgZ/faQ423wmzWNfW4dw+H4Ohf4qSBlcz7Non8wE4o/MNkYUEUBdwnQ9rtJhFGbmRJ1KCIWQ5SKcyHuXNclL8jIHNEp2l2r1vg+m0OW/sC9Aj0yWTVsTQj3EEswh0EmctnZJbvs+mzhadYqZOKZkRO9jpVtMwsgVgVu22sviZhRCW/A3Z1l8tC8B0Rx8ZWvk7yZeh3/erUjO+A1PQwmvEsSX8v/u42BoAtebysfzpfP+EBI6RMe6ccjqid9CwI7M/VaKHbrKiVmZvE1Njjw== 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=i5GwYJp4SnHKPHBTLoCZVxgbOV5GuiCk6tKwwBAM6/w=; b=Q4A8mp3wK/Ay8D9CkeMLeOZvM16e+7fHZHTeSk1Ag0Xg9KtvDArFpHssI5r4TIxOcJWFPDhokuLj58z6b/AK0XCYOdBDJbDJ5qegP6elGCwC31G78uIv4IcSzzQtisoqfFJ7exPlNZ3sTI7feBJsj/JM8E13wJ3bcrsBPi0X+gjz9nqS1tekN87RClmQ76N+b8xZ/s+7VEbRqPv0bkM1wUHmWHv902+OoHu1JLnZV2dReaL2N7v7QElZqmIaUE5HLY2hW90oUNaGoPVAE7T+GGVxUi8vO9s+JOfHTCpS1knBlDy0A+VStE6eVZQGjtcCzh2h6RvJqF9B/fbl+0WW5g== 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=i5GwYJp4SnHKPHBTLoCZVxgbOV5GuiCk6tKwwBAM6/w=; b=XrRyJ2OgMOxQ+KsHUgoROQ3w3lsYP1x+Pko60lbNSMoNxbUEYslprZvPzLdvQyXI1KyGV82OECGZxxuc3qnhaBuWGfJsCAFNNloJBrGTwxSpo9yVrsC6mbOrK/UZryTfeYSafOfk2zGD8IblvbCpB9MYZl03468uXGco8pHfwok= 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 18/21] binman: Add gzip bintool Date: Fri, 19 Aug 2022 16:00:32 +0200 Message-Id: <20220819140035.32760-19-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: fe794db9-aa0f-427b-7e1f-08da81eb4088 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: iEI8Zaw3Skflw6Gwfp17RmRZ221AxsUHYfSRFDSQArhrRAuf9Qqaj0ZhqXbRPwt+GnPgOaqfsZJvTFPuo7AnQKbvjeOBbvlXjbzPAtK/85iUPklRiL/lPLDHdDUSmDk4V4xBjw6IMdcHwxKhBLncCz/pNIjFjhs2XaTh12PbYU3zGYksMYeQusRB2EwrSqr37Di83TOgEnk2wBp5azdgGEEZGPKjaNLHIP5TqVYiLh7Wv3LkKVKK8tqDKc65z8rcOQovfpEstyqP5ZJuiHy7P67t7u9lw0rfuoEKLKCycLoEJQ+hKH0/X0NIiVkHkOK3DXdVmqaodFUz6KPiOALlhDkv4pMp5mJkAHz6yLuwda4JDtCunWpgms+1eeXBg9u1Tkfenk2l5i7qpTMuD6ke4rsA+vTiDcHMa+5+B0cYRZcefyUtQ2c1YNcgBF0psCCkn90teSuF5gNtsYByTu4LkANx+dg9L5c9vaC/sNtK2Iyn1t1QfKHPfqHKBO0QJI+PaEempcXl34xU0+gkgK1bnystHMivJFeQT7JrorKOkoPqwdv49OR63kjCwvTjhZFnJ6EnbkHKlx5vzNJ8Lw2tbyGC+JBNObBAcl3byoEKplJOKR7aIN9NFqsF9ZvyZgnQrHPnPdHwY/OKawR06KpOiHT3msYMB4mpBT9BAWLwMZzbREgBWO7aooozsUrFRl2R0KRNtZnyZxe2ngSZyRvId9wdjucDAtZafbmz/p68JYzx/9fqVZrQqANf7oa+u0NsiijsspSZoGze9VpB+k9Nog== 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?Lf/vbg71WrHpjq18wJyU3IYRZqg9?= =?utf-8?q?f2oNkdqX400apHmx3qJEKNQxGRv1LLLMKm0XfN9abEh3out55tLETen3XE9ZphJHO?= =?utf-8?q?k601UzP/3mlUpLhMR5U0xOJybHesrkDrU6U9SHskuLF/LBGm2r3PJs9V4w5Inmm2v?= =?utf-8?q?hQo/9warQ9Xcy6ePrQAJhCz9IeYyl0r3t+ohSxirg/kOPndPsU2aXov0B46PDlwVl?= =?utf-8?q?pSq2Y1aqTKq/aepMwdtNiYNlXpIH3G2sgp3FBuwaa/nyUVJ1sGxHPozUaurFwVSM0?= =?utf-8?q?QvasF7OVnAF0lCHMRv0XrFRkwBQgQomyBM+fulWiuoRYnQN8ulyhStzONIpJuiKIs?= =?utf-8?q?j8sk0iD2JL5SGWYoxOXJix+egBxT50HxhmnK8B+hf3358nQItLVHCD3oC6bGvyLi1?= =?utf-8?q?QT8yJe/AF/kcvyOWPMBzrzod3YOWh541FvVJPdHoLc8vxPgWMI4rthZScg6iABuir?= =?utf-8?q?bvJitE9prp6i2KBg1eGEeXIHNTTQRjC/HwiUHj/XRLo4JJqTn2We3P2CXPd9ob/6z?= =?utf-8?q?cvLWvgIeVqTFvOY5DC8DN1GCeaOEx3UebzvFHzWIn5Qm0IKy7EDlzRlPnnCVV0L2z?= =?utf-8?q?uhvoRgPvpzdj6ypvX47BpBO+OeJRAlcscLJc+xUybvAgprXbRLBAO7TiUr4gszUU2?= =?utf-8?q?FsO5ctauaAilsTZ4UWP/ywABMp1z25vocYLoD2CeKgSOYRqrsjfCGMLGIlBBgeu+M?= =?utf-8?q?Gk4HgEL3UJbSHU6LepVHYmi09helnE6+R6WI80du/dzwmTdroyzi3fsO2zknf/4cW?= =?utf-8?q?gshDDYnqasB26fetvudxpce5nUBAxaFxMNjdhoqmMs6LuH/LE2JI2MztenMXD+Jal?= =?utf-8?q?zQ0vpdA7cFv4n6MiAFRrdXymovX1O8SifE7s6DRTfLhvoFILQy5Ve3iVNmKFi9MA2?= =?utf-8?q?eWzw+mdNFrhwGNovqgvlh7MWRR/AjPaiYTPKSo/tjJg1APZSe5iBxGzE3b+SvK14D?= =?utf-8?q?C7ktAUP3q7X4FFoFxzX8017pY/WnckMEFadYHYzxg24pyUR0nHchkl3wSroQ5erTb?= =?utf-8?q?AmZPDY64NFhdAlzcxxuD4kupMKLZV7B43hjQBDMjhx6Kz+f7O6diHVhDGcifntWRQ?= =?utf-8?q?16PFdP7HnPWf0FQI5SA3t4gJUQafsDYr8GJcKoto2H8C/pU9j7tDRt2tNUg6c8ss6?= =?utf-8?q?4QOsY1PlZz3FYRVSMpsCNaiWzGqknSUIxAgaDn8j+0IzeOR4aKAr7Oak6ZUB0lDcD?= =?utf-8?q?DLnYSpycW9jb4gMAWVKfn2uw8V4wvOsLTw7sxrU8HvkSnewtjcZJszA29irCRVLtk?= =?utf-8?q?9D4uf9qANdD9CtSYECxew4F66wxXLf56mel7MW7XJQaCDyNQBkQAyawD3xoDPmYPv?= =?utf-8?q?gePZqoOQ7XgANr1KCfMNwpsu9JfqkSlgMpFbVxa1na7GlzJ1j64k0bBTgu2YQSXXw?= =?utf-8?q?lARLyEr2p2EXIyDf+VR8R+7S0tnouV+SNd4HiYTwCwVHXos0EZf5MMCX9152OqJNU?= =?utf-8?q?9TDnUbPhs5zufIfBHB3ftalmI3nGVuoErhYZFArb1TZbI0Hd4sg7xo1CnpHvrWYGm?= =?utf-8?q?qWE/P2FCzvbRStMD1ki2xIALRQQQB6Yjfg=3D=3D?= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: fe794db9-aa0f-427b-7e1f-08da81eb4088 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.7268 (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: y5zMGuG550GKjcQHgq8j8xLhoNjcEuWHJaV24XKCG1SHqzps+brPCnab5aZ5xwjmKL6meUrKRExLWKqAPcqDAQ== 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 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 --- Changes in v5: - Add algorithm name to entry.py - Add tool name to ftest.py Changes in v2: - Add commit to add gzip bintool tools/binman/btool/gzip.py | 31 +++++++++++++++++++++++++++++++ tools/binman/entry.py | 2 +- tools/binman/ftest.py | 2 +- 3 files changed, 33 insertions(+), 2 deletions(-) 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/entry.py b/tools/binman/entry.py index 5fb8517329..8562a65d30 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 = ['bzip2', 'lz4', 'lzma'] + algos = ['bzip2', 'gzip', '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 9fa8e9e049..911c955cba 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', 'lz4', 'lzma_alone'] +COMP_BINTOOLS = ['bzip2', 'gzip', 'lz4', 'lzma_alone'] class TestFunctional(unittest.TestCase): """Functional tests for binman 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 From patchwork Fri Aug 19 14:00:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668138 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=zc1vY+Dk; 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 4M8Nmh1Fxbz1ygd for ; Sat, 20 Aug 2022 00:04:52 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C781D84BC7; Fri, 19 Aug 2022 16:02:09 +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="zc1vY+Dk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4840984B6C; Fri, 19 Aug 2022 16:01:22 +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 EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150080.outbound.protection.outlook.com [40.107.15.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 A28E384B72 for ; Fri, 19 Aug 2022 16:01:05 +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=EBSp/aFkDaknCwRMtROFgGvrtvefRwrnoVW/2db/aimGPjE0ADokDXeq94/bQXKLzGazi4BRD7L07KTxN5HkrhtzEe4xeQbwwFzZeQKkPjQFmoFGuyMXl5iawmEMLQ1Ibvg1Aip52UFmX987KGJ7SlXEv06KEgJF5zVIu3I52nGgXwjBRckn/liX9ZSj7ubINSTmmvq1nk2Dz0+DX3e2ZE20Ny53xjKm0R/8q6psr9/oj9ibocj6LgYJN/IurN5XPcq1rIT/F4iAqE3rog1yXD7hD6V9IXmSiS0yZepbAwJgDP3ickaxooZ8+skMTfafP7hbhdRk02cWtw5wmo5JUA== 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=BjHSWx/AM0InonaSwRcdXQBPC4/UHDhcYy21rsVNqRA=; b=JDjWiIwpo8+MPjpeN+fy6YjScl/2o3O5Ej1aMmqf6c+tx9ny1yCm3CGHqUkFL+/E82gkrVL/uQzf8sS0+YSW6ePUA0QVL4mpRDt3UMLIFzQbBtu2noCOGw1xo621KFVOMruPZkW9ZGcCSm/QYGTIukcwbTRfHFZ/evUFAk7ZSOEPJHhyp/Exc2rovIXwl3WOjKfg5ymKL1NmBa7PakHxpt8J/XjRsbgkl9ErHGWJyWe+04jS/djgDRp4wDjyvqK0yjWs2asISCyHHDrA3efPzMm11pV2VdsmLBMeXQEP81OsVQqhR22NR46aKhqzCX8/GUgBgKJdjpMBP+BsauSEuA== 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=BjHSWx/AM0InonaSwRcdXQBPC4/UHDhcYy21rsVNqRA=; b=zc1vY+Dkn9bpFrUBpM6YI0kmhFEC6utq5EOBumo4YZXU91Jn7v5P2NRn20gce+oljnbhuzy1dKigw5Q99y5VjaFZjQDiT6m9+1EDGZ0+B6xCwJbS54Iyzk64kTkFN1AeOUUL7s2fjN6Y4NQzNgu0bZANdhMwl9dFYts+m/BhEjw= 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 DB9PR08MB6427.eurprd08.prod.outlook.com (2603:10a6:10:25a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.18; Fri, 19 Aug 2022 14:01:04 +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 20/21] binman: Add xz bintool Date: Fri, 19 Aug 2022 16:00:34 +0200 Message-Id: <20220819140035.32760-21-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: 82969923-988a-4017-b6e8-08da81eb4117 X-MS-TrafficTypeDiagnostic: DB9PR08MB6427:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GLZ7KeOkEqQFcbHbjMfvbNxQENnXJCfw6fhu3ZSAEt1mgrKZ9k+ZmgjW24bO+dQJA51+pHoan5/np/Sodo7/e/WabpEXvTQeN8nW8E9jnlKFZpn513XwUZHokTn3kAhvx1YBTp/jTUVlfSqZKALXw3QHbIjFVHuLysWYu3IfNkDt7D35T3hEYjUPDCJkcMeVfPB/vcavP6+F9zF1+a7nXtAXIX5tbpxtauw90utcDoURshNmg9M7bNK8qBv+ydzhwu1RpRRw5pGQafYGzl7qhWlw/kwK3knrA6FWw2fQ/YBuqSQA8eSDsO5Bks9c4u+TqY3XM1zO77AfIMDONrGAvDBaF7u0jq3hxHHh+HDOrjd9NC8tNAxbXCE3YEUgXodlLuO70JZ9GDG/fLnCXmkgQmjfirGX5sWyMGEbtaNYTRCEqg4K2pgLbYI6bSpRiYsBaYAE6XKlH27m90xb/kpl9xDi5Wr6mzWzpIHTpbYtZRfJhgl6dTyZD/POFd2M6/E2ze7uoTbVzon6n61CzEey2QqyWgwaVU8x8HYU01rpb66Q1x0Q5rjVCSpHafTbS43kBPjesbK7zJ/x94JJLLRet83EHhWw6AE+15PccKE+pslSs5L6/coPwTDUHo1aN93H6r3GkoD06mVyeqJlKAiHmuUA5ryZ6uCSSWpw6rTqvfE+s93qIjKBioh1GfehqZKpUD/0c6/SZNL5ui992viBaQgz1koVFB7fYdWSFz8AWDAXVljjfFREqAUGJ3oD0JlSA0wDtvM+aQkftHW+BDDBbg== 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)(376002)(366004)(396003)(136003)(346002)(39860400002)(83380400001)(478600001)(38100700002)(38350700002)(54906003)(6916009)(41300700001)(6486002)(316002)(8936002)(5660300002)(1076003)(2616005)(186003)(52116002)(2906002)(6506007)(6666004)(6512007)(26005)(8676002)(4326008)(66476007)(66556008)(86362001)(66946007)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?TLpuiWp9OHdr+nhoKA9TgTyNVX7x?= =?utf-8?q?iZCSvMFs9r7bgm/BdZsaTOXD6R3vkGD2BtZyxk0JUV/qVa0gwm9jLj7CRsf8bcPVh?= =?utf-8?q?2ttic7XUDZQL8riD5D+1BprtO0HWtBY6Ms+xDrF534u4u3xgeltVIjyKYbTl6txUn?= =?utf-8?q?D0fISn6LOOyC3ARdHqf2clvBmPglxtHT1Nvh1wx+5vR76i+gDldZSTW0WH6Y6dJFa?= =?utf-8?q?Z468hZkKXnhUjtzYfxf/jhK8jH6ULbrf3bnK45TzSiaYYqpPHXSfJyd52Hmo0UxH6?= =?utf-8?q?n8PpsywR7c/VgIFzXix728Hh12pijAnbMUJDf9Sqzpz3qB/yYiSr6Ny4Ih3t6XlGj?= =?utf-8?q?RZYNI5wFbP4qn7lCG8WMbPc0uyLNeYvSFFzwhiYsGSv8uemHlePtKDwk+xUjEx+Xf?= =?utf-8?q?KAwgXydO4qmRLEvCG0Lr6O7vXVO3hFISxcr48pBR65BwOv2oLnMR31SKNhyvmpoXe?= =?utf-8?q?tMD9lB/o1vP09vTjtsC/KY4Wt+gCO7agtQFoRZzfIMiRvSqLEuqkN5YqoSc+/xeqt?= =?utf-8?q?FtRnLtoe950wqOUrD8zimV+89IV/E9+IfvVmMK2L/vOScyJqFcYW1gC3FUc7NMf4e?= =?utf-8?q?16BvqpVsb/IHHkguQFVAGm9bkrnHSF1UnYvYH44lDdi5jdJWiQAPi6nrW5HiUiMku?= =?utf-8?q?4yR1j2ghmI9LVH5qvjw4zWO55LxvMmZRqr7YT2PLU+YKhLiVAhcF90UqXY4Jfsl09?= =?utf-8?q?cdORQTV+1hKKjcs/a08ADX1mVK9Nw9SL6fxmHVvctB2AsQEYlkmElIMz7kPZwLEXH?= =?utf-8?q?EQVDIYdGKwSpyCEg4iO4aDcRzrfgYiJmwrM81SUv/lNbwcA+Eaoj6I+DQb0MvX4PB?= =?utf-8?q?8Lo6r2B174PLDN+Q1P49Xpq2oI9IQx1VjvXHLtOEwr0OsMr0Bv3OX+Js6k0ueRlGg?= =?utf-8?q?d57Je94HzXHJpnDicILqKrhzbcr3m7YymuXym7Ti4Ug7prs+YHx2Y+eR84Pg8EX0U?= =?utf-8?q?g2EpXpQGSYRaE8+DBGK89/l24E4N6Y61dpWjdtO1Pam5D4YKJteG4Kyew37lQjFrf?= =?utf-8?q?bRe39kzO54sMVfgrIV4W3mGBTOkz5GlGhlU9rVcN3wQP8qvb+CZmjPi7TP3Sa/JNe?= =?utf-8?q?Pe+3K2by8Vpq/K255TYOxiTpNnS9ZdZ4auDAbd0iI6BT/cJnjOBSHjJd2uPYUVyoF?= =?utf-8?q?vKh9K3ByOSlbNzr8u7lsD22s2zZnVZdoEnFfIECiM/kYRnnz7YrUnzGgg1cKIxrGJ?= =?utf-8?q?zhvRCPenyrN4etxyOU6nBG5ofUf8HcuoTVf962pVyodKneY/cZ51vb+VX94vhylSH?= =?utf-8?q?M3qgD3k2zBZsQ5g49nEAImrvL2hQrgzcDa97pEUuZaR/giLWvwCVhFRtX7BFDWBow?= =?utf-8?q?KcpVB3I9OQSxM1IApEjV1IsQLnsTwe75FGo2RbQu5uBFw28kMsttWOMkSdpgeoOFV?= =?utf-8?q?TwbTRBvqvPrh1dothQFT5YTOLy/x7ZoLxd3IeogSDazZaQ8gm6jwJ4HKA2kR3/ehv?= =?utf-8?q?mx04fBZJ5Ri0gUhchlVV2L4YuNofrLMaUlmFTirrBWeGqk6/KDeLOnxyT2k4GmGbe?= =?utf-8?q?OF36tenAHPZtTmhZmR3CDtxHVcAfwW0DbA=3D=3D?= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82969923-988a-4017-b6e8-08da81eb4117 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.6810 (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: sjIHbwPVAZ6ds0yaJtMe5IwHFopEg7HPoRmN64OafBGFbhifSq/OSoJ7Hwzd9g+vxuUq/yA6JfE346yhGlMPcg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6427 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 xz 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 xz bintool tools/binman/btool/xz.py | 31 +++++++++++++++++++++++++++++++ tools/binman/entry.py | 2 +- tools/binman/ftest.py | 2 +- 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 tools/binman/btool/xz.py diff --git a/tools/binman/btool/xz.py b/tools/binman/btool/xz.py new file mode 100644 index 0000000000..e2b413d18b --- /dev/null +++ b/tools/binman/btool/xz.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 xz + +xz allows compression and decompression of files. + +Documentation is available via:: + + man xz +""" + +from binman import bintool + +# pylint: disable=C0103 +class Bintoolxz(bintool.BintoolPacker): + """Compression/decompression using the xz algorithm + + This bintool supports running `xz` 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 xz + """ + def __init__(self, name): + super().__init__(name, fetch_package='xz-utils', + version_regex=r'xz \(XZ Utils\) ([0-9.]+)') diff --git a/tools/binman/entry.py b/tools/binman/entry.py index ae3e94a167..0d4990cf5d 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 = ['bzip2', 'gzip', 'lz4', 'lzma', 'lzo'] + algos = ['bzip2', 'gzip', 'lz4', 'lzma', 'lzo', 'xz'] if algo not in algos: raise ValueError("Unknown algorithm '%s'" % algo) names = {'lzma': 'lzma_alone', 'lzo': 'lzop'} diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 2cac505d8b..b337e2168c 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', 'lzop'] +COMP_BINTOOLS = ['bzip2', 'gzip', 'lz4', 'lzma_alone', 'lzop', 'xz'] class TestFunctional(unittest.TestCase): """Functional tests for binman From patchwork Fri Aug 19 14:00:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1668140 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=rgJNy1hx; 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 4M8Nn63Bfyz1ygd for ; Sat, 20 Aug 2022 00:05:14 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D4E3284BCF; Fri, 19 Aug 2022 16:02:21 +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="rgJNy1hx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D6C0B84B89; Fri, 19 Aug 2022 16:01:23 +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 EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150080.outbound.protection.outlook.com [40.107.15.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 CBA4784B76 for ; Fri, 19 Aug 2022 16:01:05 +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=kqt/xqjyxLpd1HQ6EFp3Hjj5zmDg+JnP4JpixqZnS2JElzK2uyuLSgSTsgys4cS0iNHY7xBx/ecvVppz90mihwZJGI9hcGVS3AW9ghRe2s9yrvnqkBaFFZF3zrXJLkOACeEP/CL1UAXRum/fle5wtlR10o/uGmVVohOd1R4yyJmPaavg0o6gCGGgDqSOfxVV2SHKwPVVC0LnK2sRNaXFDbhcqdYTzUjam/alosUAFyTDeDRs6bx6elTVbZ2zlcDnrHQqZG3cHVWAOmLDYRN8dDXbhv9LLUS47SnRvupurlFok0krXGxYB6IpuX9jv3Yr8Iw53FOtn8Gln/RW11C+ew== 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=jNwM05vniF+gDtlbr0b7/yPr1sU3mR4p1uY9sfWW65Q=; b=egw/GH3JWoKe51lCRvOJg2jat85tnYDPFKWbkrIM87Q+ffgLtaHi8hkOsL1RJZWdaRl51oDuXOVRy7iVgPNX6pPE8bZkgR73GktFnffD4kwKqIeg9eC5LsA8ztfKRzKBGnVtgaIcEivl36KUQr0Hn+C8WMCFuXXj+PK/C8+DPg0HCZXB5nvKOfbHzVJDPD8wevOKDGuF5oHmMX64rYVGLujHbFF9sy7c8YSS5B2o996wFNvDDVniP85/MJ3Z2Bw7aiHPj6Ff+EZeEavGp/k1jNoF++7YJhLDtfUVTSLbTUNlJ4OjcEgaPq4eNL3p6ge/Ia1zpBAlRCoB3hPWSZQyqA== 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=jNwM05vniF+gDtlbr0b7/yPr1sU3mR4p1uY9sfWW65Q=; b=rgJNy1hxvkT+zp9NwdgJcXqMKBlxXNXv+E9+MFtdwp4NsNpUt7L4uoQbKqooXmQ5o7fy3QCScbmolFbQQd1tLhZWmyQwYv6sWsrv5a/GPMBAFoZFax/TBOa/Iu8tGOBt1pGKhI65QYwmAB5IOUrBkNNfupDTR5+n5WbiXgWKH48= 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 DB9PR08MB6427.eurprd08.prod.outlook.com (2603:10a6:10:25a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.18; Fri, 19 Aug 2022 14:01:04 +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:04 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v5 21/21] binman: Add zstd bintool Date: Fri, 19 Aug 2022 16:00:35 +0200 Message-Id: <20220819140035.32760-22-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: 76fb3b67-c004-4384-9c5d-08da81eb4161 X-MS-TrafficTypeDiagnostic: DB9PR08MB6427:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e9F0sI6l4iUCqKkPBEOaA/zRV407ev8IIgsvjcB7e4nGNopKMcZ5s7t8osmYxKeZ3mhErBw0BQ+ccxwvBgZU0vngZkWZBGtAHvMn+MJxpUQfjlsixhptPxa7rKjnWSYZdHMSTikBB9vl7ABsQlRkeYd8+QcYLGARDoEMQpMLxqIPFPZ2yx25HKqoZTptIY0UvsgwsXDy9ILD/0BFRos/WVMrIgrrP6yNb6cbsWPfTF3sNPLHF2IX24v9ofPaO6GAED/QBt/ys9VDQPwh0ool7BJHkicJnMb3WlU74l8N9Bp8AhGFBZlFSp4s8koTGo+5H42gGwQfazw4Nq7DDpPb3m5w0daFZ5aL69jpyWVqEVfYk+2c1ohx21B4CazYblqaXYdfQRfq1K0xZqMKo8nHhI/gcMyN9uzJNyFlx5EZGQc7mv96MOHStBh4Dm3hTPU2O3Y3Tqwy1/oqoiVJljQoz8a1p96RhESzGOIO32ZW1aymlvA5dBXB+HTRBJVp77CkUfmR1OnCr0j53UAtbUC3B9ecQaWi7an8woi/Mt+L+0rWopRYG7enbKkdgunAo1SOc377qChtn3GsNvHjNdgb7xQCDOeIpymqsv2AJsyIqdesYczlUGn/qJxt2H7i0cBC07bLJIP2GF2PrhxokQvcZpN5EzzaQs0u1jaNi1FyWkdzkCNBeFzCZjsIsF4mgV23GkqyhI6vQxubSN0G+w4+LPsDLksLPyP+JwUY8Ws076LJG9TgZAm4TrAXoB4KcZKL27Q65aaSkUMfHk7+zn/n2w== 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)(376002)(366004)(396003)(136003)(346002)(39860400002)(83380400001)(478600001)(38100700002)(38350700002)(54906003)(6916009)(41300700001)(6486002)(316002)(8936002)(5660300002)(1076003)(2616005)(186003)(52116002)(2906002)(6506007)(6666004)(6512007)(26005)(8676002)(4326008)(66476007)(66556008)(86362001)(66946007)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?RtjcTTiCN30Tb5KtshXT6hrdrVKP?= =?utf-8?q?ZXfI9muWDO0IWkH0x9qJJiRR7zgJI2gvjhFp0eTx6A/Jooh7eNaFRk4zwVLsmJaOQ?= =?utf-8?q?O93BBBu6WZl4UDmd8674PcVZpH4Ip6XXvxo71cqPNIEhRhn4G8RLrOaF4oKPj9UFd?= =?utf-8?q?hL9QDZ4liqMHHViDkkZvUwD9kwrYfUe6SZ9vTNGxavIRENZEI/7qsEAnq4rKG1qMc?= =?utf-8?q?xGoIKaYvtjo4n+d4lPUFU85RGm7aD6Be2I0y/fLUf3mdmhTP2n8pJm/ZHAXkKFfJl?= =?utf-8?q?DjjUGKocgY4d8AGvL+/gF7ZYacIi+7SxbvSXPCZngaPs1wUOOwppMI8wP4UTblfYG?= =?utf-8?q?4fhA7M4LBL5ANa581jO+6m2aCNMBtEWI7WBLDkNxc6GEQJ7S4RJJ48cccA21UK6vL?= =?utf-8?q?HILIRH7/35/hxA7Kx2BncztFIcAw0xNrMnGEFgl565eoq1nYtFkimDzV89ByGBNeN?= =?utf-8?q?XiOMBLdn41ljj0EQIgtC9GAzJmBwL67lBa+5g0p9aztWJtfM3oEaO2fRZH1uf0KX9?= =?utf-8?q?RL5wmdKYcLSxKTm926TedOxQ7Ov/9QzdTK33mmiKCx5ONTI1TU/YHk/QepE+2VIIZ?= =?utf-8?q?C7/N0IKCbU6mWlkywnEY0ja2kPS9kSFJ4jgBBjAg13zPhvBNWCVhKEC857/R2xL37?= =?utf-8?q?gz5DuFy69iJ8WKMwCoNU+1Y5t91tG6wNv40rvD7NvWenO8OrxWnUaCVOBGT/QKOWh?= =?utf-8?q?FWuSe8rrZ/BPSdTJtz7hsUBKPU+SfGmDeI+C5l4eYnEtEcTaNY0nRKv1Iy0fZ8l1T?= =?utf-8?q?29dAF+jgn6IeVbTXp0E61xNM3U0zjVMUD4ZXXoURnk2Ns4I04l33rDqreJpDB9wBA?= =?utf-8?q?KXry2PugaYWoR0kBgYvwUUb2ZHka8Qdm3M5FdvBM7IqMzmOLUKUwpNWG7jvReKWgq?= =?utf-8?q?WNa6tdBchx4UU+wuXxF0FNCF16b1DoIm50z8Ccwo8pMydaZhZG1u1MkX9UTtpaXt3?= =?utf-8?q?8n3Q4HRI46vY6vzGRZAKADJr/A7RipdW4EzBZmqm+OYi4mxriwUuEERCRXGj2E7Vn?= =?utf-8?q?3LWNsfjd0muH48uSg0JmG7Zi0cO+gtbqgEWenOj+tPHjlcBmO3zSDAfvkodVzBGTo?= =?utf-8?q?4DPV2nKzu/t7K/Jyz0dA1HjJgbTbYqFFUb21XJaFX6aIDimtiBHxhVwFZYVuLopqC?= =?utf-8?q?/YgyVVQl2Ug9SpltBUXpWsDKcv/7Rg+7s7xwtLuO3kMqUNfFIkV27ib+QtwGpsffT?= =?utf-8?q?yeO5+3B3W6wUi3vw8GMd4VaeLvBrOtgSjZzkoH1vektZXrpXEocbKiKfFJhpGkZQM?= =?utf-8?q?wbkgEqSIbJwrqLILwip6vj8qaKzvQXfNNRyhtAZYRw/jReV7ox3L/HkcChVRGk+v7?= =?utf-8?q?wXYaXiRdDHkhO/Dk9uxUs+JYdSmr8PmkZOfB329dOK0dYhiuGhmxpD6IwB2Deqm4W?= =?utf-8?q?zoaOHhjkwBCnDcIux3GhiHlTjyR2jR8g7Hs4GEDtVAmZhUjr/vgnYUt+DQtEJfUy3?= =?utf-8?q?a4j1QJJCX3GXr6stz4dnSG4jrpPo4sEg0scGMv3AgSqfgbgILIX8PKdxNfudQjgRk?= =?utf-8?q?GZmV5WUgOXBUz5H+BcIKfC56Y4hocuHJ2Q=3D=3D?= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 76fb3b67-c004-4384-9c5d-08da81eb4161 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:04.1497 (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: qitALPlw7rIsv4briPz0e2FrwuuRDdHIiF4J999tXnIWLpWCH7uCPSj4NX38HZbag2tZjyNCEzFYDSToKH8MFA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6427 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 zstd bintool to binman to support on-the-fly compression. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v5: - Test that zstd compress of device-tree files failed - Add algorithm name to entry.py - Add tool name to ftest.py Changes in v2: - Add commit to add zstd bintool tools/binman/btool/zstd.py | 30 +++++++++++++++++++++ tools/binman/entry.py | 2 +- tools/binman/etype/blob_dtb.py | 4 +++ tools/binman/ftest.py | 12 +++++++-- tools/binman/test/238_compress_dtb_zstd.dts | 16 +++++++++++ 5 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 tools/binman/btool/zstd.py create mode 100644 tools/binman/test/238_compress_dtb_zstd.dts diff --git a/tools/binman/btool/zstd.py b/tools/binman/btool/zstd.py new file mode 100644 index 0000000000..299bd37126 --- /dev/null +++ b/tools/binman/btool/zstd.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 zstd + +zstd allows compression and decompression of files. + +Documentation is available via:: + + man zstd +""" + +from binman import bintool + +# pylint: disable=C0103 +class Bintoolzstd(bintool.BintoolPacker): + """Compression/decompression using the zstd algorithm + + This bintool supports running `zstd` 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 zstd + """ + def __init__(self, name): + super().__init__(name) diff --git a/tools/binman/entry.py b/tools/binman/entry.py index 0d4990cf5d..8e4a5e301a 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 = ['bzip2', 'gzip', 'lz4', 'lzma', 'lzo', 'xz'] + algos = ['bzip2', 'gzip', 'lz4', 'lzma', 'lzo', 'xz', 'zstd'] if algo not in algos: raise ValueError("Unknown algorithm '%s'" % algo) names = {'lzma': 'lzma_alone', 'lzo': 'lzop'} diff --git a/tools/binman/etype/blob_dtb.py b/tools/binman/etype/blob_dtb.py index 5a6a454748..6a3fbc4775 100644 --- a/tools/binman/etype/blob_dtb.py +++ b/tools/binman/etype/blob_dtb.py @@ -47,6 +47,10 @@ class Entry_blob_dtb(Entry_blob): def ProcessContents(self): """Re-read the DTB contents so that we get any calculated properties""" _, indata = state.GetFdtContents(self.GetFdtEtype()) + + if self.compress == 'zstd' and self.prepend != 'length': + self.Raise('The zstd compression requires a length header') + data = self.CompressData(indata) return self.ProcessContentsUpdate(data) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index b337e2168c..134301365e 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', 'lzop', 'xz'] +COMP_BINTOOLS = ['bzip2', 'gzip', 'lz4', 'lzma_alone', 'lzop', 'xz', 'zstd'] class TestFunctional(unittest.TestCase): """Functional tests for binman @@ -5797,7 +5797,8 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testCompUtilPadding(self): """Test padding of compression algorithms""" - for bintool in self.comp_bintools.values(): + # Skip zstd because it doesn't support padding + for bintool in [v for k,v in self.comp_bintools.items() if k != 'zstd']: self._CheckBintool(bintool) data = bintool.compress(COMPRESS_DATA) self.assertNotEqual(COMPRESS_DATA, data) @@ -5805,6 +5806,13 @@ fdt fdtmap Extract the devicetree blob from the fdtmap orig = bintool.decompress(data) self.assertEquals(COMPRESS_DATA, orig) + def testCompressDtbZstd(self): + """Test that zstd compress of device-tree files failed""" + with self.assertRaises(ValueError) as e: + self._DoTestFile('238_compress_dtb_zstd.dts') + self.assertIn("Node '/binman/u-boot-dtb': The zstd compression " + "requires a length header", str(e.exception)) + if __name__ == "__main__": unittest.main() diff --git a/tools/binman/test/238_compress_dtb_zstd.dts b/tools/binman/test/238_compress_dtb_zstd.dts new file mode 100644 index 0000000000..90cf85d1e2 --- /dev/null +++ b/tools/binman/test/238_compress_dtb_zstd.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot { + }; + u-boot-dtb { + compress = "zstd"; + }; + }; +};