Fixing docker build for bgold (libsodium)

trezor-graveyard · Nov 14, 2017 · e9d66d5 · e9d66d5
1 parent 4f9c65f
commit e9d66d5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/contrib/docker_build/Dockerfile b/contrib/docker_build/Dockerfile
@@ -1,12 +1,14 @@
-FROM ubuntu:xenial
+FROM ubuntu:zesty
 MAINTAINER slush@satoshilabs.com
 
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && \
-    apt-get -qy install curl g++-aarch64-linux-gnu g++-4.8-aarch64-linux-gnu gcc-4.8-aarch64-linux-gnu binutils-aarch64-linux-gnu \
-          g++-4.8-multilib \
-          gcc-4.8-multilib binutils-gold git-core pkg-config autoconf libtool automake faketime bsdmainutils ca-certificates python locales
+    apt-get -qy install curl g++-aarch64-linux-gnu g++-5-aarch64-linux-gnu gcc-5-aarch64-linux-gnu binutils-aarch64-linux-gnu \
+          g++-5-multilib \
+          gcc-5-multilib binutils-gold git-core pkg-config autoconf libtool automake faketime bsdmainutils ca-certificates python locales
+
+RUN apt-get -qy install build-essential libtool autotools-dev automake pkg-config libssl-dev libevent-dev bsdmainutils libsodium-dev
 
 ADD run_inside.sh /run.sh
 RUN chmod +x /run.sh
diff --git a/contrib/docker_build/run_inside.sh b/contrib/docker_build/run_inside.sh
@@ -14,11 +14,18 @@ rm -rf $OUTDIR
 mkdir $OUTDIR
 chmod a+rwx $OUTDIR
 
+cd bitcoin
+cd depends
+# ???? I don't know
+make libsodium
+cd ..
+cd ..
+
 MAKEOPTS=(-j$1)
 
 
 WRAP_DIR=$HOME/wrapped
-HOSTS="x86_64-linux-gnu"
+HOSTS="x86_64-pc-linux-gnu"
 CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests --with-gui=no --disable-tests --disable-bench"
 HOST_CFLAGS="-O2 -g"
 HOST_CXXFLAGS="-O2 -g"
@@ -118,7 +125,7 @@ for i in ${HOSTS}; do
 	find . -name "lib*.a" -delete
 	rm -rf ${DISTNAME}/lib/pkgconfig
 	find ${DISTNAME}/bin -type f -executable -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \;
-	find ${DISTNAME}/lib -type f -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \;
+	#find ${DISTNAME}/lib -type f -exec ../contrib/devtools/split-debug.sh {} {} {}.dbg \;
 	find ${DISTNAME} -not -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}.tar.gz
 	find ${DISTNAME} -name "*.dbg" | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-${i}-debug.tar.gz
 	cd ../../