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.

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

Use Zephyr SDK 0.16.4 #65692

Merged
merged 2 commits into from
Nov 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/bsim-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ jobs:
if: github.repository_owner == 'zephyrproject-rtos'
runs-on: zephyr-runner-linux-x64-4xlarge
container:
image: ghcr.io/zephyrproject-rtos/ci:v0.26.5
image: ghcr.io/zephyrproject-rtos/ci:v0.26.6
options: '--entrypoint /bin/bash'
volumes:
- /repo-cache/zephyrproject:/github/cache/zephyrproject
env:
ZEPHYR_TOOLCHAIN_VARIANT: zephyr
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.4
BSIM_OUT_PATH: /opt/bsim/
BSIM_COMPONENTS_PATH: /opt/bsim/components
EDTT_PATH: ../tools/edtt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/clang.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
if: github.repository_owner == 'zephyrproject-rtos'
runs-on: zephyr-runner-linux-x64-4xlarge
container:
image: ghcr.io/zephyrproject-rtos/ci:v0.26.5
image: ghcr.io/zephyrproject-rtos/ci:v0.26.6
options: '--entrypoint /bin/bash'
volumes:
- /repo-cache/zephyrproject:/github/cache/zephyrproject
Expand All @@ -20,7 +20,7 @@ jobs:
matrix:
platform: ["native_posix"]
env:
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.4
LLVM_TOOLCHAIN_PATH: /usr/lib/llvm-16
COMMIT_RANGE: ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }}
BASE_REF: ${{ github.base_ref }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codecov.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
if: github.repository == 'zephyrproject-rtos/zephyr'
runs-on: zephyr-runner-linux-x64-4xlarge
container:
image: ghcr.io/zephyrproject-rtos/ci:v0.26.5
image: ghcr.io/zephyrproject-rtos/ci:v0.26.6
options: '--entrypoint /bin/bash'
volumes:
- /repo-cache/zephyrproject:/github/cache/zephyrproject
Expand All @@ -22,7 +22,7 @@ jobs:
matrix:
platform: ["native_posix", "qemu_x86", "unit_testing"]
env:
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.4
steps:
- name: Apply container owner mismatch workaround
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/errno.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
check-errno:
runs-on: ubuntu-22.04
container:
image: ghcr.io/zephyrproject-rtos/ci:v0.26.5
image: ghcr.io/zephyrproject-rtos/ci:v0.26.6
env:
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.4

steps:
- name: Apply container owner mismatch workaround
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/footprint-tracking.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ jobs:
runs-on: zephyr-runner-linux-x64-4xlarge
if: github.repository_owner == 'zephyrproject-rtos'
container:
image: ghcr.io/zephyrproject-rtos/ci:v0.26.5
image: ghcr.io/zephyrproject-rtos/ci:v0.26.6
options: '--entrypoint /bin/bash'
strategy:
fail-fast: false
env:
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.4
ZEPHYR_TOOLCHAIN_VARIANT: zephyr
steps:
- name: Apply container owner mismatch workaround
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/footprint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:
runs-on: zephyr-runner-linux-x64-4xlarge
if: github.repository == 'zephyrproject-rtos/zephyr'
container:
image: ghcr.io/zephyrproject-rtos/ci:v0.26.5
image: ghcr.io/zephyrproject-rtos/ci:v0.26.6
options: '--entrypoint /bin/bash'
strategy:
fail-fast: false
env:
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.4
ZEPHYR_TOOLCHAIN_VARIANT: zephyr
steps:
- name: Apply container owner mismatch workaround
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/twister.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
if: github.repository_owner == 'zephyrproject-rtos'
runs-on: zephyr-runner-linux-x64-4xlarge
container:
image: ghcr.io/zephyrproject-rtos/ci:v0.26.5
image: ghcr.io/zephyrproject-rtos/ci:v0.26.6
options: '--entrypoint /bin/bash'
volumes:
- /repo-cache/zephyrproject:/github/cache/zephyrproject
Expand All @@ -36,7 +36,7 @@ jobs:
MATRIX_SIZE: 10
PUSH_MATRIX_SIZE: 15
DAILY_MATRIX_SIZE: 80
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.4
BSIM_OUT_PATH: /opt/bsim/
BSIM_COMPONENTS_PATH: /opt/bsim/components
TESTS_PER_BUILDER: 700
Expand Down Expand Up @@ -122,7 +122,7 @@ jobs:
needs: twister-build-prep
if: needs.twister-build-prep.outputs.size != 0
container:
image: ghcr.io/zephyrproject-rtos/ci:v0.26.5
image: ghcr.io/zephyrproject-rtos/ci:v0.26.6
options: '--entrypoint /bin/bash'
volumes:
- /repo-cache/zephyrproject:/github/cache/zephyrproject
Expand All @@ -131,7 +131,7 @@ jobs:
matrix:
subset: ${{fromJSON(needs.twister-build-prep.outputs.subset)}}
env:
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.4
BSIM_OUT_PATH: /opt/bsim/
BSIM_COMPONENTS_PATH: /opt/bsim/components
TWISTER_COMMON: ' --force-color --inline-logs -v -N -M --retry-failed 3 '
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/twister_tests_blackbox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
python-version: [3.8, 3.9, '3.10', '3.11', '3.12']
os: [ubuntu-22.04]
container:
image: ghcr.io/zephyrproject-rtos/ci:v0.26.5
image: ghcr.io/zephyrproject-rtos/ci:v0.26.6
env:
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.3
ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.4

steps:
- name: Apply Container Owner Mismatch Workaround
Expand Down
16 changes: 8 additions & 8 deletions doc/develop/getting_started/installation_linux.rst
Original file line number Diff line number Diff line change
Expand Up @@ -228,14 +228,14 @@ The Zephyr SDK supports the following target architectures:
Follow these steps to install the Zephyr SDK:

#. Download and verify the `Zephyr SDK bundle
<https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.16.3>`_:
<https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.16.4>`_:

.. code-block:: bash

wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/zephyr-sdk-0.16.3_linux-x86_64.tar.xz
wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/sha256.sum | shasum --check --ignore-missing
wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.4/zephyr-sdk-0.16.4_linux-x86_64.tar.xz
wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.4/sha256.sum | shasum --check --ignore-missing

You can change ``0.16.3`` to another version if needed; the `Zephyr SDK
You can change ``0.16.4`` to another version if needed; the `Zephyr SDK
Releases`_ page contains all available SDK releases.

If your host architecture is 64-bit ARM (for example, Raspberry Pi), replace
Expand All @@ -246,13 +246,13 @@ Follow these steps to install the Zephyr SDK:
.. code-block:: bash

cd <sdk download directory>
tar xvf zephyr-sdk-0.16.3_linux-x86_64.tar.xz
tar xvf zephyr-sdk-0.16.4_linux-x86_64.tar.xz

#. Run the Zephyr SDK bundle setup script:

.. code-block:: bash

cd zephyr-sdk-0.16.3
cd zephyr-sdk-0.16.4
./setup.sh

If this fails, make sure Zephyr's dependencies were installed as described
Expand All @@ -271,9 +271,9 @@ If you relocate the SDK directory, you need to re-run the setup script.
* ``/opt``
* ``/usr/local``

The Zephyr SDK bundle archive contains the ``zephyr-sdk-0.16.3`` directory and, when
The Zephyr SDK bundle archive contains the ``zephyr-sdk-0.16.4`` directory and, when
extracted under ``$HOME``, the resulting installation path will be
``$HOME/zephyr-sdk-0.16.3``.
``$HOME/zephyr-sdk-0.16.4``.

If you install the Zephyr SDK outside any of these locations, you must
register the Zephyr SDK in the CMake package registry by running the setup
Expand Down
46 changes: 23 additions & 23 deletions doc/develop/toolchains/zephyr_sdk.rst
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Zephyr SDK installation

.. toolchain_zephyr_sdk_install_start

.. note:: You can change ``0.16.3`` to another version in the instructions below
.. note:: You can change ``0.16.4`` to another version in the instructions below
if needed; the `Zephyr SDK Releases`_ page contains all available
SDK releases.

Expand All @@ -88,13 +88,13 @@ Zephyr SDK installation
.. _ubuntu_zephyr_sdk:

#. Download and verify the `Zephyr SDK bundle
<https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.16.3>`_:
<https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.16.4>`_:

.. code-block:: bash

cd ~
wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/zephyr-sdk-0.16.3_linux-x86_64.tar.xz
wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/sha256.sum | shasum --check --ignore-missing
wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.4/zephyr-sdk-0.16.4_linux-x86_64.tar.xz
wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.4/sha256.sum | shasum --check --ignore-missing

If your host architecture is 64-bit ARM (for example, Raspberry Pi), replace ``x86_64``
with ``aarch64`` in order to download the 64-bit ARM Linux SDK.
Expand All @@ -103,7 +103,7 @@ Zephyr SDK installation

.. code-block:: bash

tar xvf zephyr-sdk-0.16.3_linux-x86_64.tar.xz
tar xvf zephyr-sdk-0.16.4_linux-x86_64.tar.xz

.. note::
It is recommended to extract the Zephyr SDK bundle at one of the following locations:
Expand All @@ -115,15 +115,15 @@ Zephyr SDK installation
* ``/opt``
* ``/usr/local``

The Zephyr SDK bundle archive contains the ``zephyr-sdk-0.16.3`` directory and, when
The Zephyr SDK bundle archive contains the ``zephyr-sdk-0.16.4`` directory and, when
extracted under ``$HOME``, the resulting installation path will be
``$HOME/zephyr-sdk-0.16.3``.
``$HOME/zephyr-sdk-0.16.4``.

#. Run the Zephyr SDK bundle setup script:

.. code-block:: bash

cd zephyr-sdk-0.16.3
cd zephyr-sdk-0.16.4
./setup.sh

.. note::
Expand All @@ -137,21 +137,21 @@ Zephyr SDK installation

.. code-block:: bash

sudo cp ~/zephyr-sdk-0.16.3/sysroots/x86_64-pokysdk-linux/usr/share/openocd/contrib/60-openocd.rules /etc/udev/rules.d
sudo cp ~/zephyr-sdk-0.16.4/sysroots/x86_64-pokysdk-linux/usr/share/openocd/contrib/60-openocd.rules /etc/udev/rules.d
sudo udevadm control --reload

.. group-tab:: macOS

.. _macos_zephyr_sdk:

#. Download and verify the `Zephyr SDK bundle
<https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.16.3>`_:
<https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.16.4>`_:

.. code-block:: bash

cd ~
curl -L -O https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/zephyr-sdk-0.16.3_macos-x86_64.tar.xz
curl -L https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/sha256.sum | shasum --check --ignore-missing
curl -L -O https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.4/zephyr-sdk-0.16.4_macos-x86_64.tar.xz
curl -L https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.4/sha256.sum | shasum --check --ignore-missing

If your host architecture is 64-bit ARM (Apple Silicon, also known as M1), replace
``x86_64`` with ``aarch64`` in order to download the 64-bit ARM macOS SDK.
Expand All @@ -160,7 +160,7 @@ Zephyr SDK installation

.. code-block:: bash

tar xvf zephyr-sdk-0.16.3_macos-x86_64.tar.xz
tar xvf zephyr-sdk-0.16.4_macos-x86_64.tar.xz

.. note::
It is recommended to extract the Zephyr SDK bundle at one of the following locations:
Expand All @@ -172,15 +172,15 @@ Zephyr SDK installation
* ``/opt``
* ``/usr/local``

The Zephyr SDK bundle archive contains the ``zephyr-sdk-0.16.3`` directory and, when
The Zephyr SDK bundle archive contains the ``zephyr-sdk-0.16.4`` directory and, when
extracted under ``$HOME``, the resulting installation path will be
``$HOME/zephyr-sdk-0.16.3``.
``$HOME/zephyr-sdk-0.16.4``.

#. Run the Zephyr SDK bundle setup script:

.. code-block:: bash

cd zephyr-sdk-0.16.3
cd zephyr-sdk-0.16.4
./setup.sh

.. note::
Expand All @@ -196,34 +196,34 @@ Zephyr SDK installation
#. Open a ``cmd.exe`` terminal window **as a regular user**

#. Download the `Zephyr SDK bundle
<https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.16.3>`_:
<https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.16.4>`_:

.. code-block:: bat

cd %HOMEPATH%
wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.3/zephyr-sdk-0.16.3_windows-x86_64.7z
wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.4/zephyr-sdk-0.16.4_windows-x86_64.7z

#. Extract the Zephyr SDK bundle archive:

.. code-block:: bat

7z x zephyr-sdk-0.16.3_windows-x86_64.7z
7z x zephyr-sdk-0.16.4_windows-x86_64.7z

.. note::
It is recommended to extract the Zephyr SDK bundle at one of the following locations:

* ``%HOMEPATH%``
* ``%PROGRAMFILES%``

The Zephyr SDK bundle archive contains the ``zephyr-sdk-0.16.3`` directory and, when
The Zephyr SDK bundle archive contains the ``zephyr-sdk-0.16.4`` directory and, when
extracted under ``%HOMEPATH%``, the resulting installation path will be
``%HOMEPATH%\zephyr-sdk-0.16.3``.
``%HOMEPATH%\zephyr-sdk-0.16.4``.

#. Run the Zephyr SDK bundle setup script:

.. code-block:: bat

cd zephyr-sdk-0.16.3
cd zephyr-sdk-0.16.4
setup.cmd

.. note::
Expand All @@ -232,7 +232,7 @@ Zephyr SDK installation
You must rerun the setup script if you relocate the Zephyr SDK bundle directory after
the initial setup.

.. _Zephyr SDK bundle: https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.16.3
.. _Zephyr SDK bundle: https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.16.4
.. _Zephyr SDK Releases: https://github.com/zephyrproject-rtos/sdk-ng/tags
.. _Zephyr SDK Version Compatibility Matrix: https://github.com/zephyrproject-rtos/sdk-ng/wiki/Zephyr-SDK-Version-Compatibility-Matrix

Expand Down