From patchwork Fri Aug 19 14:25: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: 1668168 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=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=UspP7DN3; 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 4M8PHQ1wzzz1yg7 for ; Sat, 20 Aug 2022 00:28:02 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0E75684B68; Fri, 19 Aug 2022 16:26:36 +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="UspP7DN3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A32D284B68; Fri, 19 Aug 2022 16:26:10 +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-eopbgr150088.outbound.protection.outlook.com [40.107.15.88]) (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 5AA1784B86 for ; Fri, 19 Aug 2022 16:26: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=Oe8KUzdwaJF29Q4GfDXt+iwoXsWId7Bi6FpgUGzwAwmksL7miT0sx05UxG6Hoo2fMiGaGJTQOsDasO2FWJuXecNxShJW2Td7Lfv7fEDXXudTVkMbWx5wD+IlTR8Tj0Yv/5Ct8XmRpY2R/3YeDV53083u2D9IHjjQQZx46D7FEWZ88vj6KOP0b6LZPUDN2cf4kLuzDpuPc/gUjCSpjEkRvAptb0fQ5UiYPsEWlXsrvhqID96cjZtM4wCUuaFlmdVnY3lpMgMWfbVc2NmEU+Kd3whwKBNHe37u/ST7/2Yz+9Fr1Kusu5WPBzHqiEidcngmRRVCL658NH2VvSfy2eZdYQ== 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=vpQXkTtejc8B9MSuXlEAaREfNIUZvNI5GsoOlgsN+eY=; b=O+oOPVio9cDKE04L4D5T2UgyL6yCfufmPBUi8MzNHRcvdxPUMZCep0SAZ+xB1Dsm/zqeq8uJDGMDoe1S6JTuL2I4MjeKpgfSSLJS6SrV+sssdh+0FUZrRLip6DobwOFS4rrbJzF3HuB9Jc/pEQoFmAgm91mjDLQtESA4ZEdaOg4MGiINZi6m7uQyYKOm5Fz19FikuBY5mr8EQpi8kh8A48a/Afw8WRobIFpWq0QNXAmQOmxRjke2iXhfyx3pHhHvHYBw8caWhYRk+ywFpn1EXcOYtlDAZtjzFeXl7s6ThBxGmrtbgVNOBo/HakFnzzaCpE8POsPOlBxy0XggJxlN7A== 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=vpQXkTtejc8B9MSuXlEAaREfNIUZvNI5GsoOlgsN+eY=; b=UspP7DN3GTIe6aQbIT7Yz5KGcSaKQ2CWXk9ameH8IgeZ7sHyjsys82s9MlP4I/mZsVqFpZOEl+0ijH0bqdJts/98bGptWZdNelRC/l0a3mQvkz5rA4stniIikvid3EPJgO5ErEa5+oYRRv/6QSTXNk7dw5uVidf4ZN/R/ka8Qtc= 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 PR3PR08MB5739.eurprd08.prod.outlook.com (2603:10a6:102:8e::8) 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:26: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:26:01 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v6 10/21] binman: Remove obsolete compressed data header handling Date: Fri, 19 Aug 2022 16:25:27 +0200 Message-Id: <20220819142538.24847-11-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220819142538.24847-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220819142538.24847-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS4PR10CA0015.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:5dc::11) 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: df719c5e-427d-4554-f1f9-08da81eebdf4 X-MS-TrafficTypeDiagnostic: PR3PR08MB5739:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2Gn8hMVoNEmhCt0NUwBKwx/a90tg2hHA+whfrrOBtbVoYBOUTiIpaVKt59uHN4ab3b5NnLos3D/U6pXIUrGFLJRI4TdtlNaDrQIg+wjPoWRhvcR0CWS9cXOVzr+OIOWIZ+u+D1xM3j208v6Hamp5nXHhLkO5QTscyVajoBu3qtucsS762T6w5pxzk37by2iyAeLmEE13XOh9WjkH+cYw4Uxth12oIpYBFpzKuUhtDeIex8opgPnZpFiJ+A45aeShu2bBbgXXCLAajd1gcTO3o7EBne3Wdjs+gwShzABf9R7qiJMAh0I9bB89gv9dtaZdKWQwJk96BNYt+t5WyA4YKfAjA1a80YFo2xDpPTbjM3R7NRZw8CCoINO5Lq0tC26OOWlwcSSrOIOx2XQ+VBMnmVpSm3Hehjx1vgfVDupPF3/um2XpyMvQmkKrUUyXy09qdSKrtr5pl7Bgx41qzfl9etoi5VQ9/9QDrvLRj/wlVvsDQk2psGvf42NpoOLHNPx8aS7U0fBfcQpI6RfeekxsNrNSnLCMfWJKFSH3rNoS8+cxqDqylJGMX4YEYKZMNq9SJixJHKNBUceP7FFW+2VuUukpEaJmib2V3eJBCGzBHIlKCrXhfGVEjyfEmmAOa4jmUhDFcS+0lAo2ql4gOjJUwvmVZ21Z7t5FiOMYQEMS3Xag6p6tDs1y3HGvPeI/VQcMHPswKK6Z7q+r7/ZWuZyPqAnwkaWy1CTCe3BdUBqrx3GOPEJd1cSnqcwqPZPD3Lpk 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)(396003)(366004)(376002)(136003)(346002)(39860400002)(4326008)(8676002)(66476007)(66946007)(66556008)(54906003)(316002)(6916009)(36756003)(5660300002)(8936002)(2906002)(478600001)(6486002)(41300700001)(6506007)(6666004)(6512007)(26005)(52116002)(2616005)(86362001)(1076003)(38350700002)(38100700002)(83380400001)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: W24Ka+F0XTwSB53OQ3QST5AtPZChdjJ0NrVzWKabibuNsseETquiSNcglFy7RcfWEAaBFCjmhO5CvwrUsCbZaML2MH9wT1cRnkTBPgM/N71A/gg7ccGUCxxBmmzeFFegGgXRUks8dzp9X6eRniQHAdboJXyBhqbojVdp1AEtMdHcRJrtFstnRVZNjVU5Kt/MnYZIwkGom9XfoOHSRd81nTULdRNYr8R2mPYBTxExORFX2fw9hGjhE5BD7QgyFZEmA+RpuXp3qRuG/aWazmHOxiu6zZJicCBSgFWBUX8eiLtkRmPRS1NXSeX4oN3bDwxL0+tkUmG/0thihWCXMgdzxQbV7lCbli5z3NoAVh6Jmn6UYdxdla2F5WjPKTXbzNpBfsK5sK3+gIdbAJOvB88O0wc0I8PenYRqcoKL2Y7uLTHo5+AzmR4lh9YgSclcZ7xo85JKo3Y/8ujav/XVcTnCn3iStNj+87W0gu8tXQKLZrMkmbEnGWnqWyRV0WIczUdVhNmdUCpUb0yEQdV2VTHM0NtHHdeMs6FXtasx0/j5C3GA39rgUDYbPW7nfxwNWdejyss8YYXF3CItxl8prAHDTvn8lAMKn401k6bGPhp3rC9YNhMwpQgL4x//a0DUwGqIexWFtR/n9zuaOYqKOqAcXtSfVDLwRocBypH7RsW/HWnzfVamxGHokQLtzYzzdo8o247nj3LuUp21dR5hBgEdqUw/KrEbLJ2pG3c/QbmMt1H0Q8i2pA5iFHMsg6Qq3pC1rNaFLEkxYNSdAeOOWFUncMMS1UouWU2TRA/tlnRy/o6mbvJUM1QX+jjMnUc0cdKMBu41NwQP5GtD0MCUidrwfFxszFizmzi5thWbTRIXf91LcNNC5c1PGpuOiTFlSmsCOhHMVAXw87qzQWm7eCQ73JFJ9wGy1fI1ae28qWF6778H84bMkbXDZkFWTrO+hF3rtbiNc4xGAVbsHGQhVnNx0yjRwxctv4XAeCtw3QTXVGTAFSkbhEbpUrAjIB/hNcir41OUTmgr+DAZZLKbL6P5dXjWqc+IYQIiYnpAxNNk/CkEvxBWGqoJlyfnvo6xlW7wsNu62ppeYiMNbD3u3YV5LfK3X6GZ8dvBSqNmnZoqGxZ2/Or5bMxfWKf6roeekul/lU6NQulj0X/3RyZ187mGAnYSzD/tqO0i9+Zy3NO1xM4wSJHiq/0H9RogAXucjBnvwc6w7eM2dBdFSU9Ny1hJT4mm+9XsetkM0NgucnxYSpscAKk2RGVFT/aCncMWd2Et2DT2b9GGJ4OvVrJKNBJKkoC0D4UVmVLy9cC1Te5dPz8GcgTIYir/iDY2vq1T4C8fY/be8LWRjaamif7bS69zMjCQypXFDobqask0Yesr/v7j+30GEjYdXseHUU6Y2DjSs8aqrZEe0/eUaEv4cjbe+0UCJd2a26J0ICYu3IJBkJpEFtNueAH3kvMC9CXw+pXkLhFyUoURYPonZOBCSp6Y0SvNV6C3HC6pAwk3vKv/TEe+LHjkquMa450JLry06GMgQcBqkeUNhERlXmNRgEVkTCyLVT9VfHi9uCCKPFLFCFFndoiWnUq7Ly0YY8KFCx3r3nNEfwx9OUlWAbwJCxGymw== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: df719c5e-427d-4554-f1f9-08da81eebdf4 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:26:01.6429 (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: GCC2AlakpwZ1ws1yWIeWHac9XWpzFyDZbcEIV2s2xI6CMlExJew6/RhkvXDggKLIJxhv6xuPtWjOi4l+Rphoqg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR08MB5739 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 Reviewed-by: Simon Glass Reviewed-by: Simon Glass --- (no changes since v5) 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('