Skip to content

Commit

Permalink
Bump openocd, cryptography
Browse files Browse the repository at this point in the history
  • Loading branch information
@drunkbatya
drunkbatya committed Sep 10, 2024
1 parent 07f42e6 commit 19a725e
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion darwin/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion darwin/requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion linux/Dockerfile-aarch64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion linux/Dockerfile-x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion linux/requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion windows/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion windows/requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 19a725e

Please sign in to comment.