| Message ID | 20200418000905.239056-1-sjg@chromium.org |
|---|---|
| Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=fwCcAdQO; 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 RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 493td874P9z9sSg for <incoming@patchwork.ozlabs.org>; Sat, 18 Apr 2020 10:10:04 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3818781D42; Sat, 18 Apr 2020 02:09:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="fwCcAdQO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AF4BB81CFA; Sat, 18 Apr 2020 02:09:26 +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=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-io1-xd43.google.com (mail-io1-xd43.google.com [IPv6:2607:f8b0:4864:20::d43]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 58F3E81CFA for <u-boot@lists.denx.de>; Sat, 18 Apr 2020 02:09:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd43.google.com with SMTP id o127so4338957iof.0 for <u-boot@lists.denx.de>; Fri, 17 Apr 2020 17:09:12 -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:mime-version :content-transfer-encoding; bh=oDLbtPNFH8Cefv5U6kLa4kpwPBwyk9hJL4Gbx7A28vg=; b=fwCcAdQOLT976bGnfuldgLD4tYDW0eI4tibGqhhUdbZ6BKF964346S7N/0r1/Rrezl nzVbt9v/Io5EFnD09KnVWgkNanC24jzzkgmx49nOUAUdK5FUqzECg9Hrn7laCDXuifwf +EZZtpvDN273FQE08hugcNb5Hi6bWu+qCKENk= 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:mime-version :content-transfer-encoding; bh=oDLbtPNFH8Cefv5U6kLa4kpwPBwyk9hJL4Gbx7A28vg=; b=bjoTzMA6vV0zKP4k5Iz4BIAOHBhX7LvwOP1kUsBYx/dqWYJCylQGXGj0Z/whl171gK z+Im1J68N9/zop/XH17sSWZJoS3PXALqWXAvcNS2jQep1VDv1O92Ja4/+U6oG9gr47WF ejhVIbV7jypqnYNpQ5WoVSRAIZsBldMv64zqRwnqSj8FlAd1j0T9ED0KN2XYzMNryc3+ 9pf7iXynO4zN1zEHrlW0Ggr5IVlb41OPt2uJmo85yVLMfzzDj4WOYK585YY1rvmvomDd 7owTLn+2A8bjte4P3wMl4KoQHFTLwMiVRKkV1KIghr2Jod1PLCg2qnwQGfbuAg10JnMt 90JQ== X-Gm-Message-State: AGi0Pubq4qQHLrczhYmim+60exyhaT2Y3ngyYre4j/lFo33TfEFM1OAP ZhBBiMq5nUglKLU2hAzkYBhp3AlrtXwEdQ== X-Google-Smtp-Source: APiQypL99+VfSkWGZGscqiDwfmfpg/qFrVbnDXpyypVvJprlZiTd/joB9RLXsbXypLQGn2zP/XJyTw== X-Received: by 2002:a05:6638:5ad:: with SMTP id b13mr5655856jar.113.1587168550343; Fri, 17 Apr 2020 17:09:10 -0700 (PDT) Received: from localhost.localdomain (c-73-14-175-90.hsd1.co.comcast.net. [73.14.175.90]) by smtp.gmail.com with ESMTPSA id u7sm872834ilc.40.2020.04.17.17.09.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2020 17:09:09 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Stephen Warren <swarren@wwwdotorg.org>, Stephen Warren <swarren@nvidia.com>, Sean Anderson <seanga2@gmail.com>, Tom Rini <trini@konsulko.com>, Mike Frysinger <vapier@chromium.org>, Masahiro Yamada <yamada.masahiro@socionext.com>, Simon Glass <sjg@chromium.org>, Baruch Siach <baruch@tkos.co.il>, Bin Meng <bmeng.cn@gmail.com>, Chris Packham <judge.packham@gmail.com>, Fabio Estevam <festevam@gmail.com>, Heiko Schocher <hs@denx.de>, Heinrich Schuchardt <xypron.glpk@gmx.de>, Jagan Teki <jagan@amarulasolutions.com>, Kever Yang <kever.yang@rock-chips.com>, Markus Klotzbuecher <mk@mkio.de>, Masahiro Yamada <masahiroy@kernel.org> Subject: [PATCH v2 00/14] tools: patman: Convert Python tools to use absolute imports Date: Fri, 17 Apr 2020 18:08:51 -0600 Message-Id: <20200418000905.239056-1-sjg@chromium.org> X-Mailer: git-send-email 2.26.1.301.g55bc3eb7cb9-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean |
| Series |
tools: patman: Convert Python tools to use absolute imports
|
expand
|
At present the Python tools use relative paths to find modules they use from another tool. This means we need to adjust the sys.path variable at times. It also makes installing the tools (with python setup.py install) more difficult, since once installed the path of the executable (e.g. /usr/bin) is not the same as where the modules are installed (e.g. /usr/local/lib/python3.6/dist-packages). It is better to use absolute paths. This series makes this adjustment, with 'tools/' as the base directory. Once the tools are installed, things work correctly. Changes in v2: - Expand to convert all Python tools in U-Boot Simon Glass (14): patman: Rename the main module rmboard: Move to Python 3 patman: Drop references to __future__ patman: Drop Python 2 StringIO code buildman: Rename the main module dtoc: Rename the main module binman: Rename the main module Add a 'make tcheck' option to test tools patman: Drop the python2 code in test coverage patman: Move test running/reporting to test_util buildman: Move to absolute imports binman: Move to absolute imports patman: Move to absolute imports patman: Tidy up sys.path changes Makefile | 6 +- test/run | 26 ++-- tools/binman/binman | 2 +- tools/binman/cbfs_util.py | 8 +- tools/binman/cbfs_util_test.py | 12 +- tools/binman/control.py | 20 ++- tools/binman/elf.py | 8 +- tools/binman/elf_test.py | 10 +- tools/binman/entry.py | 22 +-- tools/binman/entry_test.py | 12 +- tools/binman/etype/__init__.py | 0 tools/binman/etype/_testing.py | 6 +- tools/binman/etype/blob.py | 8 +- tools/binman/etype/blob_dtb.py | 6 +- tools/binman/etype/blob_named_by_arg.py | 4 +- tools/binman/etype/cbfs.py | 10 +- tools/binman/etype/cros_ec_rw.py | 2 +- tools/binman/etype/fdtmap.py | 10 +- tools/binman/etype/files.py | 8 +- tools/binman/etype/fill.py | 6 +- tools/binman/etype/fmap.py | 10 +- tools/binman/etype/gbb.py | 8 +- tools/binman/etype/image_header.py | 4 +- tools/binman/etype/intel_cmc.py | 4 +- tools/binman/etype/intel_descriptor.py | 4 +- tools/binman/etype/intel_fit.py | 2 +- tools/binman/etype/intel_fit_ptr.py | 2 +- tools/binman/etype/intel_fsp.py | 4 +- tools/binman/etype/intel_fsp_m.py | 4 +- tools/binman/etype/intel_fsp_s.py | 4 +- tools/binman/etype/intel_fsp_t.py | 4 +- tools/binman/etype/intel_ifwi.py | 8 +- tools/binman/etype/intel_me.py | 4 +- tools/binman/etype/intel_mrc.py | 4 +- tools/binman/etype/intel_refcode.py | 4 +- tools/binman/etype/intel_vbt.py | 4 +- tools/binman/etype/intel_vga.py | 4 +- .../etype/powerpc_mpc85xx_bootpg_resetvec.py | 4 +- tools/binman/etype/section.py | 10 +- tools/binman/etype/text.py | 6 +- tools/binman/etype/u_boot.py | 4 +- tools/binman/etype/u_boot_dtb.py | 4 +- tools/binman/etype/u_boot_dtb_with_ucode.py | 10 +- tools/binman/etype/u_boot_elf.py | 8 +- tools/binman/etype/u_boot_img.py | 4 +- tools/binman/etype/u_boot_nodtb.py | 4 +- tools/binman/etype/u_boot_spl.py | 7 +- tools/binman/etype/u_boot_spl_bss_pad.py | 10 +- tools/binman/etype/u_boot_spl_dtb.py | 4 +- tools/binman/etype/u_boot_spl_elf.py | 4 +- tools/binman/etype/u_boot_spl_nodtb.py | 4 +- .../binman/etype/u_boot_spl_with_ucode_ptr.py | 6 +- tools/binman/etype/u_boot_tpl.py | 7 +- tools/binman/etype/u_boot_tpl_dtb.py | 4 +- .../binman/etype/u_boot_tpl_dtb_with_ucode.py | 5 +- tools/binman/etype/u_boot_tpl_elf.py | 4 +- .../binman/etype/u_boot_tpl_with_ucode_ptr.py | 10 +- tools/binman/etype/u_boot_ucode.py | 6 +- tools/binman/etype/u_boot_with_ucode_ptr.py | 12 +- tools/binman/etype/vblock.py | 6 +- tools/binman/etype/x86_reset16.py | 4 +- tools/binman/etype/x86_reset16_spl.py | 4 +- tools/binman/etype/x86_reset16_tpl.py | 4 +- tools/binman/etype/x86_start16.py | 4 +- tools/binman/etype/x86_start16_spl.py | 4 +- tools/binman/etype/x86_start16_tpl.py | 4 +- tools/binman/fdt_test.py | 8 +- tools/binman/fmap_util.py | 2 +- tools/binman/ftest.py | 49 ++++--- tools/binman/image.py | 18 ++- tools/binman/image_test.py | 2 +- tools/binman/{binman.py => main.py} | 110 ++++----------- tools/binman/state.py | 10 +- tools/buildman/builder.py | 12 +- tools/buildman/builderthread.py | 4 +- tools/buildman/buildman | 2 +- tools/buildman/control.py | 20 +-- tools/buildman/func_test.py | 18 +-- tools/buildman/{buildman.py => main.py} | 27 ++-- tools/buildman/test.py | 23 ++-- tools/buildman/toolchain.py | 8 +- tools/dtoc/dtb_platdata.py | 6 +- tools/dtoc/dtoc | 2 +- tools/dtoc/fdt.py | 4 +- tools/dtoc/fdt_util.py | 4 +- tools/dtoc/{dtoc.py => main.py} | 10 +- tools/dtoc/test_dtoc.py | 12 +- tools/dtoc/test_fdt.py | 17 +-- tools/genboardscfg.py | 3 +- tools/moveconfig.py | 8 +- tools/patman/checkpatch.py | 8 +- tools/patman/command.py | 5 +- tools/patman/func_test.py | 15 +-- tools/patman/get_maintainer.py | 5 +- tools/patman/gitutil.py | 12 +- tools/patman/{patman.py => main.py} | 27 ++-- tools/patman/patchstream.py | 8 +- tools/patman/patman | 2 +- tools/patman/project.py | 2 +- tools/patman/series.py | 12 +- tools/patman/settings.py | 13 +- tools/patman/terminal.py | 2 - tools/patman/test.py | 10 +- tools/patman/test_util.py | 125 ++++++++++++++++-- tools/patman/tools.py | 6 +- tools/patman/tout.py | 4 +- tools/rmboard.py | 7 +- 107 files changed, 529 insertions(+), 544 deletions(-) delete mode 100644 tools/binman/etype/__init__.py rename tools/binman/{binman.py => main.py} (54%) rename tools/buildman/{buildman.py => main.py} (76%) rename tools/dtoc/{dtoc.py => main.py} (94%) rename tools/patman/{patman.py => main.py} (93%)