ocaml: remove out-of-date repo subset

We should be able to rely on the version constraints in the hyperkit.opam
instead.

Signed-off-by: David Scott <dave@recoil.org>

Author: djs55

.circleci/config.yml

@@ -7,7 +7,6 @@ jobs:
       # OPAM seems to be quite unhappy without $TERM and Circle doesn't seem to set one.
       TERM: vt100
       MACOSX_DEPLOYMENT_TARGET: "10.11"
-      OPAM_REPO: repo/darwin
       OPAM_COMP: 4.10.0
       OPAMVERBOSE: 1
       OPAMYES: 1
@@ -26,7 +25,7 @@ jobs:
       - run: test ! -s build/lib/mirage_block_ocaml.cmi || (echo "qcow libraries have been pre-installed in CI environment" && exit 1)
       - run: make test
       - run: brew install opam libev libffi pkg-config
-      - run: opam init -v -n --comp="${OPAM_COMP}" --switch="${OPAM_COMP}" local "${OPAM_REPO}"
+      - run: opam init -v -n --comp="${OPAM_COMP}" --switch="${OPAM_COMP}"
       # Needed until the packages are released in ocaml/opam-repository
       - run: opam pin add qcow.0.11.0 git://github.com/mirage/ocaml-qcow -n
       - run: opam pin add qcow-tool.0.11.0 git://github.com/mirage/ocaml-qcow -n

.gitignore

@@ -1,5 +1,6 @@
 /.opam
 /build/
+_build
 /src/include/xhyve/dtrace.h
 /test/vmlinuz
 /test/initrd

Makefile

@@ -208,8 +208,8 @@ artifacts: build/LICENSE build/COMMIT
 build/LICENSE:
 	@echo "  GEN     " $@
 	@find src -type f | xargs awk '/^\/\*-/{p=1;print FILENAME ":";print;next} p&&/^.*\*\//{print;print "";p=0};p' > $@.tmp
-	@opam config exec -- make -C repo list-licenses
-	@cat repo/OCAML-LICENSES >> $@.tmp
+	@opam config exec -- make -C ocaml list-licenses
+	@cat ocaml/OCAML-LICENSES >> $@.tmp
 	@mv $@.tmp $@
 
 .PHONY: build/COMMIT

ocaml/.gitignore

@@ -0,0 +1 @@
+OCAML-LICENSES

ocaml/Makefile

@@ -0,0 +1,6 @@
+.PHONY: list-licenses
+
+list-licenses:
+	mkdir -p licenses
+	cd licenses && ../opam-licenses.sh hyperkit
+	./list-licenses.sh licenses > OCAML-LICENSES

ocaml/licenses/.gitignore

@@ -0,0 +1,3 @@
+*.files
+all-packages.txt
+dependency.*

repo/licenses/LICENSE.hyperkit.~dev.skip renamed to ocaml/licenses/LICENSE.bigarray-compat.1.0.0

@@ -0,0 +1,15 @@
+ISC License
+
+Copyright (X) 2011-2018, the [MirageOS contributors](https://mirage.io/community/#team)
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.