From 4731b6b820ac92de955311e7e2b824d9e13b9ed9 Mon Sep 17 00:00:00 2001 From: Alexandre Paillier Date: Mon, 6 Mar 2023 18:37:45 +0100 Subject: [PATCH 1/6] Now uses a virtual package for container building dependencies --- lite/Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lite/Dockerfile b/lite/Dockerfile index a42dffc..bea8016 100644 --- a/lite/Dockerfile +++ b/lite/Dockerfile @@ -42,9 +42,12 @@ RUN apk add \ zlib # Python packages building dependencies, can be removed afterwards -ARG PYTHON_BUILD_DEPS=eudev-dev,jpeg-dev,libusb-dev,linux-headers,python3-dev,zlib-dev - -RUN apk add $(echo -n "$PYTHON_BUILD_DEPS" | tr , ' ') +RUN apk add -t python_build_deps eudev-dev \ + jpeg-dev \ + libusb-dev \ + linux-headers \ + python3-dev \ + zlib-dev # Python package to load app onto device RUN pip3 install ledgerblue tomli-w @@ -79,7 +82,7 @@ RUN echo stax > $STAX_SDK/.target ENV BOLOS_SDK=$NANOS_SDK # Cleanup, remove packages that aren't needed anymore -RUN apk del $(echo -n "$PYTHON_BUILD_DEPS" | tr , ' ') +RUN apk del python_build_deps WORKDIR /app From b435cd1a933af82d1e8dc93c43075b5297a61c28 Mon Sep 17 00:00:00 2001 From: Alexandre Paillier Date: Fri, 28 Jul 2023 17:36:16 +0200 Subject: [PATCH 2/6] Removed superfluous info from SDK comments --- lite/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lite/Dockerfile b/lite/Dockerfile index bea8016..d67e6fb 100644 --- a/lite/Dockerfile +++ b/lite/Dockerfile @@ -63,17 +63,17 @@ RUN git clone --branch v2.1.0-9 --depth 1 "$GIT_SERVER/nanos-secure-sdk.git" "$N ENV LEDGER_SECURE_SDK=/opt/ledger-secure-sdk RUN git clone "$GIT_SERVER/ledger-secure-sdk.git" "$LEDGER_SECURE_SDK" -# Latest Nano X SDK (OS nanox_2.2.1 => based on API_LEVEL 5 => clone on SDK tag v5.4.1) +# Latest Nano X SDK (OS nanox_2.2.1 => based on API_LEVEL 5) ENV NANOX_SDK=/opt/nanox-secure-sdk RUN git -C "$LEDGER_SECURE_SDK" worktree add "$NANOX_SDK" v5.4.1 RUN echo nanox > $NANOX_SDK/.target -# Latest Nano S+ SDK (OS nanos+_1.1.0 => based on API_LEVEL 1 => clone on SDK tag v1.6.0) +# Latest Nano S+ SDK (OS nanos+_1.1.0 => based on API_LEVEL 1) ENV NANOSP_SDK=/opt/nanosplus-secure-sdk RUN git -C "$LEDGER_SECURE_SDK" worktree add "$NANOSP_SDK" v1.6.0 RUN echo nanos2 > $NANOSP_SDK/.target -# Latest Stax SDK (OS stax_1.2.1 => based on API_LEVEL 11 => clone on SDK tag v11.1.0) +# Latest Stax SDK (OS stax_1.2.1 => based on API_LEVEL 11) ENV STAX_SDK=/opt/stax-secure-sdk RUN git -C "$LEDGER_SECURE_SDK" worktree add "$STAX_SDK" v11.1.0 RUN echo stax > $STAX_SDK/.target From 50c8d8ed324317a3fdb1f372237cb649b6e86a00 Mon Sep 17 00:00:00 2001 From: Alexandre Paillier Date: Fri, 28 Jul 2023 17:36:54 +0200 Subject: [PATCH 3/6] Update SDK to LNX 2.2.2 --- lite/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lite/Dockerfile b/lite/Dockerfile index d67e6fb..d1ba9d5 100644 --- a/lite/Dockerfile +++ b/lite/Dockerfile @@ -63,9 +63,9 @@ RUN git clone --branch v2.1.0-9 --depth 1 "$GIT_SERVER/nanos-secure-sdk.git" "$N ENV LEDGER_SECURE_SDK=/opt/ledger-secure-sdk RUN git clone "$GIT_SERVER/ledger-secure-sdk.git" "$LEDGER_SECURE_SDK" -# Latest Nano X SDK (OS nanox_2.2.1 => based on API_LEVEL 5) +# Latest Nano X SDK (OS nanox_2.2.2 => based on API_LEVEL 5) ENV NANOX_SDK=/opt/nanox-secure-sdk -RUN git -C "$LEDGER_SECURE_SDK" worktree add "$NANOX_SDK" v5.4.1 +RUN git -C "$LEDGER_SECURE_SDK" worktree add "$NANOX_SDK" v5.4.2 RUN echo nanox > $NANOX_SDK/.target # Latest Nano S+ SDK (OS nanos+_1.1.0 => based on API_LEVEL 1) From 126bfa67ee72e4e1ff46c586690eb2c8192ce0e5 Mon Sep 17 00:00:00 2001 From: Alexandre Paillier Date: Fri, 28 Jul 2023 17:37:35 +0200 Subject: [PATCH 4/6] Update SDK to Stax 1.3.0-rc1 --- lite/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lite/Dockerfile b/lite/Dockerfile index d1ba9d5..031f49c 100644 --- a/lite/Dockerfile +++ b/lite/Dockerfile @@ -73,9 +73,9 @@ ENV NANOSP_SDK=/opt/nanosplus-secure-sdk RUN git -C "$LEDGER_SECURE_SDK" worktree add "$NANOSP_SDK" v1.6.0 RUN echo nanos2 > $NANOSP_SDK/.target -# Latest Stax SDK (OS stax_1.2.1 => based on API_LEVEL 11) +# Latest Stax SDK (OS stax_1.3.0-rc1 => based on API_LEVEL 12) ENV STAX_SDK=/opt/stax-secure-sdk -RUN git -C "$LEDGER_SECURE_SDK" worktree add "$STAX_SDK" v11.1.0 +RUN git -C "$LEDGER_SECURE_SDK" worktree add "$STAX_SDK" v12.1.0 RUN echo stax > $STAX_SDK/.target # Default SDK From 7ae45117906051dd7cf6103327220c35462c28be Mon Sep 17 00:00:00 2001 From: Alexandre Paillier Date: Fri, 28 Jul 2023 18:25:34 +0200 Subject: [PATCH 5/6] hidapi package dependency workaround --- lite/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lite/Dockerfile b/lite/Dockerfile index 031f49c..0c76ab0 100644 --- a/lite/Dockerfile +++ b/lite/Dockerfile @@ -49,6 +49,9 @@ RUN apk add -t python_build_deps eudev-dev \ python3-dev \ zlib-dev +# temporary, until a fixed version of hidapi is released (with https://github.com/trezor/cython-hidapi/commit/749da69) +RUN pip3 install 'Cython<3' + # Python package to load app onto device RUN pip3 install ledgerblue tomli-w From d8407a7cea4940d73e911756ee8bc63b44557f7a Mon Sep 17 00:00:00 2001 From: Alexandre Paillier Date: Fri, 28 Jul 2023 18:19:14 +0200 Subject: [PATCH 6/6] Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea4dc8f..181ce7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.2.5] - 2023-07-28 + +### Changed + - Bump NanoX & Stax SDK versions + ## [3.2.4] - 2023-07-21 ### Changed