Skip to content

Commit 5abd8f7

Browse files
stephanosiostephanosio
committed
config: Move GDB Python scripting configs to CI build script
This commit moves the GDB Python scripting configurations from the target toolchain configuration files to the CI build script. The rationale for this change is as follows: 1. GDB Python scripting support is not a configuration inherent to a specific target. 2. The Python version configuration has nothing to do with the target toolchain and is specific to the build and host environments. Signed-off-by: Stephanos Ioannidis <[email protected]>
1 parent bf44de8 commit 5abd8f7

16 files changed

+11
-32
lines changed

‎.github/workflows/ci.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,12 @@ jobs:
566566
EOF
567567
fi
568568
569-
# Configure Windows Python library
569+
# Configure GDB Python scripting support
570+
cat <<EOF >> .config
571+
CT_GDB_CROSS_PYTHON=y
572+
CT_GDB_CROSS_BUILD_NO_PYTHON=y
573+
EOF
574+
570575
if [ "${{ matrix.host.name }}" == "windows-x86_64" ]; then
571576
# Clone mingw-w64-libpython cross compilation kit
572577
git clone \
@@ -576,9 +581,13 @@ jobs:
576581
export LIBPYTHON_KIT_ROOT=${WORKSPACE}/mingw-w64-libpython/python-3.8.3
577582
# Set Python configuration resolver for GDB
578583
cat <<EOF >> .config
579-
CT_GDB_CROSS_PYTHON=y
580584
CT_GDB_CROSS_PYTHON_BINARY="${LIBPYTHON_KIT_ROOT}/bin/python"
581585
EOF
586+
else
587+
# Use Python 3.8 for Linux and macOS builds
588+
cat <<EOF >> .config
589+
CT_GDB_CROSS_PYTHON_BINARY="python3.8"
590+
EOF
582591
fi
583592
584593
# Allow building as root on Linux to avoid all sorts of container

‎configs/aarch64-zephyr-elf.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ CT_DEBUG_GDB=y
3838
CT_GDB_SRC_DEVEL=y
3939
CT_GDB_DEVEL_URL="https://github.com/zephyrproject-rtos/binutils-gdb.git"
4040
CT_GDB_DEVEL_REVISION="76b05e962501d75d995b9f9dd13f837df36b7208"
41-
CT_GDB_CROSS_PYTHON_BINARY="python3.8"
42-
CT_GDB_CROSS_BUILD_NO_PYTHON=y
4341
CT_GDB_CROSS_EXTRA_CONFIG_ARRAY="--enable-targets=arm-zephyr-eabi"
4442
CT_COMP_LIBS_NEWLIB_NANO=y
4543
CT_NEWLIB_NANO_SRC_DEVEL=y

‎configs/arc-zephyr-elf.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ CT_DEBUG_GDB=y
3838
CT_GDB_SRC_DEVEL=y
3939
CT_GDB_DEVEL_URL="https://github.com/zephyrproject-rtos/binutils-gdb.git"
4040
CT_GDB_DEVEL_REVISION="76b05e962501d75d995b9f9dd13f837df36b7208"
41-
CT_GDB_CROSS_PYTHON_BINARY="python3.8"
42-
CT_GDB_CROSS_BUILD_NO_PYTHON=y
4341
CT_COMP_LIBS_NEWLIB_NANO=y
4442
CT_NEWLIB_NANO_SRC_DEVEL=y
4543
CT_NEWLIB_NANO_DEVEL_URL="https://github.com/zephyrproject-rtos/newlib-cygwin.git"

‎configs/arm-zephyr-eabi.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ CT_DEBUG_GDB=y
3939
CT_GDB_SRC_DEVEL=y
4040
CT_GDB_DEVEL_URL="https://github.com/zephyrproject-rtos/binutils-gdb.git"
4141
CT_GDB_DEVEL_REVISION="76b05e962501d75d995b9f9dd13f837df36b7208"
42-
CT_GDB_CROSS_PYTHON_BINARY="python3.8"
43-
CT_GDB_CROSS_BUILD_NO_PYTHON=y
4442
CT_COMP_LIBS_NEWLIB_NANO=y
4543
CT_NEWLIB_NANO_SRC_DEVEL=y
4644
CT_NEWLIB_NANO_DEVEL_URL="https://github.com/zephyrproject-rtos/newlib-cygwin.git"

‎configs/mips-zephyr-elf.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ CT_DEBUG_GDB=y
3838
CT_GDB_SRC_DEVEL=y
3939
CT_GDB_DEVEL_URL="https://github.com/zephyrproject-rtos/binutils-gdb.git"
4040
CT_GDB_DEVEL_REVISION="76b05e962501d75d995b9f9dd13f837df36b7208"
41-
CT_GDB_CROSS_PYTHON_BINARY="python3.8"
42-
CT_GDB_CROSS_BUILD_NO_PYTHON=y
4341
CT_COMP_LIBS_NEWLIB_NANO=y
4442
CT_NEWLIB_NANO_SRC_DEVEL=y
4543
CT_NEWLIB_NANO_DEVEL_URL="https://github.com/zephyrproject-rtos/newlib-cygwin.git"

‎configs/nios2-zephyr-elf.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ CT_DEBUG_GDB=y
3838
CT_GDB_SRC_DEVEL=y
3939
CT_GDB_DEVEL_URL="https://github.com/zephyrproject-rtos/binutils-gdb.git"
4040
CT_GDB_DEVEL_REVISION="76b05e962501d75d995b9f9dd13f837df36b7208"
41-
CT_GDB_CROSS_PYTHON_BINARY="python3.8"
42-
CT_GDB_CROSS_BUILD_NO_PYTHON=y
4341
CT_COMP_LIBS_NEWLIB_NANO=y
4442
CT_NEWLIB_NANO_SRC_DEVEL=y
4543
CT_NEWLIB_NANO_DEVEL_URL="https://github.com/zephyrproject-rtos/newlib-cygwin.git"

‎configs/riscv64-zephyr-elf.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ CT_DEBUG_GDB=y
4040
CT_GDB_SRC_DEVEL=y
4141
CT_GDB_DEVEL_URL="https://github.com/zephyrproject-rtos/binutils-gdb.git"
4242
CT_GDB_DEVEL_REVISION="76b05e962501d75d995b9f9dd13f837df36b7208"
43-
CT_GDB_CROSS_PYTHON_BINARY="python3.8"
44-
CT_GDB_CROSS_BUILD_NO_PYTHON=y
4543
CT_COMP_LIBS_NEWLIB_NANO=y
4644
CT_NEWLIB_NANO_SRC_DEVEL=y
4745
CT_NEWLIB_NANO_DEVEL_URL="https://github.com/zephyrproject-rtos/newlib-cygwin.git"

‎configs/sparc-zephyr-elf.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ CT_DEBUG_GDB=y
3737
CT_GDB_SRC_DEVEL=y
3838
CT_GDB_DEVEL_URL="https://github.com/zephyrproject-rtos/binutils-gdb.git"
3939
CT_GDB_DEVEL_REVISION="76b05e962501d75d995b9f9dd13f837df36b7208"
40-
CT_GDB_CROSS_PYTHON_BINARY="python3.8"
41-
CT_GDB_CROSS_BUILD_NO_PYTHON=y
4240
CT_COMP_LIBS_NEWLIB_NANO=y
4341
CT_NEWLIB_NANO_SRC_DEVEL=y
4442
CT_NEWLIB_NANO_DEVEL_URL="https://github.com/zephyrproject-rtos/newlib-cygwin.git"

‎configs/x86_64-zephyr-elf.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ CT_DEBUG_GDB=y
4040
CT_GDB_SRC_DEVEL=y
4141
CT_GDB_DEVEL_URL="https://github.com/zephyrproject-rtos/binutils-gdb.git"
4242
CT_GDB_DEVEL_REVISION="76b05e962501d75d995b9f9dd13f837df36b7208"
43-
CT_GDB_CROSS_PYTHON_BINARY="python3.8"
44-
CT_GDB_CROSS_BUILD_NO_PYTHON=y
4543
CT_COMP_LIBS_NEWLIB_NANO=y
4644
CT_NEWLIB_NANO_SRC_DEVEL=y
4745
CT_NEWLIB_NANO_DEVEL_URL="https://github.com/zephyrproject-rtos/newlib-cygwin.git"

‎configs/xtensa-intel_apl_adsp_zephyr-elf.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ CT_DEBUG_GDB=y
4040
CT_GDB_SRC_DEVEL=y
4141
CT_GDB_DEVEL_URL="https://github.com/zephyrproject-rtos/binutils-gdb.git"
4242
CT_GDB_DEVEL_REVISION="76b05e962501d75d995b9f9dd13f837df36b7208"
43-
CT_GDB_CROSS_PYTHON_BINARY="python3.8"
44-
CT_GDB_CROSS_BUILD_NO_PYTHON=y
4543
CT_COMP_LIBS_NEWLIB_NANO=y
4644
CT_NEWLIB_NANO_SRC_DEVEL=y
4745
CT_NEWLIB_NANO_DEVEL_URL="https://github.com/zephyrproject-rtos/newlib-cygwin.git"

‎configs/xtensa-intel_bdw_adsp_zephyr-elf.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ CT_DEBUG_GDB=y
4040
CT_GDB_SRC_DEVEL=y
4141
CT_GDB_DEVEL_URL="https://github.com/zephyrproject-rtos/binutils-gdb.git"
4242
CT_GDB_DEVEL_REVISION="76b05e962501d75d995b9f9dd13f837df36b7208"
43-
CT_GDB_CROSS_PYTHON_BINARY="python3.8"
44-
CT_GDB_CROSS_BUILD_NO_PYTHON=y
4543
CT_COMP_LIBS_NEWLIB_NANO=y
4644
CT_NEWLIB_NANO_SRC_DEVEL=y
4745
CT_NEWLIB_NANO_DEVEL_URL="https://github.com/zephyrproject-rtos/newlib-cygwin.git"

‎configs/xtensa-intel_byt_adsp_zephyr-elf.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ CT_DEBUG_GDB=y
4040
CT_GDB_SRC_DEVEL=y
4141
CT_GDB_DEVEL_URL="https://github.com/zephyrproject-rtos/binutils-gdb.git"
4242
CT_GDB_DEVEL_REVISION="76b05e962501d75d995b9f9dd13f837df36b7208"
43-
CT_GDB_CROSS_PYTHON_BINARY="python3.8"
44-
CT_GDB_CROSS_BUILD_NO_PYTHON=y
4543
CT_COMP_LIBS_NEWLIB_NANO=y
4644
CT_NEWLIB_NANO_SRC_DEVEL=y
4745
CT_NEWLIB_NANO_DEVEL_URL="https://github.com/zephyrproject-rtos/newlib-cygwin.git"

‎configs/xtensa-intel_s1000_zephyr-elf.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ CT_GDB_SRC_DEVEL=y
4040
CT_GDB_DEVEL_URL="https://github.com/zephyrproject-rtos/binutils-gdb.git"
4141
CT_GDB_DEVEL_REVISION="76b05e962501d75d995b9f9dd13f837df36b7208"
4242
CT_GDB_CROSS_EXTRA_CONFIG_ARRAY="--enable-xtensa-use-target-regnum --disable-xtensa-remote-g-packet"
43-
CT_GDB_CROSS_PYTHON_BINARY="python3.8"
44-
CT_GDB_CROSS_BUILD_NO_PYTHON=y
4543
CT_COMP_LIBS_NEWLIB_NANO=y
4644
CT_NEWLIB_NANO_SRC_DEVEL=y
4745
CT_NEWLIB_NANO_DEVEL_URL="https://github.com/zephyrproject-rtos/newlib-cygwin.git"

‎configs/xtensa-nxp_imx8m_adsp_zephyr-elf.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ CT_DEBUG_GDB=y
4040
CT_GDB_SRC_DEVEL=y
4141
CT_GDB_DEVEL_URL="https://github.com/zephyrproject-rtos/binutils-gdb.git"
4242
CT_GDB_DEVEL_REVISION="76b05e962501d75d995b9f9dd13f837df36b7208"
43-
CT_GDB_CROSS_PYTHON_BINARY="python3.8"
44-
CT_GDB_CROSS_BUILD_NO_PYTHON=y
4543
CT_COMP_LIBS_NEWLIB_NANO=y
4644
CT_NEWLIB_NANO_SRC_DEVEL=y
4745
CT_NEWLIB_NANO_DEVEL_URL="https://github.com/zephyrproject-rtos/newlib-cygwin.git"

‎configs/xtensa-nxp_imx_adsp_zephyr-elf.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ CT_DEBUG_GDB=y
4040
CT_GDB_SRC_DEVEL=y
4141
CT_GDB_DEVEL_URL="https://github.com/zephyrproject-rtos/binutils-gdb.git"
4242
CT_GDB_DEVEL_REVISION="76b05e962501d75d995b9f9dd13f837df36b7208"
43-
CT_GDB_CROSS_PYTHON_BINARY="python3.8"
44-
CT_GDB_CROSS_BUILD_NO_PYTHON=y
4543
CT_COMP_LIBS_NEWLIB_NANO=y
4644
CT_NEWLIB_NANO_SRC_DEVEL=y
4745
CT_NEWLIB_NANO_DEVEL_URL="https://github.com/zephyrproject-rtos/newlib-cygwin.git"

‎configs/xtensa-sample_controller_zephyr-elf.config

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ CT_DEBUG_GDB=y
3939
CT_GDB_SRC_DEVEL=y
4040
CT_GDB_DEVEL_URL="https://github.com/zephyrproject-rtos/binutils-gdb.git"
4141
CT_GDB_DEVEL_REVISION="76b05e962501d75d995b9f9dd13f837df36b7208"
42-
CT_GDB_CROSS_PYTHON_BINARY="python3.8"
43-
CT_GDB_CROSS_BUILD_NO_PYTHON=y
4442
CT_COMP_LIBS_NEWLIB_NANO=y
4543
CT_NEWLIB_NANO_SRC_DEVEL=y
4644
CT_NEWLIB_NANO_DEVEL_URL="https://github.com/zephyrproject-rtos/newlib-cygwin.git"

0 commit comments

Comments
 (0)