From patchwork Tue Aug 16 06:41:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1666694 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=mNhNi45a; 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 4M6M86072Yz1yft for ; Tue, 16 Aug 2022 16:44:38 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C7C7C849E3; Tue, 16 Aug 2022 08:43: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="mNhNi45a"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 58D3A841F4; Tue, 16 Aug 2022 08:42:38 +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-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60053.outbound.protection.outlook.com [40.107.6.53]) (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 0164A84228 for ; Tue, 16 Aug 2022 08:42:30 +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=XzIbvViIModoW39LpxxT5eHQ6l8HsH7B6J9d00cz2enpUD7+nGQtvDHcmZoRdaiRLXWkW7L/0Pe+e0q5EgGlm++z8KBiznkIeeVK4KzwcVURmiervvizO8qCVLjzYqp0Q1sqUBSmS07Ad1+WrEaIseZy1cEu1fG43R/V83LBwtZAlxloMJQhewcEzm/jv8vYDcbfXfDzfVvWa3jDm0+RdiiJMER6gRMYubdiHNGt2JcgwtwTeBiTNzet18JBdjqF822L3uwhX+7DaWqb8O2IOkvW50xGOErFJdycRoHcHGAszGlyFYaVhovla3/gxWF7st8Or5SilrIA/GyMNzULaw== 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=2Cx1bC+Wc2IcXvm8KTfJM/DAhke0WZgO9IQDipi4Ntc=; b=UoxuO4FSrtUPVNhk2cO5tCBQ10MCZhQQursj7ociP0HmvgTbodsCGNKxTI7Z7uujVlEOLFPjNwh6avy+YDHAHKoss4TaqvgZXa8vxey4i1+ICeo4iN+6UjmTneIwpG+zC6XXH7YOm6oWJE3+TfCUwoyRDISK1T8Nis2KlTWZ9bo+j3tH61KC0oScJHmQw1pYWdbKuExZA9d+fOFcImIchIOjqzGmggTSdp9zWK5Uqs3+VSmnjXeoZHxRW5MAPRJWj5Vu0D1SzchEcEJrOdNquMmJFIoT+4MlqgYVbjDLF/AZyg9/O+WDRe5LzG+Y4jAbV7NwOP6g4I2tio4iAkZZuA== 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=2Cx1bC+Wc2IcXvm8KTfJM/DAhke0WZgO9IQDipi4Ntc=; b=mNhNi45afcbAZepxjrz462WX6UulnGfb9anNJc6k/Y54HVFG688R6DD4Qf832magPSs6IAgdWtn5CWOd9gSr70WyjPY6timJmGTlMIn7VHD2zczqA95qvDjz5u2D+0xAInqNG/FAY8J30rHrhX9O1dYdeQBdPOwjDFSQJNqNuzU= 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 DU0PR08MB8662.eurprd08.prod.outlook.com (2603:10a6:10:402::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.11; Tue, 16 Aug 2022 06:42:30 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f95b:2e64:9ee6:4d44]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::f95b:2e64:9ee6:4d44%3]) with mapi id 15.20.5525.011; Tue, 16 Aug 2022 06:42:30 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Alper Nebi Yasak , Simon Glass Subject: [PATCH v3 13/13] binman: Support missing compression tools Date: Tue, 16 Aug 2022 08:41:51 +0200 Message-Id: <20220816064151.9848-13-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220816064151.9848-1-stefan.herbrechtsmeier-oss@weidmueller.com> References: <20220816064151.9848-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-ClientProxiedBy: AS9PR06CA0744.eurprd06.prod.outlook.com (2603:10a6:20b:487::19) 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: 130e6435-e951-4ee3-9950-08da7f527db5 X-MS-TrafficTypeDiagnostic: DU0PR08MB8662:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eYmImg1vbzz/KGPUTaBBmp61aGWRnozi377ZSrQxphBDuoY6yNflKW+imKi+9OK3gOyx1kWAJFh89X5Piwzm7o45w3R/oJvWD/+A9nohGWjhf1R7S7/z2so/ev7c3ITQD/OI+sIMBRlEFWtV+Rat4VPDsnF3XqoDSNtwLOMWirUsOBTSSYi9KXZc3qXVKDkROU1HiVO2f2urtRY1/7Mw50vGomAlKT4i+DWP8n4uK3sv422RbkRc+1thvbdyFIn4KCW5JMaRQLl4iEQKcLnkieGpOReEIrc3EVBJQfJfxNYDI/Zaf0G78RVQOIqYU+ICTynwbnUFgT0zfyMznGakO6lcqynH33lBCBa6QBt/xUEOlXCS7bLcUaArQLhfISEoO1HN3lfsaE+10cvBVWfbRTHYgAcxw0LmaQu4DQpv1dDIkGnLwGKkTJISGCxhJ8BItAJHsVcBlQd00L3ANyAvo03XhPntnwQokyCwGRdPa0PrPZ6i/MbAJ9xtnRqXuhVaErwpkG+d8C7I2UrVq+VIbdBYa+XFGFvjqSlgI7gOWjJY4OEPAZuAw69gKAFzwVPuX118kX4Qxgz6LjVSrhqkZ1O3EPFEnonwlvxWEySxLfLR2senL7zst/zs+/989ay6xmgjlkezkxob5B27WWZaJuZr1yRMmyoqootG8UP5NdiQ1D5IBvaU1AjAv9i+c2/F3pvp4tTzis5/yEbi75/c3/L4riADhpY58CHAdUm/2cBB+fwSZ6Jd2qoEMySPUPRR6royq0W2chpUsadpVqXmpQtGaF6PeOtwG9cAX/SHQnXyrgtEgkZnD4voYm9fM2eO 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)(376002)(39860400002)(136003)(396003)(366004)(316002)(6666004)(41300700001)(52116002)(6506007)(6916009)(54906003)(86362001)(478600001)(6486002)(38100700002)(38350700002)(83380400001)(2616005)(186003)(1076003)(26005)(6512007)(66476007)(66556008)(4326008)(8676002)(66946007)(36756003)(2906002)(8936002)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xW7Gv6+W3UnQNyQcLCV3lkl1A93332gxQGGx8dLgz2YGTysh5aHXwhPwGfOqYWP0miEaUWJK+opz0VjYH1zdnskCtXJyQHhAG+zVUk2Buez2krTezXtZTCh4nA+bAYaFYjSE+oVXIExRKjMc2J495FKlPIa1CL88ceumQ2PHg2ocH6MXB+6AbRNhtx3i8qkIBCNGgLdxpFRuCBVZWcKbW3K3RR1BrBc168FQV9LZXnRnMuK24BF3bMGGi3e0cjxWzcKsylZlONnleriA6e+k+ndS/pF33Mlqpl2wL1XnqXPJ+v0eYA9tSk5PGxGear5hp6l6omlq7Mf0lcxmqEQGemNAWxh1fC3zUHPZMscBNU31NBhYDnheUdM8K1NSgcO5O0SHem/nXPBj4b0AUPyPvDlH2YpPznCjVRfy19zXL2ORm+8dVIH508eHC2QUB7zidWIMaIhZrMjFDxs0DaSNCxZZIuR51c+NiDYg6Lj1wX+d9OHJm1i9nll3uS0l/GOMvvQgidklSy9kZY7eCacc1AwmHt8K5Pr1hEOqVxJZFEuVO/Sbn4RTaLWWzbIIJfBPmCPFYXBMia7rDELzsY8qqfXpeVpICFKVw3Gm+iZBcNADT6/jLyB4hsk3ia6Nhg6LYH4pVdbJFl4rXwQKb/zylES18qNEHlpOcqTpiKcEy6lD1fR9LnmuKzu8YKYUoZsq/VxGgDl0o9dhGLSe08sj4ETs5gJAw9T0YVKWNvkSz1ib9kuLrNI2TBHmnNlawGtLWKv4/tBVelu/Z/lV1vNhOPxRt0E0ip1Jy9gxF2TdKCP89/2K1Z5Ld15rdDRK2VeP9IgsbxDoiqBHEEEjaDbvI88YSUa0KAbS6nKjPWbMInU8WYh5XPZjGgnsXPWcSLZjvJBcyvFiFek08ecv5e1HVC9u2IUyxdqB8Z/T0yJ2nD6l8e1MkySEGSsxsYSOOlmq05qjJwkhMTSy1SHidQu3oh2xCSYqiG6GBgP3RMfJ24KKi5WOiIDIr6yTgbgz2ilWfPdddSpDf/KGWCyswHmNvbUrbHSsr0dn94/dQKHB4H7lhxpF0GNKw0nvULjRK5yTV4pOK7q1havEHIVxmd2u7CNFifH6FKIpAIS0KBZszUizXeE3773+NU3uq2YgOkgKY1dLkVnJUWVuvM9k4zbYUuOmXuUIQ2QY73imdidmSVXlGrLYzIs6Cel66jQ7dInSlZHTZuloLkp2Q5LXDnyjGnrIR2BwlNRRehY8NWVp96WIQEQy1EVIYI5B10ti/nV8xPMd2gy1dzvlYeRii02kpLt9HY6WKSZkwVDB4mSijl9w6F83sAZhVWY71wlZN4938LWqF5Lm/VahRokTlUpuGsTCsRPSmzF1nLVT+EZ2+W4uhvd05mEtnExyg7kBTF2QoT20NFnpv27xYtHRNUbpmJr4vpar+O0p+/FKC2OU3ryGGPIcwMsHeXNuKsb3eoo2YqXPPvavUnERqmRGvLmCjVCT/X59vHTREZTPXPVrwmNmaPHhYvS3deWxrRC7raUvj/mXBSnssbuvxk7lg6VLdH+nvDIoUqwoJE+CXCkMU4WlK7f4gzO1ghv5wpxtttcse03BRlDeDnw8/kEXbPOuVA== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: 130e6435-e951-4ee3-9950-08da7f527db5 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2022 06:42:30.0226 (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: +9TeWE7WCgsHKhwaInwDWnExLU4ED4jdkoezm2TEuimHTDEbzfMwXRlYje+Z5eaDORV4ipDTkEJgoh8JoLkEyw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB8662 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 marking the entry as 'missing'. Signed-off-by: Stefan Herbrechtsmeier --- Changes in v3: - Added tools/binman/entry.py | 4 ++++ tools/binman/ftest.py | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/tools/binman/entry.py b/tools/binman/entry.py index 9ec5811b46..c86b757a4e 100644 --- a/tools/binman/entry.py +++ b/tools/binman/entry.py @@ -1078,7 +1078,11 @@ features to produce new behaviours. """ self.uncomp_data = indata if self.compress != 'none': + if not comp_util.is_present(self.compress): + self.missing = True + return b'' self.uncomp_size = len(indata) + data = comp_util.compress(indata, self.compress) return data diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index a360ebeef5..eac7ccb087 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -2557,6 +2557,14 @@ class TestFunctional(unittest.TestCase): } self.assertEqual(expected, props) + def testCompressMissingBintool(self): + """Test that compress of device-tree files with missing bintool is + supported + """ + data = self.data = self._DoReadFileRealDtb('236_compress_dtb_missing_bintool.dts') + self.assertEqual(U_BOOT_DATA, data[:len(U_BOOT_DATA)]) + dtb_data = data[len(U_BOOT_DATA):] + self.assertEqual(0, len(dtb_data)) def testCbfsUpdateFdt(self): """Test that we can update the device tree with CBFS offset/size info"""