Skip to content
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

Jump to bottom

Prepare changes for build_python.sh for ubuntu 24.04 usage #34016

Merged
merged 2 commits into from
Jun 19, 2024
Merged

Prepare changes for build_python.sh for ubuntu 24.04 usage #34016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a8556e
Prepare changes for build_python.sh for ubuntu 24.04 usage
andy31415 Jun 19, 2024
67f43a3
Merge branch 'master' into python_for_noble
andy31415 Jun 19, 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
1 change: 1 addition & 0 deletions integrations/docker/images/base/chip-build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ RUN set -x \
libdmalloc-dev \
libgif-dev \
libgirepository-1.0-1 \
libgirepository1.0-dev \
libglib2.0-dev \
libical-dev \
libjpeg-dev \
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/base/chip-build/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
57 : [Telink] Update Docker image (Zephyr update)
58 : Add libgirepository1.0-dev to the base image, to make build_python.sh work (assume we want this everywhere)
4 changes: 2 additions & 2 deletions scripts/build_python.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,10 +222,10 @@ if [ -n "$install_virtual_env" ]; then
if [ "$clean_virtual_env" = "yes" ]; then
# Create a virtual environment that has access to the built python tools
echo_blue "Creating a clear VirtualEnv in '$ENVIRONMENT_ROOT' ..."
virtualenv --clear "$ENVIRONMENT_ROOT"
python -m venv --clear "$ENVIRONMENT_ROOT"
elif [ ! -f "$ENVIRONMENT_ROOT"/bin/activate ]; then
echo_blue "Creating a new VirtualEnv in '$ENVIRONMENT_ROOT' ..."
virtualenv "$ENVIRONMENT_ROOT"
python -m venv "$ENVIRONMENT_ROOT"
fi

source "$ENVIRONMENT_ROOT"/bin/activate
Expand Down
Loading