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('