dist/tools/esptools: upgrade ESP32x toolchains to GCC version 12.2#19452
Merged
bors[bot] merged 2 commits intoRIOT-OS:masterfrom Aug 1, 2023
Merged
Conversation
github-actions
bot
added
Area: cpu
gschorcht
force-pushed
the
dist/tools/esptools/bump_gcc_to_version_gcc_12_2
branch
from
4669023 to
4ead466
Compare
gschorcht
added
CI: ready for build
maribu
approved these changes
May 11, 2023
Member
maribu
left a comment
maribu
left a comment
There was a problem hiding this comment.
Looks good to me. Please fix and squash the CI nitpicks (see inline comments) prior merge.
dist/tools/esptools/export.sh
Outdated
| echo "error: Unknown platform $1, use xtensa or riscv" | ||
| return | ||
| esac | ||
|
|
dist/tools/esptools/export.sh
Outdated
| esac | ||
|
|
||
| GDB_VERSION="12.1_20221002" | ||
|
|
dist/tools/esptools/export.sh
Outdated
| GDB_VERSION="12.1_20221002" | ||
|
|
||
| TOOLS_DIR=${TOOLS_PATH}/${GDB_ARCH}/${GDB_VERSION}/${GDB_ARCH} | ||
| TOOLS_DIR_IN_PATH=`echo $PATH | grep ${TOOLS_DIR}` |
Member
There was a problem hiding this comment.
Suggested change
| TOOLS_DIR_IN_PATH=`echo $PATH | grep ${TOOLS_DIR}` | |
| TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" |
dist/tools/esptools/export.sh
Outdated
| TOOLS_DIR=${TOOLS_PATH}/${GDB_ARCH}/${GDB_VERSION}/${GDB_ARCH} | ||
| TOOLS_DIR_IN_PATH=`echo $PATH | grep ${TOOLS_DIR}` | ||
|
|
||
| if [ -e ${TOOLS_DIR} ] && [ -z ${TOOLS_DIR_IN_PATH} ]; then |
Member
There was a problem hiding this comment.
Suggested change
| if [ -e ${TOOLS_DIR} ] && [ -z ${TOOLS_DIR_IN_PATH} ]; then | |
| if [ -e "${TOOLS_DIR}" ] && [ -z "${TOOLS_DIR_IN_PATH}" ]; then |
dist/tools/esptools/export.sh
Outdated
|
|
||
| if [ -e ${TOOLS_DIR} ] && [ -z ${TOOLS_DIR_IN_PATH} ]; then | ||
| echo "Extending PATH by ${TOOLS_DIR}/bin" | ||
| export PATH=${TOOLS_DIR}/bin:${PATH} |
Member
There was a problem hiding this comment.
Suggested change
| export PATH=${TOOLS_DIR}/bin:${PATH} | |
| export PATH="${TOOLS_DIR}/bin:${PATH}" |
dist/tools/esptools/export.sh
Outdated
| unset TOOLS_DIR | ||
| } | ||
|
|
||
| if [ -z $1 ]; then |
Member
There was a problem hiding this comment.
Suggested change
| if [ -z $1 ]; then | |
| if [ -z "$1" ]; then |
dist/tools/esptools/export.sh
Outdated
| elif [ "$1" = "all" ]; then | ||
| ARCH_ALL="esp32 esp32c3 esp32s2 esp32s3" | ||
| for arch in ${ARCH_ALL}; do | ||
| export_arch $arch |
Member
There was a problem hiding this comment.
Suggested change
| export_arch $arch | |
| export_arch "$arch" |
dist/tools/esptools/export.sh
Outdated
| echo "platform required: xtensa | riscv" | ||
| exit 1 | ||
| fi | ||
| export_gdb $2 |
Member
There was a problem hiding this comment.
Suggested change
| export_gdb $2 | |
| export_gdb "$2" |
dist/tools/esptools/install.sh
Outdated
| echo "error: Unknown platform $1, use xtensa or riscv" | ||
| exit 1 | ||
| esac | ||
|
|
dist/tools/esptools/install.sh
Outdated
| esac | ||
|
|
||
| GDB_VERSION="12.1_20221002" | ||
|
|
maribu
reviewed
May 11, 2023
Member
maribu
left a comment
maribu
left a comment
There was a problem hiding this comment.
The CI still has more nitpicks :-/
Please squash at will
| TOOLS_DIR=${TOOLS_PATH}/${TARGET_ARCH}/${ESP32_GCC_RELEASE}-${ESP32_GCC_VERSION_DIR}/${TARGET_ARCH} | ||
| TOOLS_DIR_IN_PATH=`echo $PATH | grep ${TOOLS_DIR}` | ||
| TOOLS_DIR="${TOOLS_PATH}/${TARGET_ARCH}/${ESP32_GCC_RELEASE}/${TARGET_ARCH}" | ||
| TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" |
Member
There was a problem hiding this comment.
Suggested change
| TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" | |
| TOOLS_DIR_IN_PATH="$(echo "$PATH" | grep "${TOOLS_DIR}")" |
| TOOLS_DIR_IN_PATH=`echo $PATH | grep ${TOOLS_DIR}` | ||
| OPENOCD_DIR=${TOOLS_DIR}/openocd-esp32 | ||
| TOOLS_DIR="${TOOLS_PATH}/openocd-esp32/${ESP32_OPENOCD_VERSION}" | ||
| TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" |
Member
There was a problem hiding this comment.
Suggested change
| TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" | |
| TOOLS_DIR_IN_PATH="$(echo "$PATH" | grep "${TOOLS_DIR}")" |
| TOOLS_DIR=${TOOLS_PATH}/qemu-esp32/${ESP32_QEMU_VERSION}/qemu | ||
| TOOLS_DIR_IN_PATH=`echo $PATH | grep ${TOOLS_DIR}` | ||
| TOOLS_DIR="${TOOLS_PATH}/qemu-esp32/${ESP32_QEMU_VERSION}/qemu" | ||
| TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" |
Member
There was a problem hiding this comment.
Suggested change
| TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" | |
| TOOLS_DIR_IN_PATH="$(echo "$PATH" | grep "${TOOLS_DIR}")" |
| GDB_VERSION="12.1_20221002" | ||
|
|
||
| TOOLS_DIR="${TOOLS_PATH}/${GDB_ARCH}/${GDB_VERSION}/${GDB_ARCH}" | ||
| TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" |
Member
There was a problem hiding this comment.
Suggested change
| TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" | |
| TOOLS_DIR_IN_PATH="$(echo "$PATH" | grep "${TOOLS_DIR}")" |
| GDB_VERSION="12.1_20221002" | ||
|
|
||
| TOOLS_DIR="${TOOLS_PATH}/${GDB_ARCH}/${GDB_VERSION}/${GDB_ARCH}" | ||
| TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" |
Member
There was a problem hiding this comment.
Suggested change
| TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" | |
| TOOLS_DIR_IN_PATH="$(echo "$PATH" | grep "${TOOLS_DIR}")" |
| GDB_VERSION="12.1_20221002" | ||
|
|
||
| TOOLS_DIR="${TOOLS_PATH}/${GDB_ARCH}/${GDB_VERSION}/${GDB_ARCH}" | ||
| TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" |
Member
There was a problem hiding this comment.
Suggested change
| TOOLS_DIR_IN_PATH="$(echo $PATH | grep "${TOOLS_DIR}")" | |
| TOOLS_DIR_IN_PATH="$(echo "$PATH" | grep "${TOOLS_DIR}")" |
Contributor
|
I think we can merge this now if static tests are satisfied. |
gschorcht
force-pushed
the
dist/tools/esptools/bump_gcc_to_version_gcc_12_2
branch
from
53b7ebb to
a83d5ba
Compare
Contributor
|
I tested all apps on the |
Contributor
|
bors merge |
Contributor
|
Build succeeded! The publicly hosted instance of bors-ng is deprecated and will go away soon. If you want to self-host your own instance, instructions are here. If you want to switch to GitHub's built-in merge queue, visit their help page. |
gschorcht
deleted the
dist/tools/esptools/bump_gcc_to_version_gcc_12_2
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Contribution description
This PR upgrades ESP32x toolchains to GCC version 12.2 which is a prerequisite for upgrading the ESP-IDF to version 5.1.
This PR depends on PR #19450
Testing procedure
dist/tools/install.sh allshould install all ESP32x toolchains.. dist/tools/export.sh allshould make them visible.Issues/PRs references
Depends on PR #19450