From 536be8f005788eda40f2ac1687f97a10d5cfcf1b Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Mon, 25 Jan 2021 10:01:25 -0600 Subject: [PATCH] sdk: Move to SDK 0.12.2 Update ci and docs to reference SDK 0.12.2 Signed-off-by: Kumar Gala --- .buildkite/daily.yml | 4 ++-- .buildkite/pipeline.yml | 4 ++-- doc/getting_started/index.rst | 12 ++++++------ doc/getting_started/installation_linux.rst | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.buildkite/daily.yml b/.buildkite/daily.yml index dd092b54c00..1f9c6d7766e 100644 --- a/.buildkite/daily.yml +++ b/.buildkite/daily.yml @@ -3,14 +3,14 @@ steps: - .buildkite/run.sh env: ZEPHYR_TOOLCHAIN_VARIANT: "zephyr" - ZEPHYR_SDK_INSTALL_DIR: "/opt/sdk/zephyr-sdk-0.12.1" + ZEPHYR_SDK_INSTALL_DIR: "/opt/sdk/zephyr-sdk-0.12.2" parallelism: 300 timeout_in_minutes: 210 retry: manual: true plugins: - docker#v3.5.0: - image: "zephyrprojectrtos/ci:v0.11.12" + image: "zephyrprojectrtos/ci:v0.11.13" propagate-environment: true volumes: - "/var/lib/buildkite-agent/git-mirrors:/var/lib/buildkite-agent/git-mirrors" diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 3c9ba2fbb05..a0e3eef5476 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -3,14 +3,14 @@ steps: - .buildkite/run.sh env: ZEPHYR_TOOLCHAIN_VARIANT: "zephyr" - ZEPHYR_SDK_INSTALL_DIR: "/opt/sdk/zephyr-sdk-0.12.1" + ZEPHYR_SDK_INSTALL_DIR: "/opt/sdk/zephyr-sdk-0.12.2" parallelism: 40 timeout_in_minutes: 180 retry: manual: true plugins: - docker#v3.5.0: - image: "zephyrprojectrtos/ci:v0.11.12" + image: "zephyrprojectrtos/ci:v0.11.13" propagate-environment: true volumes: - "/var/lib/buildkite-agent/git-mirrors:/var/lib/buildkite-agent/git-mirrors" diff --git a/doc/getting_started/index.rst b/doc/getting_started/index.rst index c91e41b003c..3dfc0ddbaf2 100644 --- a/doc/getting_started/index.rst +++ b/doc/getting_started/index.rst @@ -292,14 +292,14 @@ to build Zephyr applications. .. code-block:: bash cd ~ - wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.12.1/zephyr-sdk-0.12.1-x86_64-linux-setup.run + wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.12.2/zephyr-sdk-0.12.2-x86_64-linux-setup.run - #. Run the installer, installing the SDK in :file:`~/zephyr-sdk-0.12.1`: + #. Run the installer, installing the SDK in :file:`~/zephyr-sdk-0.12.2`: .. code-block:: bash - chmod +x zephyr-sdk-0.12.1-x86_64-linux-setup.run - ./zephyr-sdk-0.12.1-x86_64-linux-setup.run -- -d ~/zephyr-sdk-0.12.1 + chmod +x zephyr-sdk-0.12.2-x86_64-linux-setup.run + ./zephyr-sdk-0.12.2-x86_64-linux-setup.run -- -d ~/zephyr-sdk-0.12.2 .. note:: It is recommended to install the Zephyr SDK at one of the following locations: @@ -312,7 +312,7 @@ to build Zephyr applications. * ``/usr/zephyr-sdk[-x.y.z]`` * ``/usr/local/zephyr-sdk[-x.y.z]`` - where ``[-x.y.z]`` is optional text, and can be any text, for example ``-0.12.1``. + where ``[-x.y.z]`` is optional text, and can be any text, for example ``-0.12.2``. If installing the Zephyr SDK outside any of those locations, please read: :ref:`zephyr_sdk` @@ -323,7 +323,7 @@ to build Zephyr applications. .. code-block:: bash - sudo cp ~/zephyr-sdk-0.12.1/sysroots/x86_64-pokysdk-linux/usr/share/openocd/contrib/60-openocd.rules /etc/udev/rules.d + sudo cp ~/zephyr-sdk-0.12.2/sysroots/x86_64-pokysdk-linux/usr/share/openocd/contrib/60-openocd.rules /etc/udev/rules.d sudo udevadm control --reload .. group-tab:: macOS diff --git a/doc/getting_started/installation_linux.rst b/doc/getting_started/installation_linux.rst index dcbf96e4614..f64a60f9152 100644 --- a/doc/getting_started/installation_linux.rst +++ b/doc/getting_started/installation_linux.rst @@ -240,19 +240,19 @@ Follow these steps to install the Zephyr SDK: .. code-block:: console - wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.12.1/zephyr-sdk-0.12.1-x86_64-linux-setup.run + wget https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.12.2/zephyr-sdk-0.12.2-x86_64-linux-setup.run - (You can change *0.12.1* to another version if needed; the `Zephyr + (You can change *0.12.2* to another version if needed; the `Zephyr Downloads`_ page contains all available SDK releases.) #. Run the installation binary, installing the SDK at - :file:`~/zephyr-sdk-0.12.1`: + :file:`~/zephyr-sdk-0.12.2`: .. code-block:: console cd - chmod +x zephyr-sdk-0.12.1-x86_64-linux-setup.run - ./zephyr-sdk-0.12.1-x86_64-linux-setup.run -- -d ~/zephyr-sdk-0.12.1 + chmod +x zephyr-sdk-0.12.2-x86_64-linux-setup.run + ./zephyr-sdk-0.12.2-x86_64-linux-setup.run -- -d ~/zephyr-sdk-0.12.2 You can pick another directory if you want. If this fails, make sure Zephyr's dependencies were installed as described in `Install Requirements @@ -272,7 +272,7 @@ installed it. * ``/usr/zephyr-sdk[-x.y.z]`` * ``/usr/local/zephyr-sdk[-x.y.z]`` - where ``[-x.y.z]`` is optional text, and can be any text, for example ``-0.12.1``. + where ``[-x.y.z]`` is optional text, and can be any text, for example ``-0.12.2``. If you install the Zephyr SDK outside any of those locations, then it is required to register the Zephyr SDK in the CMake package registry during @@ -283,7 +283,7 @@ installed it. containing multiple Zephyr SDKs, allowing for automatic toolchain selection, for example: ``ZEPHYR_SDK_INSTALL_DIR=/company/tools`` - * ``/company/tools/zephyr-sdk-0.12.1`` + * ``/company/tools/zephyr-sdk-0.12.2`` * ``/company/tools/zephyr-sdk-a.b.c`` * ``/company/tools/zephyr-sdk-x.y.z``