[edk2-devel] [PATCH v4 4/4] BaseTools: Remove ext. gcc dependencies (Linux only)

Oliver Steffen posted 4 patches 3 years, 6 months ago
There is a newer version of this series
[edk2-devel] [PATCH v4 4/4] BaseTools: Remove ext. gcc dependencies (Linux only)
Posted by Oliver Steffen 3 years, 6 months ago
Remove BaseTools/Bin/gcc*_linux_ext_dep.yaml to stop
downloading gcc from external locations; use the
toolchains provided by the container image instead.

The image needs to set the GCC5_*_PREFIX accordingly.

Signed-off-by: Oliver Steffen <osteffen@redhat.com>
---
 BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml  | 21 ------------------
 BaseTools/Bin/gcc_arm_linux_ext_dep.yaml      | 21 ------------------
 .../Bin/gcc_riscv64_unknown_ext_dep.yaml      | 22 -------------------
 3 files changed, 64 deletions(-)
 delete mode 100644 BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
 delete mode 100644 BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
 delete mode 100644 BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml

diff --git a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml b/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
deleted file mode 100644
index ff8a9e868100..000000000000
--- a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-## @file
-# Download GCC AARCH64 compiler from Arm's release site
-# Set shell variable GCC5_AARCH64_INSTALL to this folder
-#
-# This is only downloaded when a build activates scope gcc_aarch64_linux
-#
-# Copyright (c) Microsoft Corporation.
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-##
-{
-  "scope": "gcc_aarch64_linux",
-  "type": "web",
-  "name": "gcc_aarch64_linux",
-  "source": "https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu.tar.xz",
-  "version": "11.2-2022.02",
-  "sha256": "52dbac3eb71dbe0916f60a8c5ab9b7dc9b66b3ce513047baa09fae56234e53f3",
-  "compression_type": "tar",
-  "internal_path": "/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu/",
-  "flags": ["set_shell_var", ],
-  "var_name": "GCC5_AARCH64_INSTALL"
-}
diff --git a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml b/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
deleted file mode 100644
index 151cbfa4b532..000000000000
--- a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-## @file
-# Download GCC ARM compiler from Arm's release site
-# Set shell variable GCC5_ARM_INSTALL to this folder
-#
-# This is only downloaded when a build activates scope gcc_arm_linux
-#
-# Copyright (c) Microsoft Corporation.
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-##
-{
-  "scope": "gcc_arm_linux",
-  "type": "web",
-  "name": "gcc_arm_linux",
-  "source": "https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf.tar.xz",
-  "version": "11.2-2022.02",
-  "sha256": "c254f7199261fe76c32ef42187502839bda7efad0a66646cf739d074eff45fad",
-  "compression_type": "tar",
-  "internal_path": "/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf/",
-  "flags": ["set_shell_var", ],
-  "var_name": "GCC5_ARM_INSTALL"
-}
diff --git a/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml b/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
deleted file mode 100644
index 8abbcd7ba040..000000000000
--- a/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-## @file
-# Download GCC RISCV64 compiler from RISC-V Organization release site
-# Set shell variable GCC5_RISCV64_INSTALL to this folder
-#
-# This is only downloaded when a build activates scope gcc_riscv64_unknown
-#
-# Copyright (c) Microsoft Corporation.
-# Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-##
-{
-  "scope": "gcc_riscv64_unknown",
-  "type": "web",
-  "name": "gcc_riscv64_unknown",
-  "source": "https://raw.githubusercontent.com/riscv/riscv-uefi-edk2-docs/master/gcc-riscv-edk2-ci-toolchain/gcc-riscv-9.2.0-2020.04-x86_64_riscv64-unknown-gnu.tar.xz",
-  "version": "9.2.0",
-  "compression_type": "tar",
-  "sha256": "28373643b69f0ce008273c3dc63f172aa1121952f1b9ae94d7485ac94af7f344",
-  "internal_path": "/gcc-riscv-9.2.0-2020.04-x86_64_riscv64-unknown-gnu",
-  "flags": ["set_shell_var", ],
-  "var_name": "GCC5_RISCV64_INSTALL"
-}
-- 
2.37.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92306): https://edk2.groups.io/g/devel/message/92306
Mute This Topic: https://groups.io/mt/92934464/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v4 4/4] BaseTools: Remove ext. gcc dependencies (Linux only)
Posted by Daniel Schaefer 3 years, 6 months ago
Hi Oliver,

I assume you made sure that the build still works on at least one platform per arch?
For example did you build a RISCV64 platform?

Thanks,
Daniel

On 8/10/22 20:03, Oliver Steffen wrote:
> Remove BaseTools/Bin/gcc*_linux_ext_dep.yaml to stop
> downloading gcc from external locations; use the
> toolchains provided by the container image instead.
> 
> The image needs to set the GCC5_*_PREFIX accordingly.
> 
> Signed-off-by: Oliver Steffen <osteffen@redhat.com>
> ---
>  BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml  | 21 ------------------
>  BaseTools/Bin/gcc_arm_linux_ext_dep.yaml      | 21 ------------------
>  .../Bin/gcc_riscv64_unknown_ext_dep.yaml      | 22 -------------------
>  3 files changed, 64 deletions(-)
>  delete mode 100644 BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
>  delete mode 100644 BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
>  delete mode 100644 BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
> 
> diff --git a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml b/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
> deleted file mode 100644
> index ff8a9e868100..000000000000
> --- a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -## @file
> -# Download GCC AARCH64 compiler from Arm's release site
> -# Set shell variable GCC5_AARCH64_INSTALL to this folder
> -#
> -# This is only downloaded when a build activates scope gcc_aarch64_linux
> -#
> -# Copyright (c) Microsoft Corporation.
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -##
> -{
> -  "scope": "gcc_aarch64_linux",
> -  "type": "web",
> -  "name": "gcc_aarch64_linux",
> -  "source": "https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu.tar.xz",
> -  "version": "11.2-2022.02",
> -  "sha256": "52dbac3eb71dbe0916f60a8c5ab9b7dc9b66b3ce513047baa09fae56234e53f3",
> -  "compression_type": "tar",
> -  "internal_path": "/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu/",
> -  "flags": ["set_shell_var", ],
> -  "var_name": "GCC5_AARCH64_INSTALL"
> -}
> diff --git a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml b/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
> deleted file mode 100644
> index 151cbfa4b532..000000000000
> --- a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -## @file
> -# Download GCC ARM compiler from Arm's release site
> -# Set shell variable GCC5_ARM_INSTALL to this folder
> -#
> -# This is only downloaded when a build activates scope gcc_arm_linux
> -#
> -# Copyright (c) Microsoft Corporation.
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -##
> -{
> -  "scope": "gcc_arm_linux",
> -  "type": "web",
> -  "name": "gcc_arm_linux",
> -  "source": "https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf.tar.xz",
> -  "version": "11.2-2022.02",
> -  "sha256": "c254f7199261fe76c32ef42187502839bda7efad0a66646cf739d074eff45fad",
> -  "compression_type": "tar",
> -  "internal_path": "/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf/",
> -  "flags": ["set_shell_var", ],
> -  "var_name": "GCC5_ARM_INSTALL"
> -}
> diff --git a/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml b/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
> deleted file mode 100644
> index 8abbcd7ba040..000000000000
> --- a/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -## @file
> -# Download GCC RISCV64 compiler from RISC-V Organization release site
> -# Set shell variable GCC5_RISCV64_INSTALL to this folder
> -#
> -# This is only downloaded when a build activates scope gcc_riscv64_unknown
> -#
> -# Copyright (c) Microsoft Corporation.
> -# Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -##
> -{
> -  "scope": "gcc_riscv64_unknown",
> -  "type": "web",
> -  "name": "gcc_riscv64_unknown",
> -  "source": "https://raw.githubusercontent.com/riscv/riscv-uefi-edk2-docs/master/gcc-riscv-edk2-ci-toolchain/gcc-riscv-9.2.0-2020.04-x86_64_riscv64-unknown-gnu.tar.xz ",
> -  "version": "9.2.0",
> -  "compression_type": "tar",
> -  "sha256": "28373643b69f0ce008273c3dc63f172aa1121952f1b9ae94d7485ac94af7f344",
> -  "internal_path": "/gcc-riscv-9.2.0-2020.04-x86_64_riscv64-unknown-gnu",
> -  "flags": ["set_shell_var", ],
> -  "var_name": "GCC5_RISCV64_INSTALL"
> -}


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92335): https://edk2.groups.io/g/devel/message/92335
Mute This Topic: https://groups.io/mt/92934464/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v4 4/4] BaseTools: Remove ext. gcc dependencies (Linux only)
Posted by Oliver Steffen 3 years, 6 months ago
Hi Daniel,

The CI still runs through all jobs successfully.
This includes builds for RiscV64. See the PR:
https://github.com/tianocore/edk2/pull/2935

Thanks,
 Oliver

On Thu, Aug 11, 2022 at 5:34 AM Daniel Schaefer <daniel.schaefer@hpe.com>
wrote:

> Hi Oliver,
>
> I assume you made sure that the build still works on at least one platform
> per arch?
> For example did you build a RISCV64 platform?
>
> Thanks,
> Daniel
>
> On 8/10/22 20:03, Oliver Steffen wrote:
> > Remove BaseTools/Bin/gcc*_linux_ext_dep.yaml to stop
> > downloading gcc from external locations; use the
> > toolchains provided by the container image instead.
> >
> > The image needs to set the GCC5_*_PREFIX accordingly.
> >
> > Signed-off-by: Oliver Steffen <osteffen@redhat.com>
> > ---
> >  BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml  | 21 ------------------
> >  BaseTools/Bin/gcc_arm_linux_ext_dep.yaml      | 21 ------------------
> >  .../Bin/gcc_riscv64_unknown_ext_dep.yaml      | 22 -------------------
> >  3 files changed, 64 deletions(-)
> >  delete mode 100644 BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
> >  delete mode 100644 BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
> >  delete mode 100644 BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
> >
> > diff --git a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
> b/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
> > deleted file mode 100644
> > index ff8a9e868100..000000000000
> > --- a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
> > +++ /dev/null
> > @@ -1,21 +0,0 @@
> > -## @file
> > -# Download GCC AARCH64 compiler from Arm's release site
> > -# Set shell variable GCC5_AARCH64_INSTALL to this folder
> > -#
> > -# This is only downloaded when a build activates scope gcc_aarch64_linux
> > -#
> > -# Copyright (c) Microsoft Corporation.
> > -# SPDX-License-Identifier: BSD-2-Clause-Patent
> > -##
> > -{
> > -  "scope": "gcc_aarch64_linux",
> > -  "type": "web",
> > -  "name": "gcc_aarch64_linux",
> > -  "source": "
> https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu.tar.xz
> ",
> > -  "version": "11.2-2022.02",
> > -  "sha256":
> "52dbac3eb71dbe0916f60a8c5ab9b7dc9b66b3ce513047baa09fae56234e53f3",
> > -  "compression_type": "tar",
> > -  "internal_path":
> "/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu/",
> > -  "flags": ["set_shell_var", ],
> > -  "var_name": "GCC5_AARCH64_INSTALL"
> > -}
> > diff --git a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
> b/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
> > deleted file mode 100644
> > index 151cbfa4b532..000000000000
> > --- a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
> > +++ /dev/null
> > @@ -1,21 +0,0 @@
> > -## @file
> > -# Download GCC ARM compiler from Arm's release site
> > -# Set shell variable GCC5_ARM_INSTALL to this folder
> > -#
> > -# This is only downloaded when a build activates scope gcc_arm_linux
> > -#
> > -# Copyright (c) Microsoft Corporation.
> > -# SPDX-License-Identifier: BSD-2-Clause-Patent
> > -##
> > -{
> > -  "scope": "gcc_arm_linux",
> > -  "type": "web",
> > -  "name": "gcc_arm_linux",
> > -  "source": "
> https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf.tar.xz
> ",
> > -  "version": "11.2-2022.02",
> > -  "sha256":
> "c254f7199261fe76c32ef42187502839bda7efad0a66646cf739d074eff45fad",
> > -  "compression_type": "tar",
> > -  "internal_path":
> "/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf/",
> > -  "flags": ["set_shell_var", ],
> > -  "var_name": "GCC5_ARM_INSTALL"
> > -}
> > diff --git a/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
> b/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
> > deleted file mode 100644
> > index 8abbcd7ba040..000000000000
> > --- a/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
> > +++ /dev/null
> > @@ -1,22 +0,0 @@
> > -## @file
> > -# Download GCC RISCV64 compiler from RISC-V Organization release site
> > -# Set shell variable GCC5_RISCV64_INSTALL to this folder
> > -#
> > -# This is only downloaded when a build activates scope
> gcc_riscv64_unknown
> > -#
> > -# Copyright (c) Microsoft Corporation.
> > -# Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All
> rights reserved.<BR>
> > -# SPDX-License-Identifier: BSD-2-Clause-Patent
> > -##
> > -{
> > -  "scope": "gcc_riscv64_unknown",
> > -  "type": "web",
> > -  "name": "gcc_riscv64_unknown",
> > -  "source": "
> https://raw.githubusercontent.com/riscv/riscv-uefi-edk2-docs/master/gcc-riscv-edk2-ci-toolchain/gcc-riscv-9.2.0-2020.04-x86_64_riscv64-unknown-gnu.tar.xz
> ",
> > -  "version": "9.2.0",
> > -  "compression_type": "tar",
> > -  "sha256":
> "28373643b69f0ce008273c3dc63f172aa1121952f1b9ae94d7485ac94af7f344",
> > -  "internal_path":
> "/gcc-riscv-9.2.0-2020.04-x86_64_riscv64-unknown-gnu",
> > -  "flags": ["set_shell_var", ],
> > -  "var_name": "GCC5_RISCV64_INSTALL"
> > -}
>
>
> 
>
>
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92377): https://edk2.groups.io/g/devel/message/92377
Mute This Topic: https://groups.io/mt/92934464/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [PATCH v4 4/4] BaseTools: Remove ext. gcc dependencies (Linux only)
Posted by Daniel Schaefer 3 years, 5 months ago
Thanks!
ghcr.io/tianocore/containers/fedora-35-test:cea91ec is the container it uses, right?
I used this to build the RISC-V U540 platform in edk2-platforms and can confirm it can still build and boot to shell fine.

Tested-by: Daniel Schaefer <daniel.schaefer@hpe.com>

On 8/11/22 18:49, Oliver Steffen wrote:
> Hi Daniel,
> 
> The CI still runs through all jobs successfully.
> This includes builds for RiscV64. See the PR:
> https://github.com/tianocore/edk2/pull/2935 <https://github.com/tianocore/edk2/pull/2935>
> 
> Thanks,
>  Oliver
> 
> On Thu, Aug 11, 2022 at 5:34 AM Daniel Schaefer <daniel.schaefer@hpe.com <mailto:daniel.schaefer@hpe.com>> wrote:
> 
>     Hi Oliver,
> 
>     I assume you made sure that the build still works on at least one platform per arch?
>     For example did you build a RISCV64 platform?
> 
>     Thanks,
>     Daniel
> 
>     On 8/10/22 20:03, Oliver Steffen wrote:
>     > Remove BaseTools/Bin/gcc*_linux_ext_dep.yaml to stop
>     > downloading gcc from external locations; use the
>     > toolchains provided by the container image instead.
>     >
>     > The image needs to set the GCC5_*_PREFIX accordingly.
>     >
>     > Signed-off-by: Oliver Steffen <osteffen@redhat.com <mailto:osteffen@redhat.com>>
>     > ---
>     >  BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml  | 21 ------------------
>     >  BaseTools/Bin/gcc_arm_linux_ext_dep.yaml      | 21 ------------------
>     >  .../Bin/gcc_riscv64_unknown_ext_dep.yaml      | 22 -------------------
>     >  3 files changed, 64 deletions(-)
>     >  delete mode 100644 BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
>     >  delete mode 100644 BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
>     >  delete mode 100644 BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
>     >
>     > diff --git a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml b/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
>     > deleted file mode 100644
>     > index ff8a9e868100..000000000000
>     > --- a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
>     > +++ /dev/null
>     > @@ -1,21 +0,0 @@
>     > -## @file
>     > -# Download GCC AARCH64 compiler from Arm's release site
>     > -# Set shell variable GCC5_AARCH64_INSTALL to this folder
>     > -#
>     > -# This is only downloaded when a build activates scope gcc_aarch64_linux
>     > -#
>     > -# Copyright (c) Microsoft Corporation.
>     > -# SPDX-License-Identifier: BSD-2-Clause-Patent
>     > -##
>     > -{
>     > -  "scope": "gcc_aarch64_linux",
>     > -  "type": "web",
>     > -  "name": "gcc_aarch64_linux",
>     > -  "source": "https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu.tar.xz <https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu.tar.xz>",
>     > -  "version": "11.2-2022.02",
>     > -  "sha256": "52dbac3eb71dbe0916f60a8c5ab9b7dc9b66b3ce513047baa09fae56234e53f3",
>     > -  "compression_type": "tar",
>     > -  "internal_path": "/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu/",
>     > -  "flags": ["set_shell_var", ],
>     > -  "var_name": "GCC5_AARCH64_INSTALL"
>     > -}
>     > diff --git a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml b/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
>     > deleted file mode 100644
>     > index 151cbfa4b532..000000000000
>     > --- a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
>     > +++ /dev/null
>     > @@ -1,21 +0,0 @@
>     > -## @file
>     > -# Download GCC ARM compiler from Arm's release site
>     > -# Set shell variable GCC5_ARM_INSTALL to this folder
>     > -#
>     > -# This is only downloaded when a build activates scope gcc_arm_linux
>     > -#
>     > -# Copyright (c) Microsoft Corporation.
>     > -# SPDX-License-Identifier: BSD-2-Clause-Patent
>     > -##
>     > -{
>     > -  "scope": "gcc_arm_linux",
>     > -  "type": "web",
>     > -  "name": "gcc_arm_linux",
>     > -  "source": "https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf.tar.xz <https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf.tar.xz>",
>     > -  "version": "11.2-2022.02",
>     > -  "sha256": "c254f7199261fe76c32ef42187502839bda7efad0a66646cf739d074eff45fad",
>     > -  "compression_type": "tar",
>     > -  "internal_path": "/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf/",
>     > -  "flags": ["set_shell_var", ],
>     > -  "var_name": "GCC5_ARM_INSTALL"
>     > -}
>     > diff --git a/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml b/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
>     > deleted file mode 100644
>     > index 8abbcd7ba040..000000000000
>     > --- a/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
>     > +++ /dev/null
>     > @@ -1,22 +0,0 @@
>     > -## @file
>     > -# Download GCC RISCV64 compiler from RISC-V Organization release site
>     > -# Set shell variable GCC5_RISCV64_INSTALL to this folder
>     > -#
>     > -# This is only downloaded when a build activates scope gcc_riscv64_unknown
>     > -#
>     > -# Copyright (c) Microsoft Corporation.
>     > -# Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All rights reserved.<BR>
>     > -# SPDX-License-Identifier: BSD-2-Clause-Patent
>     > -##
>     > -{
>     > -  "scope": "gcc_riscv64_unknown",
>     > -  "type": "web",
>     > -  "name": "gcc_riscv64_unknown",
>     > -  "source": "https://raw.githubusercontent.com/riscv/riscv-uefi-edk2-docs/master/gcc-riscv-edk2-ci-toolchain/gcc-riscv-9.2.0-2020.04-x86_64_riscv64-unknown-gnu.tar.xz <https://raw.githubusercontent.com/riscv/riscv-uefi-edk2-docs/master/gcc-riscv-edk2-ci-toolchain/gcc-riscv-9.2.0-2020.04-x86_64_riscv64-unknown-gnu.tar.xz> ",
>     > -  "version": "9.2.0",
>     > -  "compression_type": "tar",
>     > -  "sha256": "28373643b69f0ce008273c3dc63f172aa1121952f1b9ae94d7485ac94af7f344",
>     > -  "internal_path": "/gcc-riscv-9.2.0-2020.04-x86_64_riscv64-unknown-gnu",
>     > -  "flags": ["set_shell_var", ],
>     > -  "var_name": "GCC5_RISCV64_INSTALL"
>     > -}
> 
> 
>     
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92411): https://edk2.groups.io/g/devel/message/92411
Mute This Topic: https://groups.io/mt/92934464/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v4 4/4] BaseTools: Remove ext. gcc dependencies (Linux only)
Posted by Oliver Steffen 3 years, 5 months ago
Thanks for testing!

-Oliver

On Mon, Aug 15, 2022 at 5:52 AM Daniel Schaefer <daniel.schaefer@hpe.com>
wrote:

> Thanks!
> ghcr.io/tianocore/containers/fedora-35-test:cea91ec is the container it
> uses, right?
> I used this to build the RISC-V U540 platform in edk2-platforms and can
> confirm it can still build and boot to shell fine.
>
> Tested-by: Daniel Schaefer <daniel.schaefer@hpe.com>
>
> On 8/11/22 18:49, Oliver Steffen wrote:
> > Hi Daniel,
> >
> > The CI still runs through all jobs successfully.
> > This includes builds for RiscV64. See the PR:
> > https://github.com/tianocore/edk2/pull/2935 <
> https://github.com/tianocore/edk2/pull/2935>
> >
> > Thanks,
> >  Oliver
> >
> > On Thu, Aug 11, 2022 at 5:34 AM Daniel Schaefer <daniel.schaefer@hpe.com
> <mailto:daniel.schaefer@hpe.com>> wrote:
> >
> >     Hi Oliver,
> >
> >     I assume you made sure that the build still works on at least one
> platform per arch?
> >     For example did you build a RISCV64 platform?
> >
> >     Thanks,
> >     Daniel
> >
> >     On 8/10/22 20:03, Oliver Steffen wrote:
> >     > Remove BaseTools/Bin/gcc*_linux_ext_dep.yaml to stop
> >     > downloading gcc from external locations; use the
> >     > toolchains provided by the container image instead.
> >     >
> >     > The image needs to set the GCC5_*_PREFIX accordingly.
> >     >
> >     > Signed-off-by: Oliver Steffen <osteffen@redhat.com <mailto:
> osteffen@redhat.com>>
> >     > ---
> >     >  BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml  | 21
> ------------------
> >     >  BaseTools/Bin/gcc_arm_linux_ext_dep.yaml      | 21
> ------------------
> >     >  .../Bin/gcc_riscv64_unknown_ext_dep.yaml      | 22
> -------------------
> >     >  3 files changed, 64 deletions(-)
> >     >  delete mode 100644 BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
> >     >  delete mode 100644 BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
> >     >  delete mode 100644 BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
> >     >
> >     > diff --git a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
> b/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
> >     > deleted file mode 100644
> >     > index ff8a9e868100..000000000000
> >     > --- a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
> >     > +++ /dev/null
> >     > @@ -1,21 +0,0 @@
> >     > -## @file
> >     > -# Download GCC AARCH64 compiler from Arm's release site
> >     > -# Set shell variable GCC5_AARCH64_INSTALL to this folder
> >     > -#
> >     > -# This is only downloaded when a build activates scope
> gcc_aarch64_linux
> >     > -#
> >     > -# Copyright (c) Microsoft Corporation.
> >     > -# SPDX-License-Identifier: BSD-2-Clause-Patent
> >     > -##
> >     > -{
> >     > -  "scope": "gcc_aarch64_linux",
> >     > -  "type": "web",
> >     > -  "name": "gcc_aarch64_linux",
> >     > -  "source": "
> https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu.tar.xz
> <
> https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu.tar.xz
> >",
> >     > -  "version": "11.2-2022.02",
> >     > -  "sha256":
> "52dbac3eb71dbe0916f60a8c5ab9b7dc9b66b3ce513047baa09fae56234e53f3",
> >     > -  "compression_type": "tar",
> >     > -  "internal_path":
> "/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu/",
> >     > -  "flags": ["set_shell_var", ],
> >     > -  "var_name": "GCC5_AARCH64_INSTALL"
> >     > -}
> >     > diff --git a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
> b/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
> >     > deleted file mode 100644
> >     > index 151cbfa4b532..000000000000
> >     > --- a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
> >     > +++ /dev/null
> >     > @@ -1,21 +0,0 @@
> >     > -## @file
> >     > -# Download GCC ARM compiler from Arm's release site
> >     > -# Set shell variable GCC5_ARM_INSTALL to this folder
> >     > -#
> >     > -# This is only downloaded when a build activates scope
> gcc_arm_linux
> >     > -#
> >     > -# Copyright (c) Microsoft Corporation.
> >     > -# SPDX-License-Identifier: BSD-2-Clause-Patent
> >     > -##
> >     > -{
> >     > -  "scope": "gcc_arm_linux",
> >     > -  "type": "web",
> >     > -  "name": "gcc_arm_linux",
> >     > -  "source": "
> https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf.tar.xz
> <
> https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf.tar.xz
> >",
> >     > -  "version": "11.2-2022.02",
> >     > -  "sha256":
> "c254f7199261fe76c32ef42187502839bda7efad0a66646cf739d074eff45fad",
> >     > -  "compression_type": "tar",
> >     > -  "internal_path":
> "/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf/",
> >     > -  "flags": ["set_shell_var", ],
> >     > -  "var_name": "GCC5_ARM_INSTALL"
> >     > -}
> >     > diff --git a/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
> b/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
> >     > deleted file mode 100644
> >     > index 8abbcd7ba040..000000000000
> >     > --- a/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
> >     > +++ /dev/null
> >     > @@ -1,22 +0,0 @@
> >     > -## @file
> >     > -# Download GCC RISCV64 compiler from RISC-V Organization release
> site
> >     > -# Set shell variable GCC5_RISCV64_INSTALL to this folder
> >     > -#
> >     > -# This is only downloaded when a build activates scope
> gcc_riscv64_unknown
> >     > -#
> >     > -# Copyright (c) Microsoft Corporation.
> >     > -# Copyright (c) 2020, Hewlett Packard Enterprise Development LP.
> All rights reserved.<BR>
> >     > -# SPDX-License-Identifier: BSD-2-Clause-Patent
> >     > -##
> >     > -{
> >     > -  "scope": "gcc_riscv64_unknown",
> >     > -  "type": "web",
> >     > -  "name": "gcc_riscv64_unknown",
> >     > -  "source": "
> https://raw.githubusercontent.com/riscv/riscv-uefi-edk2-docs/master/gcc-riscv-edk2-ci-toolchain/gcc-riscv-9.2.0-2020.04-x86_64_riscv64-unknown-gnu.tar.xz
> <
> https://raw.githubusercontent.com/riscv/riscv-uefi-edk2-docs/master/gcc-riscv-edk2-ci-toolchain/gcc-riscv-9.2.0-2020.04-x86_64_riscv64-unknown-gnu.tar.xz>
> ",
> >     > -  "version": "9.2.0",
> >     > -  "compression_type": "tar",
> >     > -  "sha256":
> "28373643b69f0ce008273c3dc63f172aa1121952f1b9ae94d7485ac94af7f344",
> >     > -  "internal_path":
> "/gcc-riscv-9.2.0-2020.04-x86_64_riscv64-unknown-gnu",
> >     > -  "flags": ["set_shell_var", ],
> >     > -  "var_name": "GCC5_RISCV64_INSTALL"
> >     > -}
> >
> >
> >
> >
> >
>
>
> 
>
>
>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#92417): https://edk2.groups.io/g/devel/message/92417
Mute This Topic: https://groups.io/mt/92934464/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-