Reproducible ARM builds

diff --git a/BUILDING.md b/BUILDING.md
index fe473d161cd0b1f087a41e10f0307f63b1c51c8f..a8f867245c55e191a5d67d08b962028e80de4696 100644 (file)
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -1,48 +1,47 @@
-## Buildbot builds
+## Building with Docker
 
-The docker build bins can be found here: https://build.featherwallet.org/files/
-
-## Docker static builds
-
-Static builds via Docker are done in 3 steps:
+Builds with Docker are done in 3 steps:
 
 1. Cloning this repository (+submodules)
-2. Creating a base Docker image
-3. Using the base image to compile a build
+2. Creating a base image containing the build environment
+3. Building Feather using the base image
 
 ### Linux x86-64 (reproducible)
 
-The docker image for reproducible Linux static builds uses Ubuntu 16.04 and compiles the required libraries statically 
-so that the resulting Feather binary is static. For more information, check the Dockerfile: `Dockerfile`.
+The instructions in this section are for 64-bit AMD/Intel processors. For ARM64 platforms see the next section.
+
+Binaries produced in this section are reproducible and their digests should match those of release binaries.
 
 #### 1. Clone
 
+Replace `master` with the desired version tag (e.g. `beta-8`) to build the release binary.
+
 ```bash
-git clone --branch master --recursive https://git.featherwallet.org/feather/feather.git
+git clone https://git.featherwallet.org/feather/feather.git
 cd feather
+git checkout master
+git submodule update --init --recursive
 ```
 
-Replace `master` with the desired version tag (e.g. `beta-8`) to build the release binary.
-
 #### 2. Base image
 
 ```bash
-docker build --tag feather:linux --build-arg THREADS=4 .
+docker build -t feather:linux -f Dockerfile.linux --build-arg THREADS=8 .
 ```
 
 Building the base image takes a while. You only need to build the base image once per release.
 
 #### 3. Build
 
-##### Standalone binary
+##### Standalone static binary
+
+If you're re-running a build make sure to `rm -rf build/` first.
 
 ```bash
 docker run --rm -it -v $PWD:/feather -w /feather feather:linux sh -c 'WITH_SCANNER=Off make release-static -j8'
 ```
 
-If you're re-running a build make sure to `rm -rf build/` first.
-
-The resulting binary can be found in `build/bin/feather`.
+The resulting binary can be found in `./build/bin/`.
 
 ##### AppImage
 
@@ -54,10 +53,16 @@ docker run --rm -it -v $PWD:/feather -w /feather/build feather:linux ../contrib/
 
 The resulting AppImage will be located in `./build`.
 
-### Linux arm64
+### Linux ARM64 (reproducible)
+
+This section describes how to build Feather for ARM64 based platforms (including Raspberry Pi 3 and later, running 64-bit Rasbian).
+
+Binaries produced in this section are not yet reproducible.
 
 #### 1. Clone
 
+Replace `master` with the desired version tag (e.g. `beta-8`) to build the release binary.
+
 ```bash
 git clone https://git.featherwallet.org/feather/feather.git
 cd feather
@@ -65,18 +70,18 @@ git checkout master
 git submodule update --init --recursive
 ```
 
-Replace `master` with the desired version tag (e.g. `beta-8`) to build the release binary.
-
 #### 2. Base image
 
 ```bash
-docker build --tag feather:linux-arm64 -f Dockerfile.linux-arm64 --build-arg THREADS=16 .
+docker build --tag feather:linux-arm64 --platform linux/arm64 -f Dockerfile.linux --build-arg THREADS=8 .
 ```
 
 Building the base image takes a while (especially when emulated on x86-64). You only need to build the base image once per release.
 
 #### 3. Build
 
+##### Standalone static binary
+
 ```bash
 docker run --platform linux/arm64/v8 --rm -it -v $PWD:/feather -w /feather feather:linux-arm64 sh -c 'WITH_SCANNER=Off make release-static-linux-arm64 -j8'
 ```
@@ -87,7 +92,7 @@ Note: If you intend to run Feather on a Raspberry Pi or any device without AES h
 docker run --platform linux/arm64/v8 --rm -it -v $PWD:/feather -w /feather feather:linux-arm64 sh -c 'WITH_SCANNER=Off make release-static-linux-arm64-rpi -j8'
 ```
 
-The resulting binary can be found in `build/bin/`.
+The resulting binary can be found in `./build/bin/`.
 
 ### Windows (reproducible)
 
@@ -117,9 +122,11 @@ docker run --rm -it -v $PWD:/feather -w /feather feather:win sh -c 'make depends
 
 If you're re-running a build make sure to `rm -rf build/` first.
 
-The resulting binary can be found in `build/x86_64-w64-mingw32/release/bin/feather.exe`.
+The resulting binary can be found in `./build/x86_64-w64-mingw32/release/bin/`.
+
+---
 
-## macOS
+## Building on macOS
 
 For macOS it's easiest to leverage [brew](https://brew.sh) to install the required dependencies. 
 

diff --git a/Dockerfile b/Dockerfile.linux
similarity index 92%
rename from Dockerfile
rename to Dockerfile.linux
index 793cda04f3a169438a313754da98d9bb5d90a313..5e6728c07a2c87da60ad1e8f9b617f4aacb28240 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile.linux
@@ -1,5 +1,4 @@
-# bionic-20210615.1 (18.04)
-FROM ubuntu@sha256:ce1e17c0e0aa9db95cf19fb6ba297eb2a52b9ba71768f32a74ab39213c416600
+FROM ubuntu:bionic-20210723
 
 ARG THREADS=4
 
@@ -14,15 +13,18 @@ ENV CHECK_UPDATES=ON
 ENV WITH_SCANNER=ON
 ENV TOR_VERSION=0.4.6.6
 
-COPY --from=featherwallet/feather-deps:linux-beta-8 /deps /deps
-COPY --from=featherwallet/feather-deps:linux-beta-8 /var/cache/apt/archives /archives
+COPY --from=featherwallet/feather-deps:linux-1.0.0 /deps /deps
+COPY --from=featherwallet/feather-deps:linux-1.0.0 /var/cache/apt/archives /archives
 
 RUN apt-get update && \
     apt-get install -y gpg xz-utils ca-certificates wget && \
     rm -rf /var/lib/apt/lists/*
 
 COPY contrib/build-deps/verify-packages.sh .
-RUN bash verify-packages.sh && rm -rf /deps /archives
+RUN bash verify-packages.sh && \
+    cd /archives && \
+    dpkg -i --force-depends *.deb && \
+    rm -rf /deps /archives
 
 # OpenSSL: Required for CMake, Qt 5.15.2, libwallet, Tor
 ENV OPENSSL_ROOT_DIR=/usr/local/openssl/
@@ -87,11 +89,19 @@ RUN git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 && \
     sed -ri s/\(Libs:.*\)/\\1\ -lz/ /usr/local/lib/pkgconfig/freetype2.pc && \
     sed -i s/\\/usr\\/X11R6\\/lib64/\\/usr\\/local\\/lib/ qtbase/mkspecs/linux-g++-64/qmake.conf
 
+RUN if [ "$(uname -m)" = "aarch64" ]; then \
+        export LIBDIR="/usr/lib/aarch64-linux-gnu"; \
+        export QT_PLATFORM="linux-aarch64-gnu-g++"; \
+    else \
+        export LIBDIR="/usr/lib/x86_64-linux-gnu"; \
+        export QT_PLATFORM="linux-g++-64"; \
+    fi
+
 RUN cd qt5 && \
-    rm /usr/lib/x86_64-linux-gnu/libX11.a && \
-    rm /usr/lib/x86_64-linux-gnu/libX11-xcb.a && \
+    rm $LIBDIR/libX11.a && \
+    rm $LIBDIR/libX11-xcb.a && \
     OPENSSL_LIBS="-lssl -lcrypto -lpthread -ldl" \
-    ./configure --prefix=/usr -platform linux-g++-64 -opensource -confirm-license -release -static -no-avx \
+    ./configure --prefix=/usr -platform $QT_PLATFORM -opensource -confirm-license -release -static -no-avx \
         -no-opengl -qpa xcb --xcb -xcb-xlib -feature-xlib -openssl-linked -I /usr/local/openssl/include \
         -L /usr/local/openssl/lib -system-freetype -fontconfig -glib \
         -no-dbus -no-sql-sqlite -no-use-gold-linker -no-kms \
@@ -168,15 +178,6 @@ RUN git clone -b v3.10.0 --depth 1 https://github.com/protocolbuffers/protobuf &
     make -j$THREADS install && \
     rm -rf $(pwd)
 
-# appimagetool: Used to created Feather AppImage
-RUN mkdir appimagetool && \
-    cd appimagetool && \
-    wget https://github.com/AppImage/AppImageKit/releases/download/12/appimagetool-x86_64.AppImage && \
-    echo "d918b4df547b388ef253f3c9e7f6529ca81a885395c31f619d9aaf7030499a13 appimagetool-x86_64.AppImage" | sha256sum -c && \
-    chmod +x appimagetool-x86_64.AppImage && \
-    ./appimagetool-x86_64.AppImage --appimage-extract && \
-    rm appimagetool-x86_64.AppImage
-
 # squashfs-tools: Used to create Feather AppImage
 RUN git clone https://github.com/plougher/squashfs-tools.git && \
     cd squashfs-tools/squashfs-tools && \
@@ -196,7 +197,7 @@ RUN git clone -b 0.12 --depth 1 https://github.com/NixOS/patchelf.git && \
     rm -rf $(pwd)
 
 # linuxdeployqt: Used to create Feather AppImage
-# build from source because latest release does not allow glib 2.27
+# build from source because latest release does not allow glibc 2.27
 RUN git clone https://github.com/probonopd/linuxdeployqt.git && \
     cd linuxdeployqt && \
     git reset --hard b4697483c98120007019c3456914cfd1dba58384 && \

diff --git a/Dockerfile.linux-arm64 b/Dockerfile.linux-arm64
deleted file mode 100644 (file)
index 6adc7bf..0000000
--- a/Dockerfile.linux-arm64
+++ /dev/null
@@ -1,343 +0,0 @@
-FROM arm64v8/ubuntu:18.04
-
-ARG THREADS=4
-
-ENV CFLAGS="-fPIC"
-ENV CPPFLAGS="-fPIC"
-ENV CXXFLAGS="-fPIC"
-ENV SOURCE_DATE_EPOCH=1397818193
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Feather build flags
-ENV CHECK_UPDATES=ON
-ENV WITH_SCANNER=ON
-ENV TOR_VERSION=0.4.6.6
-
-RUN apt update && \
-    apt install -y software-properties-common python3 build-essential automake libtool-bin git \
-        unzip \
-        libjpeg-dev libvpx-dev libvorbis-dev \
-        autopoint gettext gperf libpng-dev \
-        bison \
-        libx11-dev \
-        libx11-xcb-dev \
-        libxext-dev \
-        libxfixes-dev \
-        libxi-dev \
-        libxrender-dev \
-        libxcb1-dev \
-        libxcb-keysyms1-dev \
-        libxcb-image0-dev \
-        libxcb-icccm4-dev \
-        libxcb-xfixes0-dev \
-        libxcb-render-util0-dev \
-        libxcb-xinerama0-dev \
-        libxkbcommon-dev \
-        libxkbcommon-x11-dev \
-        libxcb-randr0-dev \
-        libxcb-sync-dev \
-        xutils-dev \
-        libxcb-util-dev \
-        libxcb-xinput-dev \
-        libudev1 libudev-dev \
-        gstreamer1.0-plugins-good \
-        libgstreamer1.0-dev \
-        libgstreamer-plugins-base1.0-dev \
-        libpsl5
-
-# OpenSSL: Required for CMake, Qt 5.15.2, libwallet, Tor
-ENV OPENSSL_ROOT_DIR=/usr/local/openssl/
-RUN git clone -b OpenSSL_1_1_1k --depth 1 https://github.com/openssl/openssl.git && \
-    cd openssl && \
-    git reset --hard fd78df59b0f656aefe96e39533130454aa957c00 && \
-    ./config no-shared no-dso --prefix=/usr/local/openssl && \
-    make -j$THREADS && \
-    make -j$THREADS install_sw && \
-    rm -rf $(pwd)
-
-# CMake: Required to build libqrencode, monero-seed, libzip
-RUN git clone -b v3.18.4 --depth 1 https://github.com/Kitware/CMake && \
-    cd CMake && \
-    git reset --hard 3cc3d42aba879fff5e85b363ae8f21386a3f9f9b && \
-    ./bootstrap && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-# freetype2: Required for Qt 5.15, fontconfig
-RUN git clone -b VER-2-10-2 --depth 1 https://git.savannah.gnu.org/git/freetype/freetype2.git && \
-    cd freetype2 && \
-    git reset --hard 132f19b779828b194b3fede187cee719785db4d8 && \
-    ./autogen.sh && \
-    ./configure --disable-shared --enable-static --with-zlib=no && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-# expat: Required for fontconfig
-RUN git clone -b R_2_2_9 --depth 1 https://github.com/libexpat/libexpat && \
-    cd libexpat/expat && \
-    git reset --hard a7bc26b69768f7fb24f0c7976fae24b157b85b13 && \
-    ./buildconf.sh && \
-    ./configure --disable-shared --enable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-# fontconfig: Required for Qt 5.15
-RUN git clone -b 2.13.92 --depth 1 https://gitlab.freedesktop.org/fontconfig/fontconfig && \
-    cd fontconfig && \
-    git reset --hard b1df1101a643ae16cdfa1d83b939de2497b1bf27 && \
-    ./autogen.sh --disable-shared --enable-static --sysconfdir=/etc --localstatedir=/var && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-ENV QT_VERSION=v5.15.2
-RUN git clone git://code.qt.io/qt/qt5.git -b ${QT_VERSION} --depth 1 && \
-    cd qt5 && \
-    git clone git://code.qt.io/qt/qtbase.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtimageformats.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtmultimedia.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtsvg.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qttools.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qttranslations.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtx11extras.git -b ${QT_VERSION} --depth 1 && \
-    git clone git://code.qt.io/qt/qtwebsockets.git -b ${QT_VERSION} --depth 1 && \
-    sed -ri s/\(Libs:.*\)/\\1\ -lexpat/ /usr/local/lib/pkgconfig/fontconfig.pc && \
-    sed -ri s/\(Libs:.*\)/\\1\ -lz/ /usr/local/lib/pkgconfig/freetype2.pc && \
-    sed -i s/\\/usr\\/X11R6\\/lib64/\\/usr\\/local\\/lib/ qtbase/mkspecs/linux-g++-64/qmake.conf
-
-RUN cd qt5 && \
-    rm /usr/lib/aarch64-linux-gnu/libX11.a && \
-    rm /usr/lib/aarch64-linux-gnu/libX11-xcb.a && \
-    OPENSSL_LIBS="-lssl -lcrypto -lpthread -ldl" \
-    ./configure --prefix=/usr -platform linux-aarch64-gnu-g++ -opensource -confirm-license -release -static -no-avx \
-        -no-opengl -qpa xcb --xcb -xcb-xlib -feature-xlib -openssl-linked -I /usr/local/openssl/include \
-        -L /usr/local/openssl/lib -system-freetype -fontconfig -glib \
-        -no-dbus -no-sql-sqlite -no-use-gold-linker -no-kms \
-        -qt-harfbuzz -qt-libjpeg -qt-libpng -qt-pcre -qt-zlib \
-        -skip qt3d -skip qtandroidextras -skip qtcanvas3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d \
-        -skip qtdoc -skip qtquickcontrols -skip qtquickcontrols2 -skip qtspeech  -skip qtgamepad \
-        -skip qtlocation -skip qtmacextras -skip qtnetworkauth -skip qtpurchasing -optimize-size \
-        -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qttools \
-        -skip qtvirtualkeyboard -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebview \
-        -skip qtwinextras -skip qtx11extras -skip gamepad -skip serialbus -skip location -skip webengine \
-        -skip qtdeclarative -gstreamer \
-        -no-feature-cups -no-feature-ftp -no-feature-pdf -no-feature-animation \
-        -nomake examples -nomake tests -nomake tools && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-RUN apt update && apt install -y wget
-
-# boost: Required for libwallet
-RUN wget https://downloads.sourceforge.net/project/boost/boost/1.73.0/boost_1_73_0.tar.bz2 && \
-    echo "4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402 boost_1_73_0.tar.bz2" | sha256sum -c && \
-    tar -xvf boost_1_73_0.tar.bz2 && \
-    rm boost_1_73_0.tar.bz2 && \
-    cd boost_1_73_0 && \
-    ./bootstrap.sh && \
-    ./b2 --with-atomic --with-system --with-filesystem --with-thread --with-date_time --with-chrono --with-regex --with-serialization --with-program_options --with-locale variant=release link=static runtime-link=static cflags="${CFLAGS}" cxxflags="${CXXFLAGS}" install -a --prefix=/usr && \
-    rm -rf $(pwd)
-
-# libusb: Required for libwallet
-RUN git clone -b v1.0.24 --depth 1 https://github.com/libusb/libusb && \
-    cd libusb && \
-    git reset --hard c6a35c56016ea2ab2f19115d2ea1e85e0edae155 && \
-    ./autogen.sh --disable-shared --enable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-# hidapi: Required for libwallet
-RUN git clone -b hidapi-0.10.1 --depth 1 https://github.com/libusb/hidapi && \
-    cd hidapi && \
-    git reset --hard f6d0073fcddbdda24549199445e844971d3c9cef && \
-    ./bootstrap && \
-    ./configure --disable-shared --enable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-# libsodium: Required for libzmq
-RUN git clone -b 1.0.18-RELEASE --depth 1 https://github.com/jedisct1/libsodium.git && \
-    cd libsodium && \
-    git reset --hard 940ef42797baa0278df6b7fd9e67c7590f87744b && \
-    ./autogen.sh && \
-    ./configure --disable-shared --enable-static && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-# libzmq: Required for libwallet
-RUN git clone -b v4.3.2 --depth 1 https://github.com/zeromq/libzmq && \
-    cd libzmq && \
-    git reset --hard a84ffa12b2eb3569ced199660bac5ad128bff1f0 && \
-    ./autogen.sh && \
-    ./configure --disable-shared --enable-static --disable-libunwind --with-libsodium && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-# protobuf: Required for libwallet
-RUN git clone -b v3.10.0 --depth 1 https://github.com/protocolbuffers/protobuf && \
-    cd protobuf && \
-    git reset --hard 6d4e7fd7966c989e38024a8ea693db83758944f1 && \
-    ./autogen.sh && \
-    ./configure --enable-static --disable-shared && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-# appimagetool: Used to created Feather AppImage
-#RUN mkdir appimagetool && \
-#    cd appimagetool && \
-#    wget https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-aarch64.AppImage && \
-#    echo "334e77beb67fc1e71856c29d5f3f324ca77b0fde7a840fdd14bd3b88c25c341f appimagetool-aarch64.AppImage" | sha256sum -c && \
-#    chmod +x appimagetool-aarch64.AppImage && \
-#    ./appimagetool-aarch64.AppImage --appimage-extract && \
-#    rm appimagetool-aarch64.AppImage
-
-# squashfs-tools: Used to create Feather AppImage
-RUN git clone https://github.com/plougher/squashfs-tools.git && \
-    cd squashfs-tools/squashfs-tools && \
-    git reset --hard 38fa0720526222827da44b3b6c3f7eb63e8f5c2f && \
-    make && \
-    make install && \
-    rm -rf $(pwd)
-
-# patchelf: Required by linuxdeployqt
-RUN git clone -b 0.12 --depth 1 https://github.com/NixOS/patchelf.git && \
-    cd patchelf && \
-    git reset --hard 8d3a16e97294e3c5521c61b4c8835499c9918264 && \
-    ./bootstrap.sh && \
-    ./configure && \
-     make -j$THREADS && \
-    make install && \
-    rm -rf $(pwd)
-
-# linuxdeployqt: Used to create Feather AppImage
-# build from source because latest release does not allow glib 2.27
-RUN git clone https://github.com/probonopd/linuxdeployqt.git && \
-    cd linuxdeployqt && \
-    git reset --hard b4697483c98120007019c3456914cfd1dba58384 && \
-    qmake && \
-    make -j$THREADS && \
-    make install && \
-    rm -rf $(pwd)
-
-# libevent: Required for Tor
-RUN wget https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz && \
-    echo "92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb libevent-2.1.12-stable.tar.gz" | sha256sum -c && \
-    tar -zxvf libevent-2.1.12-stable.tar.gz && \
-    cd libevent-2.1.12-stable && \
-    PKG_CONFIG_PATH=/usr/local/openssl/lib/pkgconfig/ \
-    ./configure --prefix=/usr/local/libevent \
-                --disable-shared \
-                --enable-static \
-                --with-pic && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-# zlib: Required for Tor
-RUN git clone -b v1.2.11 --depth 1 https://github.com/madler/zlib && \
-    cd zlib && \
-    git reset --hard cacf7f1d4e3d44d871b605da3b647f07d718623f && \
-    ./configure --static --prefix=/usr/local/zlib && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-# Tor: Optional for Feather (-DTOR_BIN)
-# Binary can be embedded in Feather
-ENV TOR_BIN=/usr/local/tor/bin/tor
-RUN git clone -b tor-$TOR_VERSION --depth 1 https://git.torproject.org/tor.git && \
-    cd tor && \
-    git reset --hard 60d1fb3d37274e29e9e88620d77e1636ef922561 && \
-    ./autogen.sh && \
-    ./configure \
-    --disable-asciidoc \
-    --disable-manpage \
-    --disable-html-manual \
-    --disable-system-torrc \
-    --disable-module-relay \
-    --disable-lzma \
-    --disable-zstd \
-    --enable-static-tor \
-    --with-libevent-dir=/usr/local/libevent \
-    --with-openssl-dir=/usr/local/openssl \
-    --with-zlib-dir=/usr/local/zlib \
-    --disable-tool-name-check \
-    --enable-fatal-warnings \
-    --prefix=/usr/local/tor && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd) && \
-    strip -s -D /usr/local/tor/bin/tor
-
-# libqrencode: Required for Feather
-# Used to display QR Codes
-RUN git clone -b v4.1.1 --depth 1 https://github.com/fukuchi/libqrencode.git && \
-    cd libqrencode && \
-    git reset --hard 715e29fd4cd71b6e452ae0f4e36d917b43122ce8 && \
-    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=/usr . && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-# monero-seed: Required for Feather
-# Tevador's 14 word seed library
-ADD contrib/monero-seed.patch .
-RUN git clone https://git.featherwallet.org/feather/monero-seed.git && \
-    cd monero-seed && \
-    git reset --hard 4674ef09b6faa6fe602ab5ae0b9ca8e1fd7d5e1b && \
-    git apply /monero-seed.patch && \
-    cmake -DCMAKE_BUILD_TYPE=Release -Bbuild && \
-    make -Cbuild -j$THREADS && \
-    make -Cbuild install && \
-    rm -rf $(pwd)
-
-# libzip: Required for Feather
-# Used to unzip updates downloaded by the built-in updater
-RUN git clone -b v1.7.3 --depth 1 https://github.com/nih-at/libzip.git && \
-    cd libzip && \
-    git reset --hard 66e496489bdae81bfda8b0088172871d8fda0032 && \
-    cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=/usr . && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-# libgpg-error: Required for libgcrypt
-RUN git clone -b libgpg-error-1.38 --depth 1 git://git.gnupg.org/libgpg-error.git && \
-    cd libgpg-error && \
-    git reset --hard 71d278824c5fe61865f7927a2ed1aa3115f9e439 && \
-    ./autogen.sh && \
-    ./configure --disable-shared --enable-static --disable-doc --disable-tests && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-# libgcrypt: Required for Feather
-# Used in src/openpgp to verify updates downloaded by the built-in updater
-RUN git clone -b libgcrypt-1.8.5 --depth 1 git://git.gnupg.org/libgcrypt.git && \
-    cd libgcrypt && \
-    git reset --hard 56606331bc2a80536db9fc11ad53695126007298 && \
-    ./autogen.sh && \
-    ./configure --disable-shared --enable-static --disable-doc && \
-    make -j$THREADS && \
-    make -j$THREADS install && \
-    rm -rf $(pwd)
-
-# zbar: Optional for Feather (-DWITH_SCANNER)
-# Used to scan for QR Codes
-RUN git clone -b stable-0.21 --recursive https://github.com/mchehab/zbar.git && \
-    cd zbar && \
-    git reset --hard 505f1a87b32cb7bb0edbaf37e20ccdd46bbae2a3 && \
-    autoreconf -vfi && \
-    ./configure --enable-static --disable-shared --without-imagemagick --with-gtk=no --with-python=no --enable-doc=no && \
-    make -j$THREADS && \
-    make install && \
-    rm -rf $(pwd)
\ No newline at end of file

diff --git a/contrib/build-deps/Dockerfile.linux-builddeps b/contrib/build-deps/Dockerfile.linux-builddeps
index ca497a0c6150da8e44b0d64e9fbe98ec821b46cb..f32105dfb70d94d5e8436fd83edf0fad721c3db5 100644 (file)
--- a/contrib/build-deps/Dockerfile.linux-builddeps
+++ b/contrib/build-deps/Dockerfile.linux-builddeps
@@ -4,9 +4,10 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 WORKDIR /deps
 
-COPY sources.list /etc/apt/sources.list
+RUN sed -i '/bionic-backports/d' /etc/apt/sources.list
+
 RUN apt-get update && \
-    apt-get install -y wget xz-utils nano
+    apt-get install -y wget xz-utils nano gpg xz-utils ca-certificates
 
 COPY get-packages.sh .
 RUN bash get-packages.sh
@@ -37,6 +38,8 @@ RUN apt-get install -y --no-install-recommends --no-install-suggests --reinstall
     libxcb-xfixes0-dev \
     libxcb-render-util0-dev \
     libxcb-xinerama0-dev \
+    libxcb-randr0-dev \
+    libxcb-sync-dev \
     libxkbcommon-dev \
     libxkbcommon-x11-dev \
     xutils-dev \
@@ -51,3 +54,8 @@ RUN apt-get install -y --no-install-recommends --no-install-suggests --reinstall
     libgstreamer-plugins-base1.0-dev \
 # git dependency
     libpsl5
+
+# Verify packages
+RUN ln -s /var/cache/apt/archives /archives
+COPY verify-packages.sh .
+RUN bash verify-packages.sh
\ No newline at end of file

diff --git a/contrib/build-deps/get-packages.sh b/contrib/build-deps/get-packages.sh
index 8a7fbf9cf0d2f9e18b0a1456154f1873a50480fa..03635c45fa4806e85ee7147fdcef35eb15a321b5 100644 (file)
--- a/contrib/build-deps/get-packages.sh
+++ b/contrib/build-deps/get-packages.sh
@@ -1,16 +1,24 @@
 #!/usr/bin/env bash
+
+base_uri="http://archive.ubuntu.com/ubuntu/dists"
+arch="amd64"
+if [ "$(uname -m)" = "aarch64" ]; then
+  base_uri="http://ports.ubuntu.com/ubuntu-ports/dists"
+  arch="arm64"
+fi
+
 for target in bionic bionic-updates bionic-security
 do
   mkdir "$target"
   pushd "$target"
-  target_uri="http://archive.ubuntu.com/ubuntu/dists/$target/"
+  target_uri="$base_uri/$target/"
   wget "$target_uri/Release"
   wget "$target_uri/Release.gpg"
   for repo in main multiverse restricted universe
   do
     mkdir "$repo"
     pushd "$repo"
-    wget "$target_uri/$repo/binary-amd64/Packages.xz"
+    wget "$target_uri/$repo/binary-$arch/Packages.xz"
     popd
   done
   popd

diff --git a/contrib/build-deps/sources.list b/contrib/build-deps/sources.list
deleted file mode 100644 (file)
index ef27457..0000000
--- a/contrib/build-deps/sources.list
+++ /dev/null
@@ -1,9 +0,0 @@
-deb http://archive.ubuntu.com/ubuntu/ bionic main restricted
-deb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted
-deb http://archive.ubuntu.com/ubuntu/ bionic universe
-deb http://archive.ubuntu.com/ubuntu/ bionic-updates universe
-deb http://archive.ubuntu.com/ubuntu/ bionic multiverse
-deb http://archive.ubuntu.com/ubuntu/ bionic-updates multiverse
-deb http://security.ubuntu.com/ubuntu/ bionic-security main restricted
-deb http://security.ubuntu.com/ubuntu/ bionic-security universe
-deb http://security.ubuntu.com/ubuntu/ bionic-security multiverse
\ No newline at end of file

diff --git a/contrib/build-deps/verify-packages.sh b/contrib/build-deps/verify-packages.sh
index 3e0ee887b165eae914c179ac9586797396080b24..81872aa3bacb24e3ad6998942d1917077471866d 100644 (file)
--- a/contrib/build-deps/verify-packages.sh
+++ b/contrib/build-deps/verify-packages.sh
@@ -1,6 +1,11 @@
 #!/usr/bin/env bash
 set -e
 
+arch="amd64"
+if [ "$(uname -m)" = "aarch64" ]; then
+  arch="arm64"
+fi
+
 cd /deps
 for target in bionic bionic-updates bionic-security
 do
@@ -14,7 +19,7 @@ do
     pushd "$repo"
 
     # Verify Packages.xz
-    sha256=`cat ../Release | grep "$repo/binary-amd64/Packages.xz" | tail -n 1 | awk '{print $1}'`
+    sha256=`cat ../Release | grep "$repo/binary-$arch/Packages.xz" | tail -n 1 | awk '{print $1}'`
     echo "$sha256 Packages.xz" | sha256sum -c
 
     xz -d -c Packages.xz >> ../../Packages-all
@@ -29,6 +34,4 @@ for deb in *.deb; do
   file_name=`echo $deb | sed 's/[0-9]*%3a//g'` # --download-only uses this version format sometimes, not sure what that is all about
   sha256=`sed -n "/\/${file_name}$"'/{:start /SHA256: /!{N;b start};//p}' /deps/Packages-all | tail -n 1 | awk '{print $2}'`
   echo "$sha256 $deb" | sha256sum -c
-done
-
-dpkg -i --force-depends *.deb
\ No newline at end of file
+done
\ No newline at end of file