From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5CA3BECAAD1 for ; Thu, 1 Sep 2022 06:20:57 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4AE7A84223; Thu, 1 Sep 2022 08:20: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="iA5i0eD+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id ADFDB848F8; Thu, 1 Sep 2022 08:20:53 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20055.outbound.protection.outlook.com [40.107.2.55]) (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 EB645841EF for ; Thu, 1 Sep 2022 08:20:50 +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=haaxfzsy5gLLcm0v6LMYp/WnV9eaL+vyxTBm8qWVXpyNcTo4Te2yAAVoLehQp2vOjlOVFrJCxEzhU2vIhls7Zx5C/bHJxrh+1XC+iJwvUyQp6TDkBVKqm15sPC7UifuqIAfACA5frDFo1fCzkPWlwld7mGzIErP7dRW0TeU+CaQqiK2y8fQe7s5RLbBu9NNiri0216STQ7b/xSMoFhp79LsNBDhnSjPY04LfW7AI2pmPa00vpd4AETSGWbNXe5TLI7g6Om/UTnOkDFp4hZ8VOcpofV8VeT84fZYER0qF5RbTvNXI9++XqJY/+D0zVv7T3x7RBW/uLkom51sZ+9itwQ== 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=cU/1umhTNjn1Oq3OAcD+UxFydSl5ZV66TYU84mogUD0=; b=nCaoRIqSk0VteBG307yCFqK1xyYSmeMpaliArqD+Vx+ucEFr65CumFdF83v+bdmbqjdvrRM9nVxERjYc8MQ0v9T1VQ0nJw5dmGcpkygz6I9NUerVA7WBbLz6ItbKg43LoqV8JoSs8Ux9xcG04V8rr1idvkbB0rMYJcsNb961qr8q2z3IjIRl9fpnRGPkG3REnTv++TC/5rZGHSLNkPQnxzEMRdKV65xuKeqwHTmucDbUIhyePNalDxDeJ1ZAkP1feRHJLXc/bwGTuyXXR+ecU8OG7wZk21CffpxxGes8lPQqu1nyPBmKJ3WpB308kJTpK/7XnU57/RngQNUPv9sqvQ== 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=cU/1umhTNjn1Oq3OAcD+UxFydSl5ZV66TYU84mogUD0=; b=iA5i0eD+/z7steYEejuyXGKObaCIQux7HhIGOU1TOqRcF1xkj/8+jjEC3Y7lgLFheaXvkijDoU0ALJcrf5nu7LhgJshcoUPQHWZmkyqnbwhrz0qy5iPq4sV59bwDD9aEOa69a8IG57J1GtrEIiTMofq2K6UuOQJfPhOltKROEac= 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 AS8PR08MB6230.eurprd08.prod.outlook.com (2603:10a6:20b:29d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.11; Thu, 1 Sep 2022 06:20:49 +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.5566.021; Thu, 1 Sep 2022 06:20:49 +0000 Message-ID: Date: Thu, 1 Sep 2022 08:20:47 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.13.0 Subject: Re: [PATCH v2 4/7] binman: bintool: parametrize parameter to pass to binary for returning version Content-Language: en-US To: Simon Glass , Quentin Schulz Cc: Alper Nebi Yasak , Stefan Herbrechtsmeier , U-Boot Mailing List , Quentin Schulz References: <20220831173936.150114-1-foss+uboot@0leil.net> <20220831173936.150114-4-foss+uboot@0leil.net> From: Stefan Herbrechtsmeier In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: AS9PR06CA0390.eurprd06.prod.outlook.com (2603:10a6:20b:460::35) 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: a092471f-f471-4dfd-643c-08da8be21d43 X-MS-TrafficTypeDiagnostic: AS8PR08MB6230:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /2lvRAM4aUYUyyNOIjVIj+bi7US0PIVEM+YqAHJkl3dhlt8BDeBCcbh7Q2slDJDbn/jxemYygO2SSUSz3co5gbXlMaUsOHZLvuAJokfpe1WIGqntO5Zotg6EPeHNeFiwmpVeZdjlEdYLA84mMF7LsJEdQaDwT67NP5tEx3hRdoTX+GixcIaBj94j23npW6L8UXRzGkohv7T7B3cM66osOAjG0BCYkCJq/+U+pEJCT+bMtqvVog0YTPpc69NJkVdMfbAXKKEPIcdDIeqVrsGrU5Eke5WRw0YvxihaOI+MXY9dVSCdQC0/BKl17VrB2A01NQxcsE/wHAXbh0nWKgfQhG4bzJTXCAhqa2dgn5j3H2kX9W/Uf2N6hixKjPVhmj6nNbFZjaY20RlV160RiS3CYr4PnhQwuYjJrhGRMWYmN7whaWi7z/qJdqdFW5+OfrVuh55n7dIe7yybZDLd8DoI1EPLl3Lenyd7tl4OwCYp/cr8+IjHUvuhLmqfb26L+lfULonlckoYu2hNZ7ryboEpcyb1dmTRdM9RxNI0aJqgpHJYC/rPCwL4S9dqYhRpCssAasLjSLOpvv5tCOrCNzRiETXiu+N6NhX7o2fuHOy90uchDeGUkxs9SolzcE9ervcdLq7l6el4yGsCzcaGaXtaHqsw5HaSkt+Kn3PDlHYVWuSUsuCo8/cYNZbfU19LKoF0WR9BtF5/P+GryzAazYtZoRuo+eRBNWJQ+fIvbvpGT8bGDqwiCij6lqo/HkzeEcWFe6HLSqA5Lc2aZOKexf8csvEBbqsZOTWtHT3qmutSuP8RJItM6+hvjzyXUuuiKWHs/1HkVSvoOfRV4ju0wYEq/g== 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)(366004)(396003)(376002)(136003)(346002)(2616005)(86362001)(31696002)(186003)(41300700001)(8936002)(5660300002)(2906002)(6512007)(52116002)(6506007)(26005)(38350700002)(38100700002)(83380400001)(54906003)(36756003)(478600001)(66946007)(6486002)(31686004)(66556008)(66476007)(8676002)(4326008)(316002)(110136005)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OGFnYmpKNjhtbS9MMElHdUtPZlVwUmsxZmVJRGtJaE50R1U1MHE0NmJ4M3Vl?= =?utf-8?B?WUZIOUZVTWJZWVBST0U3eDkyTmUxTzl2MVc4UHBHSjl0VDQ4U1ZjVkhTWWVm?= =?utf-8?B?VmZib3VXa2tyTTRVMTBLTnpiUXZTbjlMVmVKUXFwZnBQQnlLYzUzKytVdGRr?= =?utf-8?B?Q1l1bkdEOUdVWnIzbXJDVzJpaU0zdm95ZzB6NHVkYlVkQWNjTjVtL1lINWoz?= =?utf-8?B?eDRTc3FDZTVCMitwZnZTUU5zaGw4cnlKMXk0VHNkL1FZclhSL0pxQzZRYlIv?= =?utf-8?B?a0E1cnhJVnMremtQbFkzUjFDV0c4WGhFV3dJaGs1bTBCWU9KRVk3TFlYSHZ6?= =?utf-8?B?ckdrdGZOd00yNENhQS8vOFBJbkt6bjFkbkdaV1RpQXlnRFd6RW0zV2h3ZFRW?= =?utf-8?B?RXRLUHgyUlVLTnl6WGVOWk4wb0hFRlI5QnR5dmliUVhBZmM1WjR0VyttYUZ3?= =?utf-8?B?Q29KUGYwZkRLVE5tSldSTU9mYWlSYlplbUphdkFST0RTVDB2NEx6bGxiVUpF?= =?utf-8?B?ZWxSV2RMdUJTR0t5YjV2aUxWOXZaWW5XckNvUWZTVGNLU28xdmNiNmFuNHpw?= =?utf-8?B?d2FTU08vQWZnVUFSSjR2Z25vRXJrVy8rUVhaWDhLZ3JXZFZQRkU1SFBiazVp?= =?utf-8?B?NXVuNkJHUjVFR3llVTlIVzVzTVFRK1JqdS9paWlWZHZLdndFV2xkWGFBTzBM?= =?utf-8?B?NWhaTHMwYklwalg3dVB2c1lkRXZlbThOaE9GdzNlS0RFSzhIcUVjNGIzTSs2?= =?utf-8?B?WTh6WW8rUEdieHN6S1Z4MlpLYXJYWnZMQWJ1ZW5URUE1aGVYK2daY2xvRlpO?= =?utf-8?B?WnRHUlZiQmRPWjFaaDJqTVU2U1J1VzBYR0lXN2RxYi9GOXRWUUJOMmRZdDFq?= =?utf-8?B?T2RITGU4M1UwMnNUWHNVSmpaMzRYUTZKUTVjOXprRVkrTmY4K2FBdWkyb1ZX?= =?utf-8?B?TjNCcVdPSDRRTlJIdG9hL1QvbUFRa245dHFuaW1UekdVVVlNRUx5dXJ6eXVX?= =?utf-8?B?VTVNTkVxVm5BUHdFbG5MNzRrQUdyK0ZTUmdxcXhjcGNFNEt0bnNHdkpweHA3?= =?utf-8?B?N3dpZGtYYUpUbmYwZGVHMEdZUkpIbUI1WkZiMWVuL2JGOUhzUXJCSi9BNzNz?= =?utf-8?B?SXFGYmgxM3ZVSWptWHU3WVZ2dUk3ZWZjQkNFaThzUUNBa1ZLSXZQNzBxUnp0?= =?utf-8?B?T3NGdUVxV3MrODI3V0ovb3pnTk0yYkw1YXBUY0dFTzVCUklDV08wTXFFZzZo?= =?utf-8?B?V3Q3SVgxQ1FGZW53cGczVTZORWJPYVJ3Z1pKWVcveGhIZkd2UEloaExmaUFR?= =?utf-8?B?Y3ZmMmk1MVFLNTh1Z3o3cWNSUE1uTFk5ekdGMjJnTit0T2h3VmhJMW1uZTlO?= =?utf-8?B?SjhlbEJ1WTlYemUrbXRVUmdOSkllRGU4N2RTczVBRi9jZWZwYW5SY201cWNU?= =?utf-8?B?K201YjRqNzNGTzNFVTY1MHE0UHVwWnZPenFSdEs1K1R4SWpaeUYveWMxVC85?= =?utf-8?B?U1lubXprN1h4TXdMMXdxcnpHbVZCSDZleXFiOURwRGRTWGRNZ0Vtb2N6Z1cw?= =?utf-8?B?MkVEdFhvdTRFblNVZlNFNzBZZXpJajI3UzJhU2pncCtVWlZtYVJ0L1kvWjZl?= =?utf-8?B?NDdrRlQvM09BbSs5SENudUJSOWpoaVJac28waEV2OUhwZWVibHoyWTlqb3BF?= =?utf-8?B?dTNTbXBCd1ZvaWgrU3BvVkk0VEtIam9qeXN2M2tsdDFtMFFsR3NCVkFHTFYy?= =?utf-8?B?NVhsN2swWHY2WDNPTGk5OHBxZldodUxwSHlwWENDT3lwYWhzTUtaZXowU0FC?= =?utf-8?B?cysvajFaR0lsS3lFeFhOMVAvalJxbzBwNWhWbmRhTndaRlhTVkR0V1AydW1w?= =?utf-8?B?VTVJQ0VUTnM1clBBL04wdkxpWVY4VjF3d3FOdlNpLzREZUQwTFFWUThGRFBs?= =?utf-8?B?T29KRTlETSt0MXpQbmNmVmRzd2tXM0dwY2JvQUlqWDdQd2NLRmF1TGtnamJq?= =?utf-8?B?ZnhyRUU3bW45eVd1aldRbWplZGlJaTNmUlNOOWo5WEZKdFBJVFRpWmdpOWpS?= =?utf-8?B?WlZ6UHFFZTFHV0ttQ2VLSXA0Yng0ZDh4d3RrRmNFa3F1cE8vR1hXUUc3M2tl?= =?utf-8?B?TUFyMXlBTHVxTGN6ZzBqTEtoclh6eGdKMGpxR2p0NEdrcE1naWttcitjZzJT?= =?utf-8?B?b3c9PQ==?= X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: a092471f-f471-4dfd-643c-08da8be21d43 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2022 06:20:49.7421 (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: jGa7gbzgq5qQVUhreEyfC2Y6weSjJvkCojEOn3/UMQg9i5DdBFDM2Tz4M5kU5diyMxB4vyH8Y4OwQ1W6wJJZ2Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6230 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 Hi, Am 01.09.2022 um 04:27 schrieb Simon Glass: > Hi Quentin, > > Fix spelling for parametrize > > On Wed, 31 Aug 2022 at 11:39, Quentin Schulz wrote: >> >> From: Quentin Schulz >> >> The code to check the version is very similar between binaries, the most >> likely only needed variables are the regex to find the version (already >> supported) and the parameter to pass to the binary so that it prints >> this version (e.g. --version, -V or similar). >> >> Let's make it a parameter of Bintool so that code duplication can be >> avoided for simple changes. >> >> Signed-off-by: Quentin Schulz >> --- >> >> added in v2 >> >> tools/binman/bintool.py | 9 +++++---- >> 1 file changed, 5 insertions(+), 4 deletions(-) >> >> diff --git a/tools/binman/bintool.py b/tools/binman/bintool.py >> index a156ffb550..77608cec23 100644 >> --- a/tools/binman/bintool.py >> +++ b/tools/binman/bintool.py >> @@ -53,10 +53,11 @@ class Bintool: >> # List of bintools to regard as missing >> missing_list = [] >> >> - def __init__(self, name, desc, version_regex=None): >> + def __init__(self, name, desc, version_regex=None, version_parameters='-V'): > > version_args? > > It is shorter And it will be consistent to the compress_args and decompress_args of the BintoolPacker class. > >> self.name = name >> self.desc = desc >> self.version_regex = version_regex >> + self.version_parameters = version_parameters >> >> @staticmethod >> def find_bintool_class(btype): >> @@ -476,7 +477,7 @@ binaries. It is fairly easy to create new bintools. Just add a new file to the >> >> import re >> >> - result = self.run_cmd_result('-V') >> + result = self.run_cmd_result(self.version_parameters) >> out = result.stdout.strip() >> if not out: >> out = result.stderr.strip() >> @@ -507,9 +508,9 @@ class BintoolPacker(Bintool): >> """ >> def __init__(self, name, compression=None, compress_args=None, >> decompress_args=None, fetch_package=None, >> - version_regex=r'(v[0-9.]+)'): >> + version_regex=r'(v[0-9.]+)', version_parameters='-V'): >> desc = '%s compression' % (compression if compression else name) >> - super().__init__(name, desc, version_regex) >> + super().__init__(name, desc, version_regex, version_parameters) >> if compress_args is None: >> compress_args = ['--compress'] >> self.compress_args = compress_args Regards Stefan