Quoting Chris Fernald (2022-11-28 06:20:36) > Over-all I think this change is good to go. My only outstanding concern > would be around deleting these yaml files for the compilers. I fear > deleting them may break others work-flows and wonder if instead we > should update the python files to first check for the presence of the > prefix shell variable to dynamically determine if the extdep is needed > or not similar to how the compiler plugins determine whether to use the > extdep compiler or not.
Yes. Deleting the ext_dep files is for sure not the right way. I think we need an option to allow the user (be it human or CI script) to choose between using the ext_dep and the tools already present on the system (=distro tools). This should affect gcc as well as all other tools (iasl, nasm, ...). I am not sure how to implement this in a good way. I had also started a discussion on github about that [0]. But I have to admit that I was very busy recently and had little time to work on this (sorry). Thanks, Oliver [0] https://github.com/tianocore/edk2-pytool-extensions/discussions/323 > > Thanks, > > Chris > > On 9/26/2022 9:31 AM, 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 <ostef...@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" > > -} > -- 🎩Oliver Steffen (he/him) - Software Engineer, Virtualization Red Hat GmbH <https://www.redhat.com/de/global/dach>, Registered seat: Werner-von-Siemens-Ring 12, D-85630 Grasbrunn, Germany Commercial register: Amtsgericht München/Munich, HRB 153243, Managing Directors: Ryan Barnhart, Charles Cachera, Michael O'Neill, Amy Ross Everyone has different working hours… Please do not feel obligated to reply outside of your normal work schedule. -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#96653): https://edk2.groups.io/g/devel/message/96653 Mute This Topic: https://groups.io/mt/93930296/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-