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

LNX & Stax SDKs update #77

Merged
merged 6 commits into from
Jul 31, 2023
Merged

LNX & Stax SDKs update #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4731b6b
Now uses a virtual package for container building dependencies
apaillier-ledger Mar 6, 2023
b435cd1
Removed superfluous info from SDK comments
apaillier-ledger Jul 28, 2023
50c8d8e
Update SDK to LNX 2.2.2
apaillier-ledger Jul 28, 2023
126bfa6
Update SDK to Stax 1.3.0-rc1
apaillier-ledger Jul 28, 2023
7ae4511
hidapi package dependency workaround
apaillier-ledger Jul 28, 2023
d8407a7
Update changelog
apaillier-ledger Jul 28, 2023
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 14 additions & 8 deletions lite/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,15 @@ 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 -t python_build_deps eudev-dev \
jpeg-dev \
libusb-dev \
linux-headers \
python3-dev \
zlib-dev

RUN apk add $(echo -n "$PYTHON_BUILD_DEPS" | tr , ' ')
# 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
Expand All @@ -60,26 +66,26 @@ 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.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 => 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.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
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

Expand Down