| Message ID | 20211005162036.14627-1-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | f7832ee552b6a54f2bcbde87ff205147930035b8 |
| Delegated to: | Simon Glass |
| Headers | show |
| Series | buildman: Add gcc-11.1.0 to the directory list | expand |
Hi Tom, On Tue, 5 Oct 2021 at 10:20, Tom Rini <trini@konsulko.com> wrote: > > While CI has been using gcc-11.1.0 for a long time, we have not updated > buildman to match. Correct this omission. > > Signed-off-by: Tom Rini <trini@konsulko.com> > --- > tools/buildman/toolchain.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py > index fd137f7300e7..4e2471f3e370 100644 > --- a/tools/buildman/toolchain.py > +++ b/tools/buildman/toolchain.py > @@ -498,7 +498,7 @@ class Toolchains: > if arch == 'aarch64': > arch = 'arm64' > base = 'https://www.kernel.org/pub/tools/crosstool/files/bin' > - versions = ['9.2.0', '7.3.0', '6.4.0', '4.9.4'] > + versions = ['11.1.0', '9.2.0', '7.3.0', '6.4.0', '4.9.4'] > links = [] > for version in versions: > url = '%s/%s/%s/' % (base, arch, version) > -- > 2.17.1 > This seems to break that n900 build: https://source.denx.de/u-boot/custodians/u-boot-dm/-/jobs/336316 Regards, Simon
On Thu, Oct 14, 2021 at 07:05:33PM -0600, Simon Glass wrote: > Hi Tom, > > On Tue, 5 Oct 2021 at 10:20, Tom Rini <trini@konsulko.com> wrote: > > > > While CI has been using gcc-11.1.0 for a long time, we have not updated > > buildman to match. Correct this omission. > > > > Signed-off-by: Tom Rini <trini@konsulko.com> > > --- > > tools/buildman/toolchain.py | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py > > index fd137f7300e7..4e2471f3e370 100644 > > --- a/tools/buildman/toolchain.py > > +++ b/tools/buildman/toolchain.py > > @@ -498,7 +498,7 @@ class Toolchains: > > if arch == 'aarch64': > > arch = 'arm64' > > base = 'https://www.kernel.org/pub/tools/crosstool/files/bin' > > - versions = ['9.2.0', '7.3.0', '6.4.0', '4.9.4'] > > + versions = ['11.1.0', '9.2.0', '7.3.0', '6.4.0', '4.9.4'] > > links = [] > > for version in versions: > > url = '%s/%s/%s/' % (base, arch, version) > > -- > > 2.17.1 > > > > This seems to break that n900 build: > > https://source.denx.de/u-boot/custodians/u-boot-dm/-/jobs/336316 *headdesk* the test hard-codes the toolchain version to add to PATH.
Hi Tom, On Thu, 14 Oct 2021 at 19:12, Tom Rini <trini@konsulko.com> wrote: > > On Thu, Oct 14, 2021 at 07:05:33PM -0600, Simon Glass wrote: > > Hi Tom, > > > > On Tue, 5 Oct 2021 at 10:20, Tom Rini <trini@konsulko.com> wrote: > > > > > > While CI has been using gcc-11.1.0 for a long time, we have not updated > > > buildman to match. Correct this omission. > > > > > > Signed-off-by: Tom Rini <trini@konsulko.com> > > > --- > > > tools/buildman/toolchain.py | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py > > > index fd137f7300e7..4e2471f3e370 100644 > > > --- a/tools/buildman/toolchain.py > > > +++ b/tools/buildman/toolchain.py > > > @@ -498,7 +498,7 @@ class Toolchains: > > > if arch == 'aarch64': > > > arch = 'arm64' > > > base = 'https://www.kernel.org/pub/tools/crosstool/files/bin' > > > - versions = ['9.2.0', '7.3.0', '6.4.0', '4.9.4'] > > > + versions = ['11.1.0', '9.2.0', '7.3.0', '6.4.0', '4.9.4'] > > > links = [] > > > for version in versions: > > > url = '%s/%s/%s/' % (base, arch, version) > > > -- > > > 2.17.1 > > > > > > > This seems to break that n900 build: > > > > https://source.denx.de/u-boot/custodians/u-boot-dm/-/jobs/336316 > > *headdesk* the test hard-codes the toolchain version to add to PATH. It might be a good oppty to put some of its downloads into the docker image? Regards, Simon
On Thu, Oct 14, 2021 at 07:25:24PM -0600, Simon Glass wrote: > Hi Tom, > > On Thu, 14 Oct 2021 at 19:12, Tom Rini <trini@konsulko.com> wrote: > > > > On Thu, Oct 14, 2021 at 07:05:33PM -0600, Simon Glass wrote: > > > Hi Tom, > > > > > > On Tue, 5 Oct 2021 at 10:20, Tom Rini <trini@konsulko.com> wrote: > > > > > > > > While CI has been using gcc-11.1.0 for a long time, we have not updated > > > > buildman to match. Correct this omission. > > > > > > > > Signed-off-by: Tom Rini <trini@konsulko.com> > > > > --- > > > > tools/buildman/toolchain.py | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py > > > > index fd137f7300e7..4e2471f3e370 100644 > > > > --- a/tools/buildman/toolchain.py > > > > +++ b/tools/buildman/toolchain.py > > > > @@ -498,7 +498,7 @@ class Toolchains: > > > > if arch == 'aarch64': > > > > arch = 'arm64' > > > > base = 'https://www.kernel.org/pub/tools/crosstool/files/bin' > > > > - versions = ['9.2.0', '7.3.0', '6.4.0', '4.9.4'] > > > > + versions = ['11.1.0', '9.2.0', '7.3.0', '6.4.0', '4.9.4'] > > > > links = [] > > > > for version in versions: > > > > url = '%s/%s/%s/' % (base, arch, version) > > > > -- > > > > 2.17.1 > > > > > > > > > > This seems to break that n900 build: > > > > > > https://source.denx.de/u-boot/custodians/u-boot-dm/-/jobs/336316 > > > > *headdesk* the test hard-codes the toolchain version to add to PATH. > > It might be a good oppty to put some of its downloads into the docker image? Well, it's the CI files that had been hard-coding the path (I was a bit quick before), and should instead be using the one that's already in the image, yes. So let me fire off something to fix that, and it just needs to be in your tree before the other patch, to preserve bisectability.
On Thu, Oct 14, 2021 at 07:25:24PM -0600, Simon Glass wrote: > Hi Tom, > > On Thu, 14 Oct 2021 at 19:12, Tom Rini <trini@konsulko.com> wrote: > > > > On Thu, Oct 14, 2021 at 07:05:33PM -0600, Simon Glass wrote: > > > Hi Tom, > > > > > > On Tue, 5 Oct 2021 at 10:20, Tom Rini <trini@konsulko.com> wrote: > > > > > > > > While CI has been using gcc-11.1.0 for a long time, we have not updated > > > > buildman to match. Correct this omission. > > > > > > > > Signed-off-by: Tom Rini <trini@konsulko.com> > > > > --- > > > > tools/buildman/toolchain.py | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > Applied to u-boot-dm, thanks!
diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index fd137f7300e7..4e2471f3e370 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -498,7 +498,7 @@ class Toolchains: if arch == 'aarch64': arch = 'arm64' base = 'https://www.kernel.org/pub/tools/crosstool/files/bin' - versions = ['9.2.0', '7.3.0', '6.4.0', '4.9.4'] + versions = ['11.1.0', '9.2.0', '7.3.0', '6.4.0', '4.9.4'] links = [] for version in versions: url = '%s/%s/%s/' % (base, arch, version)
While CI has been using gcc-11.1.0 for a long time, we have not updated buildman to match. Correct this omission. Signed-off-by: Tom Rini <trini@konsulko.com> --- tools/buildman/toolchain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)