From 630304500fef32eab4d71ba9613371d917d536d4 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Sat, 18 Mar 2017 10:20:26 +0000 Subject: [PATCH] Update build for Mirage 3 --- .travis.yml | 2 +- Dockerfile | 7 +++---- build-with-docker.sh | 2 +- config.ml | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index e46684f..ba4e918 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,4 +20,4 @@ addons: - time - libxen-dev env: - - OCAML_VERSION=4.04 MIRAGE_BACKEND=xen PINS="mirage-nat:https://github.com/talex5/mirage-nat.git#cleanup tcpip:https://github.com/talex5/mirage-tcpip.git#fix-length-checks" + - FORK_USER=talex5 FORK_BRANCH=unikernel OCAML_VERSION=4.04 MIRAGE_BACKEND=xen PINS="mirage-nat:https://github.com/talex5/mirage-nat.git#lru" diff --git a/Dockerfile b/Dockerfile index 4c8b436..479eac0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,17 +2,16 @@ # It will probably still work on newer images, though, unless Debian 8 # changes some compiler optimisations (unlikely). #FROM ocaml/opam:debian-8_ocaml-4.03.0 -FROM ocaml/opam@sha256:72ebf516fca7a9464db2136f2dcf2a58d09547669b60f3643a8329768febaed6 +FROM ocaml/opam@sha256:48c025a4ec2e6ff6dcb4c14f8cae0f332a090fa1ed677170912c4a48627778ab # Pin last known-good version for reproducible builds. # Remove this line (and the base image pin above) if you want to test with the # latest versions. -RUN cd opam-repository && git reset --hard 8f4d15eae94dfe6f70a66a7572a21a0c60d9f4f4 && opam update +RUN cd opam-repository && git reset --hard a51e30ffcec63836014a5bd2408203ec02e4c7af && opam update RUN sudo apt-get install -y m4 libxen-dev RUN opam install -y vchan xen-gnt mirage-xen-ocaml mirage-xen-minios io-page mirage-xen mirage -RUN opam pin add -n -y tcpip 'https://github.com/talex5/mirage-tcpip.git#fix-length-checks' -RUN opam pin add -n -y mirage-nat 'https://github.com/talex5/mirage-nat.git#cleanup' +RUN opam pin add -n -y mirage-nat 'https://github.com/talex5/mirage-nat.git#lru' RUN mkdir /home/opam/qubes-mirage-firewall ADD config.ml /home/opam/qubes-mirage-firewall/config.ml WORKDIR /home/opam/qubes-mirage-firewall diff --git a/build-with-docker.sh b/build-with-docker.sh index f004471..4823c77 100755 --- a/build-with-docker.sh +++ b/build-with-docker.sh @@ -5,4 +5,4 @@ docker build -t qubes-mirage-firewall . echo Building Firewall... docker run --rm -i -v `pwd`:/home/opam/qubes-mirage-firewall qubes-mirage-firewall echo "SHA2 of build: $(sha256sum qubes_firewall.xen)" -echo "SHA2 last known: 45b82182341237ca9e754636f771ef3f4c93824212d1a76520a8a79bbee18668" +echo "SHA2 last known: 4b24bab81f9c1b14bafabd9725428456c4d6eaff0ef5cefd032a59b9f4021693" diff --git a/config.ml b/config.ml index 37207aa..0b4cf79 100644 --- a/config.ml +++ b/config.ml @@ -1,4 +1,4 @@ -(* Copyright (C) 2015, Thomas Leonard +(* Copyright (C) 2017, Thomas Leonard See the README file for details. *) (** Configuration for the "mirage" tool. *) @@ -20,7 +20,7 @@ let main = ~packages:[ package "vchan"; package "cstruct"; - package "tcpip" ~sublibs:["stack-direct"; "xen"]; + package "tcpip" ~sublibs:["stack-direct"; "xen"] ~min:"3.1.0"; package "mirage-net-xen"; package "mirage-qubes"; package "mirage-nat" ~sublibs:["hashtable"];