Skip to content

Commit

Permalink
solo5-kernel-ukvm, solo5-kernel-virtio: 0.2.2-1 which includes a patc…
Browse files Browse the repository at this point in the history
…h removing -Werror to unbreak build with gcc7
  • Loading branch information
hannesm committed Oct 3, 2017
1 parent a4b54e1 commit b0ae925
Show file tree
Hide file tree
Showing 8 changed files with 104 additions and 0 deletions.
5 changes: 5 additions & 0 deletions packages/solo5-kernel-ukvm/solo5-kernel-ukvm.0.2.2-1/descr
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Solo5 unikernel base (ukvm target)

This package provides the Solo5 base layer to run MirageOS unikernels on the
"ukvm" target. ukvm, a specialized unikernel monitor, runs as a Linux process
and uses KVM.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--- a/ukvm/ukvm-configure.old 2017-10-03 16:48:43.791431000 +0100
+++ b/ukvm/ukvm-configure 2017-10-03 16:49:10.818253000 +0100
@@ -40,7 +40,7 @@

UKVM_CC?=cc
UKVM_FLAGS=-D__UKVM_HOST__ \$(UKVM_MODULE_FLAGS)
-UKVM_CFLAGS=-Wall -Werror -std=c99 -O2 -g \$(UKVM_FLAGS)
+UKVM_CFLAGS=-Wall -std=c99 -O2 -g \$(UKVM_FLAGS)
UKVM_OBJS=_build-ukvm/ukvm-core.o \$(UKVM_MODULE_OBJS)
ifdef UKVM_STATIC
UKVM_LDFLAGS=-static
--- a/Makefile.common.old 2017-10-03 16:48:50.438800000 +0100
+++ b/Makefile.common 2017-10-03 16:49:18.165099000 +0100
@@ -32,4 +32,4 @@
# Likewise.
LDFLAGS=-nostdlib -z max-page-size=0x1000 -static
# CFLAGS used for building kernel/ and in-tree tests.
-CFLAGS=$(MD_CFLAGS) -isystem $(TOP)/include-host -std=gnu99 -Wall -Wextra -Werror -O2 -g
+CFLAGS=$(MD_CFLAGS) -isystem $(TOP)/include-host -std=gnu99 -Wall -Wextra -O2 -g
25 changes: 25 additions & 0 deletions packages/solo5-kernel-ukvm/solo5-kernel-ukvm.0.2.2-1/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
opam-version: "1.2"
maintainer: "[email protected]"
authors: [
"Dan Williams <[email protected]>"
"Martin Lucina <[email protected]>"
"Ricardo Koller <[email protected]>"
]
homepage: "https://github.com/solo5/solo5"
bug-reports: "https://github.com/solo5/solo5/issues"
license: "ISC"
dev-repo: "https://github.com/solo5/solo5.git"
build: [make "ukvm"]
install: [make "opam-ukvm-install" "PREFIX=%{prefix}%"]
remove: [make "opam-ukvm-uninstall" "PREFIX=%{prefix}%"]
depends: "conf-pkg-config"
depexts: [
[["alpine"] ["linux-headers"]]
[["debian"] ["linux-libc-dev"]]
[["fedora"] ["kernel-headers"]]
[["rhel"] ["kernel-headers"]]
[["ubuntu"] ["linux-libc-dev"]]
]
conflicts: "solo5-kernel-virtio"
available: [ocaml-version >= "4.02.3" & arch = "x86_64" & os = "linux"]
patches: [ "solo5-no-werror.diff" ]
2 changes: 2 additions & 0 deletions packages/solo5-kernel-ukvm/solo5-kernel-ukvm.0.2.2-1/url
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
http: "https://github.com/Solo5/solo5/archive/v0.2.2.tar.gz"
checksum: "29e344999bd7476e6e83e9533b8a4dd9"
11 changes: 11 additions & 0 deletions packages/solo5-kernel-virtio/solo5-kernel-virtio.0.2.2-1/descr
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Solo5 unikernel base (virtio target)

This package provides the Solo5 base layer to run MirageOS unikernels on the
"virtio" target. Unikernels built for the "virtio" target run directly on
existing hypervisors, such as KVM/QEMU and bhyve.

Additionally, this package installs the "solo5-run-virtio" tool, a wrapper for
launching unikernels on various hypervisors, and the "solo5-mkimage" tool for
building MBR-partitioned disk images with a bootloader and unikernel installed.
The latter includes support for building images suitable for upload to Google
Compute Engine.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--- a/ukvm/ukvm-configure.old 2017-10-03 16:48:43.791431000 +0100
+++ b/ukvm/ukvm-configure 2017-10-03 16:49:10.818253000 +0100
@@ -40,7 +40,7 @@

UKVM_CC?=cc
UKVM_FLAGS=-D__UKVM_HOST__ \$(UKVM_MODULE_FLAGS)
-UKVM_CFLAGS=-Wall -Werror -std=c99 -O2 -g \$(UKVM_FLAGS)
+UKVM_CFLAGS=-Wall -std=c99 -O2 -g \$(UKVM_FLAGS)
UKVM_OBJS=_build-ukvm/ukvm-core.o \$(UKVM_MODULE_OBJS)
ifdef UKVM_STATIC
UKVM_LDFLAGS=-static
--- a/Makefile.common.old 2017-10-03 16:48:50.438800000 +0100
+++ b/Makefile.common 2017-10-03 16:49:18.165099000 +0100
@@ -32,4 +32,4 @@
# Likewise.
LDFLAGS=-nostdlib -z max-page-size=0x1000 -static
# CFLAGS used for building kernel/ and in-tree tests.
-CFLAGS=$(MD_CFLAGS) -isystem $(TOP)/include-host -std=gnu99 -Wall -Wextra -Werror -O2 -g
+CFLAGS=$(MD_CFLAGS) -isystem $(TOP)/include-host -std=gnu99 -Wall -Wextra -O2 -g
21 changes: 21 additions & 0 deletions packages/solo5-kernel-virtio/solo5-kernel-virtio.0.2.2-1/opam
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
opam-version: "1.2"
maintainer: "[email protected]"
authors: [
"Dan Williams <[email protected]>"
"Martin Lucina <[email protected]>"
"Ricardo Koller <[email protected]>"
]
homepage: "https://github.com/solo5/solo5"
bug-reports: "https://github.com/solo5/solo5/issues"
license: "ISC"
dev-repo: "https://github.com/solo5/solo5.git"
build: [make "virtio"]
install: [make "opam-virtio-install" "PREFIX=%{prefix}%"]
remove: [make "opam-virtio-uninstall" "PREFIX=%{prefix}%"]
depends: "conf-pkg-config"
conflicts: "solo5-kernel-ukvm"
available: [
ocaml-version >= "4.02.3" & (arch = "x86_64" | arch = "amd64") &
os != "darwin"
]
patches: [ "solo5-no-werror.diff" ]
2 changes: 2 additions & 0 deletions packages/solo5-kernel-virtio/solo5-kernel-virtio.0.2.2-1/url
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
http: "https://github.com/Solo5/solo5/archive/v0.2.2.tar.gz"
checksum: "29e344999bd7476e6e83e9533b8a4dd9"

0 comments on commit b0ae925

Please sign in to comment.