diff options
| author | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2019-03-21 19:49:13 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <paul.sokolovsky@linaro.org> | 2019-03-21 19:49:13 +0300 |
| commit | 7393977c661c4d839b1e1e1b6019efacae116fb4 (patch) | |
| tree | 46a1afcabfa4b9961faf805a67b5276554acf5af | |
| parent | 3196e40061b6130b368cc5149dd1ddcb3d529891 (diff) | |
zephyr-upstream, lite-aeolus: Update to Zephyr SDK 0.10.0.
Zephyr master as of now requires 0.10.0 and fails without it.
Change-Id: I32e32ab466206b64b4d1a399a063197620ccb1ca
Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
| -rw-r--r-- | lite-aeolus/build-init.sh | 6 | ||||
| -rwxr-xr-x | zephyr-upstream/builders.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lite-aeolus/build-init.sh b/lite-aeolus/build-init.sh index daeaf03cf3..44eddf6c6e 100644 --- a/lite-aeolus/build-init.sh +++ b/lite-aeolus/build-init.sh @@ -20,15 +20,15 @@ echo "GIT_COMMIT=$(git rev-parse --short=8 HEAD)" > env_var_parameters # Toolchains are pre-installed and come from: # https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2 -# https://github.com/zephyrproject-rtos/meta-zephyr-sdk/releases/download/0.9.5/zephyr-sdk-0.9.5-setup.run -# To install Zephyr SDK: ./zephyr-sdk-0.9.5-setup.run --quiet --nox11 -- <<< "${HOME}/srv/toolchain/zephyr-sdk-0.9.5" +# https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.10.0/zephyr-sdk-0.10.0-setup.run +# To install Zephyr SDK: ./zephyr-sdk-0.10.0-setup.run --quiet --nox11 -- <<< "${HOME}/srv/toolchain/zephyr-sdk-0.10.0" case "${ZEPHYR_GCC_VARIANT}" in gccarmemb) export GCCARMEMB_TOOLCHAIN_PATH="${HOME}/srv/toolchain/gcc-arm-none-eabi-7-2018-q2-update" ;; zephyr) - export ZEPHYR_SDK_INSTALL_DIR="${HOME}/srv/toolchain/zephyr-sdk-0.9.5" + export ZEPHYR_SDK_INSTALL_DIR="${HOME}/srv/toolchain/zephyr-sdk-0.10.0" ;; esac diff --git a/zephyr-upstream/builders.sh b/zephyr-upstream/builders.sh index 44d1e02443..95503c129e 100755 --- a/zephyr-upstream/builders.sh +++ b/zephyr-upstream/builders.sh @@ -31,12 +31,12 @@ head -5 Makefile # Toolchains are pre-installed and come from: # https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2 -# https://github.com/zephyrproject-rtos/meta-zephyr-sdk/releases/download/0.9.5/zephyr-sdk-0.9.5-setup.run -# To install Zephyr SDK: ./zephyr-sdk-0.9.5-setup.run --quiet --nox11 -- <<< "${HOME}/srv/toolchain/zephyr-sdk-0.9.5" +# https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.10.0/zephyr-sdk-0.10.0-setup.run +# To install Zephyr SDK: ./zephyr-sdk-0.10.0-setup.run --quiet --nox11 -- <<< "${HOME}/srv/toolchain/zephyr-sdk-0.10.0" export GNUARMEMB_TOOLCHAIN_PATH="${HOME}/srv/toolchain/gcc-arm-none-eabi-7-2018-q2-update" # We building with the gnuarmemb toolchain, we need ZEPHYR_SDK_INSTALL_DIR to find things like conf -export ZEPHYR_SDK_INSTALL_DIR="${HOME}/srv/toolchain/zephyr-sdk-0.9.5" +export ZEPHYR_SDK_INSTALL_DIR="${HOME}/srv/toolchain/zephyr-sdk-0.10.0" # Set build environment variables export LANG=C.UTF-8 |