Fix windows gdb-py3, fix aarch64 linux openocd

flipperdevices · Feb 15, 2024 · ec9c025 · ec9c025
1 parent d23f0c6
commit ec9c025
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/linux/Dockerfile-aarch64 b/linux/Dockerfile-aarch64
@@ -94,8 +94,8 @@ ADD https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.6/third-
 RUN tar -xvf /toolchain/src/src/archives/third-party-17.0.6.src.tar.xz -C /toolchain/src/src/clang-format/
 RUN mv /toolchain/src/src/clang-format/third-party-17.0.6.src /toolchain/src/src/clang-format/third-party
 
-ADD https://github.com/xpack-dev-tools/openocd-xpack/releases/download/v0.12.0-2/xpack-openocd-0.12.0-2-linux-x64.tar.gz /toolchain/src/src/archives/
-RUN tar -xvf /toolchain/src/src/archives/xpack-openocd-0.12.0-2-linux-x64.tar.gz -C /tmp
+ADD https://github.com/xpack-dev-tools/openocd-xpack/releases/download/v0.12.0-2/xpack-openocd-0.12.0-2-linux-arm64.tar.gz /toolchain/src/src/archives/
+RUN tar -xvf /toolchain/src/src/archives/xpack-openocd-0.12.0-2-linux-arm64.tar.gz -C /tmp
 RUN rm -rf /tmp/xpack-openocd-0.12.0-2/README.md
 RUN rm -rf /tmp/xpack-openocd-0.12.0-2/distro-info
 RUN rsync -azv /tmp/xpack-openocd-0.12.0-2/ /toolchain/linux-output-root

diff --git a/windows/Dockerfile b/windows/Dockerfile
@@ -87,3 +87,5 @@ ADD scripts/bundle_upload.sh /usr/bin/
 RUN strip.sh
 COPY --from=flipperzero-toolchain-windows-src /usr/x86_64-w64-mingw32/lib /tmp/lib/
 RUN cp /tmp/lib/*.dll /toolchain/windows-output-root/bin/
+RUN cp /toolchain/windows-output-root/python/python311.dll /toolchain/windows-output-root/bin/
+ADD patch/python311._pth /toolchain/windows-output-root/bin/
diff --git a/windows/patch/python311._pth b/windows/patch/python311._pth
@@ -0,0 +1,2 @@
+../python/Lib
+../python/DLLs