Merge pull request #115 from LedgerHQ/tdj/add_flex_target

add flex target
LedgerHQ · Apr 4, 2024 · 065c57a · 065c57a
2 parents 06e6c27 + 4a1ff50
commit 065c57a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,14 @@ 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.19.0] - 2024-04-03
+
+### Added
+    - Flex target
+
+### Changed
+    - dev-tools: Bump ragger version to 1.16+
+
 ## [3.18.0] - 2024-03-27
 
 ### Changed
@@ -60,7 +68,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [3.12.1] - 2024-01-11
 
 ### Changed
-    - Update cargo-ledger 
+    - Update cargo-ledger
 
 ## [3.12.0] - 2024-01-10
 
@@ -110,7 +118,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [3.9.0] - 2023-10-25
 
 ### Added
-    - Add a Cargo config global file in full image 
+    - Add a Cargo config global file in full image
 
 ## [3.8.0] - 2023-10-09
 

diff --git a/README.md b/README.md
@@ -57,6 +57,12 @@ $ sudo docker run --rm -ti -v "$(realpath .):/app" --user $(id -u $USER):$(id -g
 bash$ BOLOS_SDK=$STAX_SDK make
 ```
 
+* For Flex
+```bash
+$ sudo docker run --rm -ti -v "$(realpath .):/app" --user $(id -u $USER):$(id -g $USER) ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
+bash$ BOLOS_SDK=$FLEX_SDK make
+```
+
 ### Code static analysis
 
 The Docker images include the [Clang Static Analyzer](https://clang-analyzer.llvm.org/), which can be invoked with:
@@ -116,7 +122,7 @@ bash$ source ./venv/bin/activate
 
 ## Load the app on a physical device
 
-:warning: Only Nano S, Nano S+ and Stax devices allow application side-loading. This section will not work with a Nano X.
+:warning: Only Nano S, Nano S+, Stax and Flex devices allow application side-loading. This section will not work with a Nano X.
 
 To load the app from the container, you will need additional docker arguments in order to allow Docker to access your USB port.
 Your physical device must be connected, unlocked and the screen showing the dashboard (not inside an application). Same as for compilation, `BOLOS_SDK` variable is used to specify the target device. Use the following docker command to load the app (here for Nano S device) :

diff --git a/dev-tools/Dockerfile b/dev-tools/Dockerfile
@@ -20,4 +20,4 @@ ARG PYTHON_BUILD_DEPS=libffi-dev,python3-dev,py3-virtualenv
 RUN apk add $(echo -n "$PYTHON_BUILD_DEPS" | tr , ' ')
 
 # Install test tools (Ragger framework, Speculos emulator, Ledgerblue...)
-RUN pip3 install ragger[tests,all_backends]==1.16.0
+RUN pip3 install --no-cache-dir "ragger[tests,all_backends]~=1.16"
diff --git a/lite/Dockerfile b/lite/Dockerfile
@@ -89,6 +89,11 @@ ENV STAX_SDK=/opt/stax-secure-sdk
 RUN git -C "$LEDGER_SECURE_SDK" worktree add "$STAX_SDK" v15.2.0
 RUN echo stax > $STAX_SDK/.target
 
+# Latest Flex SDK (OS europa_0.1.0-re3 => based on API_LEVEL 18)
+ENV FLEX_SDK=/opt/flex-secure-sdk
+RUN git -C "$LEDGER_SECURE_SDK" worktree add "$FLEX_SDK" v18.1.0
+RUN echo flex > $FLEX_SDK/.target
+
 # Default SDK
 ENV BOLOS_SDK=$NANOS_SDK