[CRIU] [PATCHv2 02/17] Dockerfile: add libc6-dev-i386 & gcc-multilib

Dmitry Safonov dsafonov at virtuozzo.com
Tue Apr 12 09:10:40 PDT 2016


Fixes the following error on travis-ci:
  CC       arch/x86/syscalls/syscall32.o
In file included from /usr/include/signal.h:28:0,
                 from /home/travis/build/0x7f454c46/criu/criu/arch/x86/include/asm/types.h:5,
                 from arch/x86/syscalls/syscall32.c:1:
/usr/include/features.h:374:25: fatal error: sys/cdefs.h: No such file or directory
 #  include <sys/cdefs.h>
                         ^

Signed-off-by: Dmitry Safonov <dsafonov at virtuozzo.com>
Acked-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 scripts/build/Dockerfile.x86_64.hdr | 4 ++++
 scripts/travis-tests                | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/build/Dockerfile.x86_64.hdr b/scripts/build/Dockerfile.x86_64.hdr
index 310e6b2b2eda..df13bde6987d 100644
--- a/scripts/build/Dockerfile.x86_64.hdr
+++ b/scripts/build/Dockerfile.x86_64.hdr
@@ -1 +1,5 @@
 FROM ubuntu:wily
+
+RUN apt-get update -qq && apt-get install -qq \
+                gcc-multilib \
+                libc6-dev-i386
diff --git a/scripts/travis-tests b/scripts/travis-tests
index fc7d050ef05d..cb6ac1e5678a 100755
--- a/scripts/travis-tests
+++ b/scripts/travis-tests
@@ -4,7 +4,9 @@ set -x -e
 test "$1" = "x86_64" || exit 0
 
 apt-get update -qq
-apt-get install -qq protobuf-c-compiler libprotobuf-c0-dev libaio-dev libprotobuf-dev protobuf-compiler python-ipaddr libcap-dev libnl-3-dev
+apt-get install -qq protobuf-c-compiler libprotobuf-c0-dev libaio-dev	\
+	libprotobuf-dev protobuf-compiler python-ipaddr libcap-dev	\
+	libnl-3-dev gcc-multilib libc6-dev-i386
 chmod a+x $HOME
 make
 make -C test/zdtm
-- 
2.8.0



More information about the CRIU mailing list