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 BDB41C46467 for ; Sat, 7 Jan 2023 21:45:30 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 93A2B85413; Sat, 7 Jan 2023 22:45:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.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=konsulko.com header.i=@konsulko.com header.b="fIaYkIr2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B44A185377; Sat, 7 Jan 2023 22:45:26 +0100 (CET) Received: from mail-qt1-x82c.google.com (mail-qt1-x82c.google.com [IPv6:2607:f8b0:4864:20::82c]) (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 B04A485413 for ; Sat, 7 Jan 2023 22:45:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x82c.google.com with SMTP id a16so4970463qtw.10 for ; Sat, 07 Jan 2023 13:45:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=7838SQ/MrHr01wSRYGJhapwZayjUlJUr8CVyPglCCGw=; b=fIaYkIr2HJ5Y5MdyBcmlOxIOGbRBCil0QxdK0Kaj9esSV1M5EwOXSPQjjilEw7sbnP cleFlsBKm2V10Tp0qosQDsrwkeX1gwuwylyRUc97sFp3dEL/bvG2fmcmj9pn8GwoxVSP p8Tt6CiNdw0wryYAuz0fp+jx6/wl4iAvfrUT0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=7838SQ/MrHr01wSRYGJhapwZayjUlJUr8CVyPglCCGw=; b=bBIoTkzxyf4bDejLlGL4jjtL2RCzRceUbjVM0wuOHAM3ix1CLZLIl7dPHz7479UGe2 uZ83RntIeNootA+v1aMTH76ShfhBs3XHavKtuO4RU5IlvQbJTV9YTtV+ncH07OqTQ1ki k8vDhBo6FDTdcjYVkzRt+2957z+o8oa6VVVOXpaNnG5jkB8fDeudQMQU70fUNwvmrD7w CTQrmEE2dllBWYgWb239j+xlZVRh+Sz/63v29nbChFNWmXcBcfejOOedf+QlrTk17fd9 mJRM4vkQPbsJdf7HWAJ1gmKZtJo/hU7W+oS84IaYbPlBUwKtadCY/emIpK7YbXUUMmRj 24Wg== X-Gm-Message-State: AFqh2kra04/V0EnE71aqQ7pxMPFkgOj10eBL8iRZexjv8wWAWQ7SVNEw 2QNs3t5/Q9aK8ZSkoVrLa4JbBg== X-Google-Smtp-Source: AMrXdXu8htlURTcC9s6oISTlx2dEoWdapbB7a4Ia1R4Lc5q3pkoBY9ZYeQewOwtuWQFJ/MkQ6So5JA== X-Received: by 2002:ac8:7772:0:b0:3a8:22f2:1782 with SMTP id h18-20020ac87772000000b003a822f21782mr70983527qtu.35.1673127920509; Sat, 07 Jan 2023 13:45:20 -0800 (PST) Received: from bill-the-cat (2603-6081-7b00-6400-64a1-0c30-ebd7-ca7b.res6.spectrum.com. [2603:6081:7b00:6400:64a1:c30:ebd7:ca7b]) by smtp.gmail.com with ESMTPSA id r3-20020ac84243000000b003a5430ee366sm2353326qtm.60.2023.01.07.13.45.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Jan 2023 13:45:18 -0800 (PST) Date: Sat, 7 Jan 2023 16:45:16 -0500 From: Tom Rini To: Pali =?iso-8859-1?Q?Roh=E1r?= Cc: Philippe Schenker , Marek Vasut , Simon Glass , u-boot@lists.denx.de Subject: Re: Broken powerpc compilation since commit 141659187667 ("pylibfdt: Fix disable version normalization") Message-ID: <20230107214516.GW3787616@bill-the-cat> References: <20230107212306.ahs2utfjinnnvdu6@pali> <20230107212400.GT3787616@bill-the-cat> <20230107212543.77lnae4hnnw5f6kv@pali> <20230107212805.GU3787616@bill-the-cat> <20230107213625.rj7hhoovi63aajcl@pali> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="KjLTmiIPCbzaFghO" Content-Disposition: inline In-Reply-To: <20230107213625.rj7hhoovi63aajcl@pali> X-Clacks-Overhead: GNU Terry Pratchett 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 --KjLTmiIPCbzaFghO Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Jan 07, 2023 at 10:36:25PM +0100, Pali Roh=E1r wrote: > On Saturday 07 January 2023 16:28:05 Tom Rini wrote: > > On Sat, Jan 07, 2023 at 10:25:43PM +0100, Pali Roh=E1r wrote: > > > On Saturday 07 January 2023 16:24:00 Tom Rini wrote: > > > > On Sat, Jan 07, 2023 at 10:23:06PM +0100, Pali Roh=E1r wrote: > > > >=20 > > > > > Hello! Now I was going to test urgent release workaround/fix for = this > > > > > issue https://lists.denx.de/pipermail/u-boot/2023-January/503900.= html > > > > > but I figured out that I cannot compile u-boot from master branch= for > > > > > powerpc platform. make throws following error: > > > > >=20 > > > > > LDS u-boot.lds > > > > > HOSTLD scripts/dtc/dtc > > > > > Traceback (most recent call last): > > > > > File "scripts/dtc/pylibfdt/setup.py", line 23, in > > > > > from setuptools import setup, Extension, sic > > > > > ImportError: cannot import name 'sic' from 'setuptools' (/usr= /lib/python3/dist-packages/setuptools/__init__.py) > > > > > make[2]: *** [scripts/dtc/pylibfdt/Makefile:33: rebuild] Erro= r 1 > > > > > make[1]: *** [scripts/Makefile.build:398: scripts/dtc/pylibfd= t] Error 2 > > > > > make: *** [Makefile:2031: scripts_dtc] Error 2 > > > > >=20 > > > > > git bisect showed me that problematic commit is one from yesterda= y: > > > > >=20 > > > > > 141659187667 ("pylibfdt: Fix disable version normalization") > > > > >=20 > > > > > Reverting it on top of master branch compiled u-boot for powerpc = without > > > > > issues. > > > > >=20 > > > > > It looks like a bit complicated issue as that commit is fixing an= other > > > > > commit from two weeks before: > > > > >=20 > > > > > 440098c42e73 ("pylibfdt: Fix version normalization warning") > > > > >=20 > > > > > Tom, do you have an idea how to handle this? > > > >=20 > > > > What host distro are you on? > > >=20 > > > On this build machine I have currently Debian 10. > >=20 > > OK, and does undoing the mentioned commit and trying: > > https://github.com/u-boot/u-boot/pull/266/commits/eb76bf5864b53938db639= 867ad5d75893b5a571e > > instead work there? >=20 > I checkout master branch, then I reverted commit 141659187667 and then > I applied a495b8f497dc from github. But it does not work, it throws error: >=20 > LDS u-boot.lds > HOSTCC scripts/dtc/dtc-lexer.lex.o > HOSTCC scripts/dtc/dtc-parser.tab.o > Traceback (most recent call last): > File "scripts/dtc/pylibfdt/setup.py", line 25, in > from packaging import version > ModuleNotFoundError: No module named 'packaging' > make[2]: *** [scripts/dtc/pylibfdt/Makefile:33: rebuild] Error 1 > make[1]: *** [scripts/Makefile.build:398: scripts/dtc/pylibfdt] Error= 2 > make[1]: *** Waiting for unfinished jobs.... > make: *** [Makefile:2031: scripts_dtc] Error 2 Try this, which should just bring us back to printing an annoying but harmless warning: diff --git a/scripts/dtc/pylibfdt/setup.py b/scripts/dtc/pylibfdt/setup.py index c07f65e6bcaf..8baae08770ca 100755 --- a/scripts/dtc/pylibfdt/setup.py +++ b/scripts/dtc/pylibfdt/setup.py @@ -20,12 +20,17 @@ allows this script to be run stand-alone, e.g.: ./pylibfdt/setup.py install [--prefix=3D...] """ =20 -from setuptools import setup, Extension, sic +from setuptools import setup, Extension from setuptools.command.build_py import build_py as _build_py import os import re import sys =20 +try: + from setuptools import sic +except ImportError: + pass + srcdir =3D os.path.dirname(__file__) =20 with open(os.path.join(srcdir, "../README"), "r") as fh: @@ -113,7 +118,10 @@ progname =3D sys.argv[0] files =3D os.environ.get('SOURCES', '').split() cflags =3D os.environ.get('CPPFLAGS', '').split() objdir =3D os.environ.get('OBJDIR') -version =3D os.environ.get('VERSION') +try: + version =3D sic(os.environ.get('VERSION')) +except: + version =3D os.environ.get('VERSION') swig_opts =3D os.environ.get('SWIG_OPTS', '').split() =20 # If we were called directly rather than through our Makefile (which is of= ten @@ -137,7 +145,7 @@ class build_py(_build_py): =20 setup( name=3D'libfdt', - version=3Dsic(version), + version=3Dversion, cmdclass =3D {'build_py' : build_py}, author=3D'Simon Glass', author_email=3D'sjg@chromium.org', --=20 Tom --KjLTmiIPCbzaFghO Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmO55+wACgkQFHw5/5Y0 tyx3DgwAiBZR5a/dtEbS8JV/isymeJbSxq9KC/8tqBUW/ivaUTTEBflKpvHoQ74b 7e7ab3i1wonwkpoaMMzui3F7TI5pc/0CVCRAMBeR7O6y+wpXBsIwLL81TG0SkjGF eVYd0LTPIIBlvZZ7WMNeAM7cVVQlMs+tJJ+Apj4KBc6C6n4WRDocdilfI1A0nplt C9A7QhRDBW8jMq9lridTQ29Ik32T3DvtgpnTuVJ54AQNvBL13yNS3PV0LM7/OuAY xb8YwF2vQKAY7YASuzVTJU1z5mtLwb5dy7a5tIvujpiX8yDzxd6etJzcFULoPdt6 P+8lrjgpnZBmUH371HRXSR/nsivBiPFE/BWBRtGuOdTXdXYrEuEtseYGAC7HUBAc yTt/FyAb+JBbU0j0mBqik4E+J6x7xoESrVdTA2W5BUQaNTDT+qQLNNtBJPHpo9nr Na/EZRMs2OXtyhb18orXaq0lx6u0qAYxiUhyHYs8UGh1QY3xGmScbYU4BQd/V6yJ xqV3ZTBh =Y301 -----END PGP SIGNATURE----- --KjLTmiIPCbzaFghO--