From 19a725e5087113facf83cac20ac5103b832704ac Mon Sep 17 00:00:00 2001 From: DrunkBatya Date: Tue, 10 Sep 2024 21:14:12 +0000 Subject: [PATCH] Bump openocd, cryptography --- darwin/Dockerfile | 2 +- darwin/requirements.txt | 2 +- linux/Dockerfile-aarch64 | 2 +- linux/Dockerfile-x86_64 | 2 +- linux/requirements.txt | 2 +- windows/Dockerfile | 2 +- windows/requirements.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/darwin/Dockerfile b/darwin/Dockerfile index dfe20f5..4c01d88 100644 --- a/darwin/Dockerfile +++ b/darwin/Dockerfile @@ -79,7 +79,7 @@ ADD https://github.com/libusb/hidapi/archive/refs/tags/hidapi-0.14.0.tar.gz /too RUN tar -xvf /toolchain/src/src/archives/hidapi-0.14.0.tar.gz -C /toolchain/src/src/ RUN mv /toolchain/src/src/hidapi-hidapi-0.14.0 /toolchain/src/src/hidapi -RUN bash -c "git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd && cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3" +RUN bash -c "git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd && cd /toolchain/src/src/openocd && git reset --hard 2c984ce7ce8e0c88894d9e40924fe9bcc052878e" ADD scripts/build-mac-flipper-tools.sh /toolchain/src/ RUN bash /toolchain/src/build-mac-flipper-tools.sh diff --git a/darwin/requirements.txt b/darwin/requirements.txt index 12b188c..7382431 100644 --- a/darwin/requirements.txt +++ b/darwin/requirements.txt @@ -9,7 +9,7 @@ charset-normalizer==3.3.2 click==8.1.7 colorlog==6.8.2 contextlib2==21.6.0 -cryptography==42.0.8 +cryptography==43.0.1 dataclass-wizard==0.22.3 ecdsa==0.19.0 esptool==4.7.0 diff --git a/linux/Dockerfile-aarch64 b/linux/Dockerfile-aarch64 index 9b4cbec..88d08e6 100644 --- a/linux/Dockerfile-aarch64 +++ b/linux/Dockerfile-aarch64 @@ -107,7 +107,7 @@ ADD https://github.com/libusb/hidapi/archive/refs/tags/hidapi-0.14.0.tar.gz /too RUN tar -xvf /toolchain/src/src/archives/hidapi-0.14.0.tar.gz -C /toolchain/src/src/ RUN mv /toolchain/src/src/hidapi-hidapi-0.14.0 /toolchain/src/src/hidapi -RUN bash -c "git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd && cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3" +RUN bash -c "git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd && cd /toolchain/src/src/openocd && git reset --hard 2c984ce7ce8e0c88894d9e40924fe9bcc052878e" ADD scripts/relink.sh /usr/bin/ ADD scripts/build-linux-flipper-tools.sh /toolchain/src/ diff --git a/linux/Dockerfile-x86_64 b/linux/Dockerfile-x86_64 index 47f003e..67708d0 100644 --- a/linux/Dockerfile-x86_64 +++ b/linux/Dockerfile-x86_64 @@ -107,7 +107,7 @@ ADD https://github.com/libusb/hidapi/archive/refs/tags/hidapi-0.14.0.tar.gz /too RUN tar -xvf /toolchain/src/src/archives/hidapi-0.14.0.tar.gz -C /toolchain/src/src/ RUN mv /toolchain/src/src/hidapi-hidapi-0.14.0 /toolchain/src/src/hidapi -RUN bash -c "git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd && cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3" +RUN bash -c "git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd && cd /toolchain/src/src/openocd && git reset --hard 2c984ce7ce8e0c88894d9e40924fe9bcc052878e" ADD scripts/relink.sh /usr/bin/ ADD scripts/build-linux-flipper-tools.sh /toolchain/src/ diff --git a/linux/requirements.txt b/linux/requirements.txt index 12b188c..7382431 100644 --- a/linux/requirements.txt +++ b/linux/requirements.txt @@ -9,7 +9,7 @@ charset-normalizer==3.3.2 click==8.1.7 colorlog==6.8.2 contextlib2==21.6.0 -cryptography==42.0.8 +cryptography==43.0.1 dataclass-wizard==0.22.3 ecdsa==0.19.0 esptool==4.7.0 diff --git a/windows/Dockerfile b/windows/Dockerfile index 068067f..9a68f0a 100644 --- a/windows/Dockerfile +++ b/windows/Dockerfile @@ -75,7 +75,7 @@ ADD https://github.com/libusb/hidapi/archive/refs/tags/hidapi-0.14.0.tar.gz /too RUN tar -xvf /toolchain/src/src/archives/hidapi-0.14.0.tar.gz -C /toolchain/src/src/ RUN mv /toolchain/src/src/hidapi-hidapi-0.14.0 /toolchain/src/src/hidapi -RUN bash -c "git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd && cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3" +RUN bash -c "git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd && cd /toolchain/src/src/openocd && git reset --hard 2c984ce7ce8e0c88894d9e40924fe9bcc052878e" ADD scripts/build-windows-flipper-tools.sh /toolchain/src/ RUN bash /toolchain/src/build-windows-flipper-tools.sh diff --git a/windows/requirements.txt b/windows/requirements.txt index 12b188c..7382431 100644 --- a/windows/requirements.txt +++ b/windows/requirements.txt @@ -9,7 +9,7 @@ charset-normalizer==3.3.2 click==8.1.7 colorlog==6.8.2 contextlib2==21.6.0 -cryptography==42.0.8 +cryptography==43.0.1 dataclass-wizard==0.22.3 ecdsa==0.19.0 esptool==4.7.0