From ff7bd2da168bac2b6ff6e9ccfa97b2fde7ac28ee Mon Sep 17 00:00:00 2001 From: Mindy Date: Fri, 2 Mar 2018 15:50:08 -0600 Subject: [PATCH 1/3] test unix target with --net=socket as well --- .travis-ci.sh | 2 +- .travis.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis-ci.sh b/.travis-ci.sh index a25262cec..79d65b310 100755 --- a/.travis-ci.sh +++ b/.travis-ci.sh @@ -12,6 +12,6 @@ cd examples/unikernel git log --oneline |head -5 opam install mirage -mirage configure -t $MIRAGE_MODE +mirage configure -t $MIRAGE_MODE $FLAGS make depend make diff --git a/.travis.yml b/.travis.yml index b454cc4f4..8dd1bef51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ env: - EXTRA_REMOTES="https://github.com/mirage/mirage-dev.git" matrix: - OCAML_VERSION=4.04 PACKAGE=tcpip MIRAGE_MODE=unix + - OCAML_VERSION=4.04 PACKAGE=tcpip MIRAGE_MODE=unix FLAGS="--net=socket" - UPDATE_GCC_BINUTILS=1 OCAML_VERSION=4.04 PACKAGE=tcpip MIRAGE_MODE=xen - UPDATE_GCC_BINUTILS=1 OCAML_VERSION=4.05 PACKAGE=tcpip MIRAGE_MODE=ukvm - OCAML_VERSION=4.06 PACKAGE=tcpip MIRAGE_MODE=unix From febc5b6c6205b999bba752d646f58f21c3ff17ab Mon Sep 17 00:00:00 2001 From: Mindy Date: Fri, 2 Mar 2018 16:25:13 -0600 Subject: [PATCH 2/3] attempt to fix socket stack build --- src/stack-unix/jbuild | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/stack-unix/jbuild b/src/stack-unix/jbuild index ef3c0cc02..9aa7306ff 100644 --- a/src/stack-unix/jbuild +++ b/src/stack-unix/jbuild @@ -20,26 +20,27 @@ (wrapped false) (libraries (lwt.unix ipaddr.unix cstruct-lwt fmt mirage-protocols-lwt)))) +(library + ((name tcp_socket_options) + (public_name tcpip.tcp_socket_options) + (modules (tcp_socket_options)) + (c_names (tcp_socket_options_stubs)) + (wrapped false) + (libraries (lwt.unix duration)))) + (library ((name tcpv4_socket) (public_name tcpip.tcpv4-socket) (modules (tcpv4_socket tcp_socket)) (wrapped false) - (libraries (lwt.unix ipaddr.unix cstruct-lwt fmt mirage-protocols mirage-protocols-lwt tcp_socket_options)))) + (libraries (lwt.unix ipaddr.unix cstruct-lwt fmt mirage-protocols mirage-protocols-lwt tcpip.tcp_socket_options)))) (library ((name tcpv6_socket) (public_name tcpip.tcpv6-socket) (modules (tcpv6_socket)) (wrapped false) - (libraries (lwt.unix ipaddr.unix cstruct-lwt fmt mirage-protocols mirage-protocols-lwt tcpv4_socket tcp_socket_options)))) - -(library - ((name tcp_socket_options) - (modules (tcp_socket_options)) - (c_names (tcp_socket_options_stubs)) - (wrapped false) - (libraries (lwt.unix duration)))) + (libraries (lwt.unix ipaddr.unix cstruct-lwt fmt mirage-protocols mirage-protocols-lwt tcpv4_socket tcpip.tcp_socket_options)))) (library ((name tcpip_stack_socket) From 23cf2f8d8492639d717fdd138109889c77c2a8df Mon Sep 17 00:00:00 2001 From: Mindy Date: Thu, 8 Mar 2018 16:39:43 -0600 Subject: [PATCH 3/3] refer to tcp_socket_options without tcpip. --- src/stack-unix/jbuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stack-unix/jbuild b/src/stack-unix/jbuild index 9aa7306ff..bc600b948 100644 --- a/src/stack-unix/jbuild +++ b/src/stack-unix/jbuild @@ -33,14 +33,14 @@ (public_name tcpip.tcpv4-socket) (modules (tcpv4_socket tcp_socket)) (wrapped false) - (libraries (lwt.unix ipaddr.unix cstruct-lwt fmt mirage-protocols mirage-protocols-lwt tcpip.tcp_socket_options)))) + (libraries (lwt.unix ipaddr.unix cstruct-lwt fmt mirage-protocols mirage-protocols-lwt tcp_socket_options)))) (library ((name tcpv6_socket) (public_name tcpip.tcpv6-socket) (modules (tcpv6_socket)) (wrapped false) - (libraries (lwt.unix ipaddr.unix cstruct-lwt fmt mirage-protocols mirage-protocols-lwt tcpv4_socket tcpip.tcp_socket_options)))) + (libraries (lwt.unix ipaddr.unix cstruct-lwt fmt mirage-protocols mirage-protocols-lwt tcpv4_socket tcp_socket_options)))) (library ((name tcpip_stack_socket)