From patchwork Fri Jun 28 14:08:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1124284 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="UTftJNcd"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45ZzWm5l5Qz9s3Z for ; Sat, 29 Jun 2019 00:23:15 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id C0571C21E35; Fri, 28 Jun 2019 14:15:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 30EF0C21E53; Fri, 28 Jun 2019 14:10:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AEE40C21DA1; Fri, 28 Jun 2019 14:09:52 +0000 (UTC) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by lists.denx.de (Postfix) with ESMTPS id 7BB45C21DF3 for ; Fri, 28 Jun 2019 14:09:50 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id n5so12753509ioc.7 for ; Fri, 28 Jun 2019 07:09:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=psiiuz2Msa3PH41vNCbjI1b1joe8vT4IBfPnFxYcYvk=; b=UTftJNcdNOeLRWXTKuRDwRxVtVsoLOkh4XA1KByFdQ+Qoa8D/r0VX56aOpjNZaWpqy /nLFIHMbgjgF6nOgre+zLMTWbQc/ec50QKO5sbp2BH0gXN6cZK+FJriQCvAh6XTb+Zkh yltRBj+CGY7Zid0CFbEiAfp2n8sE75wH4b2EA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=psiiuz2Msa3PH41vNCbjI1b1joe8vT4IBfPnFxYcYvk=; b=V84r2+5p0uM6SgicUTRSlTkZbFF8j4GwPj5OG6udr6YQn+s/Q+U1JXECFnbAd+evRt KtSC50mq2AwOfd2j6OGT1oEClNG6Msvlf9Mdt/h3Q139xDslgniTbqK+ErgbP95F4s42 cXlzdK7FJwnyZ8xlLN7Dl4WQy7WMjdIhYzfANH8ycdaKCmR8Yt8mYFXwJf8wh6j+ZD1g UgSXNMbCZWm+drRlJoqwkioTJF3sS+gbpW7Xp2nj+o1zMgVCHB/YL5uHEwjtWosgoRbJ pUgGDchxk/WiSxOv6TXpLacycvlsHy+U4RwMySXaYjulwEATAoq4BOLa2fUVnHGtJiPm XcEg== X-Gm-Message-State: APjAAAV6Br2SWGjeyCRdf5O8amU/zzA9FKHzaewcagOa3N2zCJewTn9i HzwRa5oY/1fp+V3pxb4e9+67Mbq4HT4= X-Google-Smtp-Source: APXvYqxGxSgR9IaRfLavCn6xfy0tjVe2AREIMWyr92bb82UONE/bdBrAMgIb1P+otZwvckKPPSzxHw== X-Received: by 2002:a05:6602:218b:: with SMTP id b11mr11660368iob.264.1561730989358; Fri, 28 Jun 2019 07:09:49 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id e26sm2839157iod.10.2019.06.28.07.09.48 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 28 Jun 2019 07:09:49 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Fri, 28 Jun 2019 08:08:50 -0600 Message-Id: <20190628140919.145948-9-sjg@chromium.org> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog In-Reply-To: <20190628140919.145948-1-sjg@chromium.org> References: <20190628140919.145948-1-sjg@chromium.org> MIME-Version: 1.0 Subject: [U-Boot] [PATCH 08/37] patman: Add a way to set the search path for tools X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Sometimes tools can be located by looking in other locations. Add a way to direct the search. Signed-off-by: Simon Glass --- tools/patman/tools.py | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/tools/patman/tools.py b/tools/patman/tools.py index 8e9f22afe8a..0b3049f91f4 100644 --- a/tools/patman/tools.py +++ b/tools/patman/tools.py @@ -24,6 +24,8 @@ chroot_path = None # Search paths to use for Filename(), used to find files search_paths = [] +tool_search_paths = [] + # Tools and the packages that contain them, on debian packages = { 'lz4': 'liblz4-tool', @@ -154,26 +156,56 @@ def Align(pos, align): def NotPowerOfTwo(num): return num and (num & (num - 1)) -def PathHasFile(fname): +def SetToolPaths(toolpaths): + """Set the path to search for tools + + Args: + toolpaths: List of paths to search for tools executed by Run() + """ + global tool_search_paths + + tool_search_paths = toolpaths + +def PathHasFile(path_spec, fname): """Check if a given filename is in the PATH Args: + path_spec: Value of PATH variable to check fname: Filename to check Returns: True if found, False if not """ - for dir in os.environ['PATH'].split(':'): + for dir in path_spec.split(':'): if os.path.exists(os.path.join(dir, fname)): return True return False def Run(name, *args, **kwargs): + """Run a tool with some arguments + + This runs a 'tool', which is a program used by binman to process files and + perhaps produce some output. Tools can be located on the PATH or in a + search path. + + Args: + name: Command name to run + args: Arguments to the tool + kwargs: Options to pass to command.run() + + Returns: + CommandResult object + """ try: - return command.Run(name, *args, cwd=outdir, capture=True, **kwargs) + env = None + if tool_search_paths: + env = dict(os.environ) + env['PATH'] = ':'.join(tool_search_paths) + ':' + env['PATH'] + return command.Run(name, *args, capture=True, + capture_stderr=True, env=env, **kwargs) except: - if not PathHasFile(name): - msg = "Plesae install tool '%s'" % name + if env and not PathHasFile(env['PATH'], name): + msg = "Please install tool '%s'" % name package = packages.get(name) if package: msg += " (e.g. from package '%s')" % package