Merge #603: tests: Update bitcoind and coldcard patches

7a5156b tests: Patch coldcard ffilib (Andrew Chow) 36d356b ci: Install swig in docker container (Andrew Chow) a922b2a tests: Remove libngu patch (Andrew Chow) 9573008 tests: Update bitcoind patches (Andrew Chow) Pull request description: * Updates the bitcoind patches to avoid new merge conflicts. * Update coldcard patches to avoid new merge conflicts. Also added a new patch required to make the simulator run. * Install `swig` and `libpcsclite-dev` to work with new coldcard firmware and libraries Top commit has no ACKs. Tree-SHA512: 77a48f6a551df65586325b58508e337a226e6a50636446315fa459a7c7f3873b67a5e69db86270c5370b2a79fb7e77289f6b94d7f804d5db2c6f204a7a255a2d
bitcoin-core · May 5, 2022 · 72f108d · 72f108d
2 parents 2c757c8 + 7a5156b
commit 72f108d
Show file tree

Hide file tree

Showing 9 changed files with 541 additions and 435 deletions.
diff --git a/ci/cirrus.Dockerfile b/ci/cirrus.Dockerfile
@@ -26,6 +26,7 @@ RUN apt-get install -y \
     libevent-dev \
     libgcrypt20-dev \
     libnewlib-arm-none-eabi \
+    libpcsclite-dev \
     libsdl2-dev \
     libsdl2-image-dev \
     libssl-dev \
@@ -35,7 +36,8 @@ RUN apt-get install -y \
     ninja-build \
     pkg-config \
     protobuf-compiler \
-    qemu-user-static
+    qemu-user-static \
+    swig
 
 RUN pip install poetry flake8
 RUN wget https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-gnu/rustup-init

diff --git a/ci/py310.Dockerfile b/ci/py310.Dockerfile
@@ -5,11 +5,13 @@ RUN apt-get update
 RUN apt-get install -y \
     cython3 \
     git \
+    libpcsclite-dev \
     libsdl2-dev \
     libsdl2-image-dev \
     libudev-dev \
     libusb-1.0-0-dev \
-    qemu-user-static
+    qemu-user-static \
+    swig
 
 RUN pip install poetry flake8
 

diff --git a/ci/py37.Dockerfile b/ci/py37.Dockerfile
@@ -5,11 +5,13 @@ RUN apt-get update
 RUN apt-get install -y \
     cython3 \
     git \
+    libpcsclite-dev \
     libsdl2-dev \
     libsdl2-image-dev \
     libudev-dev \
     libusb-1.0-0-dev \
-    qemu-user-static
+    qemu-user-static \
+    swig
 
 RUN pip install poetry flake8
 

diff --git a/ci/py38.Dockerfile b/ci/py38.Dockerfile
@@ -5,11 +5,13 @@ RUN apt-get update
 RUN apt-get install -y \
     cython3 \
     git \
+    libpcsclite-dev \
     libsdl2-dev \
     libsdl2-image-dev \
     libudev-dev \
     libusb-1.0-0-dev \
-    qemu-user-static
+    qemu-user-static \
+    swig
 
 RUN pip install poetry flake8
 

diff --git a/ci/py39.Dockerfile b/ci/py39.Dockerfile
@@ -5,11 +5,13 @@ RUN apt-get update
 RUN apt-get install -y \
     cython3 \
     git \
+    libpcsclite-dev \
     libsdl2-dev \
     libsdl2-image-dev \
     libudev-dev \
     libusb-1.0-0-dev \
-    qemu-user-static
+    qemu-user-static \
+    swig
 
 RUN pip install poetry flake8