Skip to content

Link gdb-py against Python 3.10 #796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 23, 2024
Merged

Link gdb-py against Python 3.10 #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
33ee619
meta-zephyr-sdk: Pull in Python 3.10 compatibility fixes
stephanosio Sep 17, 2024
81eae20
ci: Use sdk-build v1.3.2
stephanosio Sep 17, 2024
646a963
ci: Install python@3.10 for macOS
stephanosio Sep 20, 2024
5f6717c
crosskit: Update x86_64-darwin-libpython crosskit for Python 3.10
stephanosio Sep 19, 2024
86c3c55
crosskit: Update mingw-w64-libpython crosskit for Python 3.10
stephanosio Sep 19, 2024
d4b692f
ci: Link gdb-py against Python 3.10
stephanosio Sep 17, 2024
366126a
contrib: Update Linux build script to use Python 3.10
stephanosio Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ jobs:
MATRIX_HOSTS+='{
"name": "linux-x86_64",
"runner": "zephyr-runner-v2-linux-x64-4xlarge",
"container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.3.1",
"container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.3.2",
"archive": "tar.xz"
},'
fi
Expand All @@ -244,7 +244,7 @@ jobs:
MATRIX_HOSTS+='{
"name": "linux-aarch64",
"runner": "zephyr-runner-v2-linux-arm64-4xlarge",
"container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.3.1",
"container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.3.2",
"archive": "tar.xz"
},'
fi
Expand All @@ -271,7 +271,7 @@ jobs:
MATRIX_HOSTS+='{
"name": "windows-x86_64",
"runner": "zephyr-runner-v2-linux-x64-4xlarge",
"container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.3.1",
"container": "ghcr.io/zephyrproject-rtos/sdk-build:v1.3.2",
"archive": "7z"
},'
fi
Expand Down Expand Up @@ -538,14 +538,18 @@ jobs:
gnu-sed gnu-tar help2man meson ncurses ninja pkg-config
fi

# Install Python 3.10 (temporary until the sdk-build-macos image is
# updated)
brew install python@3.10

# Install dependencies for cross compilation
if [ "${{ matrix.host.name }}" == "macos-x86_64" ]; then
# Make crosskit available in PATH
echo "${GITHUB_WORKSPACE}/crosskit/crosskit-x86_64-apple-darwin/scripts" >> $GITHUB_PATH
fi

# Make Python 3.8 available in PATH
echo "${HOMEBREW_PREFIX}/opt/python@3.8/bin" >> $GITHUB_PATH
# Make Python 3.10 available in PATH
echo "${HOMEBREW_PREFIX}/opt/python@3.10/bin" >> $GITHUB_PATH

# Set environment variables
echo "TAR=gtar" >> $GITHUB_ENV
Expand Down Expand Up @@ -692,23 +696,23 @@ jobs:
EOF

if [ "${{ matrix.host.name }}" == "macos-x86_64" ]; then
# Use Python 3.8.12
export LIBPYTHON_KIT_ROOT=${GITHUB_WORKSPACE}/crosskit/crosskit-x86_64-darwin-libpython/python-3.8.12
# Use Python 3.10.15
export LIBPYTHON_KIT_ROOT=${GITHUB_WORKSPACE}/crosskit/crosskit-x86_64-darwin-libpython/python-3.10.15
# Set Python configuration resolver for GDB
cat <<EOF >> .config
CT_GDB_CROSS_PYTHON_BINARY="${LIBPYTHON_KIT_ROOT}/bin/python"
EOF
elif [ "${{ matrix.host.name }}" == "windows-x86_64" ]; then
# Use Python 3.8.3
export LIBPYTHON_KIT_ROOT=${GITHUB_WORKSPACE}/crosskit/crosskit-mingw-w64-libpython/python-3.8.3
# Use Python 3.10.11
export LIBPYTHON_KIT_ROOT=${GITHUB_WORKSPACE}/crosskit/crosskit-mingw-w64-libpython/python-3.10.11
# Set Python configuration resolver for GDB
cat <<EOF >> .config
CT_GDB_CROSS_PYTHON_BINARY="${LIBPYTHON_KIT_ROOT}/bin/python"
EOF
else
# Use Python 3.8 for non-Canadian Linux and macOS builds
# Use Python 3.10 for non-Canadian Linux and macOS builds
cat <<EOF >> .config
CT_GDB_CROSS_PYTHON_BINARY="python3.8"
CT_GDB_CROSS_PYTHON_BINARY="python3.10"
EOF
fi

Expand Down
2 changes: 1 addition & 1 deletion contrib/linux_build_toolchain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ CT_LOG_EXTRA=y
CT_LOG_LEVEL_MAX="EXTRA"
CT_GDB_CROSS_PYTHON=y
CT_GDB_CROSS_PYTHON_VARIANT=y
CT_GDB_CROSS_PYTHON_BINARY="python3.8"
CT_GDB_CROSS_PYTHON_BINARY="python3.10"
CT_EXPERIMENTAL=y
CT_ALLOW_BUILD_AS_ROOT=y
CT_ALLOW_BUILD_AS_ROOT_SURE=y
Expand Down
2 changes: 1 addition & 1 deletion crosskit/crosskit-mingw-w64-libpython
Open in desktop
Submodule crosskit-mingw-w64-libpython updated 164 files
2 changes: 1 addition & 1 deletion crosskit/crosskit-x86_64-darwin-libpython
Open in desktop
Submodule crosskit-x86_64-darwin-libpython updated 166 files
2 changes: 1 addition & 1 deletion meta-zephyr-sdk/scripts/meta-zephyr-sdk-clone.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#

POKY_KNOWN_COMMIT=${POKY_COMMIT:-"92c9c181ff23b41009ef9b3d674ab32b067cc50b"}
POKY_KNOWN_COMMIT=${POKY_COMMIT:-"54488c030cef432c682c2f91b5e3f43dbd560a1c"}
META_ZEPHYR_SDK_SOURCE=${SDK_SOURCE:-"meta-zephyr-sdk"}
META_POKY_SOURCE=${POKY_SOURCE:-"poky"}
META_ZEPHYR_SDK_SOURCE=$(readlink -f $META_ZEPHYR_SDK_SOURCE)
Expand Down
Loading