Skip to content

Commit 4012b0c

Browse files
zcheezchee
authored
Merge pull request #140 from zchee/minikube-iso_kexec
Support the rkt/minikube-iso
2 parents 8b542eb + 8cc908a commit 4012b0c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+580
-394
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ OCAML_LDLIBS := -L $(OCAML_WHERE) \
143143
-lasmrun -lbigarray -lunix
144144
CGO_CFLAGS += -DHAVE_OCAML=1 -DHAVE_OCAML_QCOW=1 -DHAVE_OCAML=1 -I$(OCAML_WHERE)
145145
CGO_LDFLAGS += $(OCAML_LDLIBS)
146-
bin/docker-machine-driver-xhyve: vendor/github.com/zchee/libhyperkit/mirage_block_ocaml.syso
146+
bin/docker-machine-driver-xhyve: vendor/github.com/zchee/libhyperkit/mirage_block_ocaml.o
147147
endif
148148
endif
149149

@@ -174,7 +174,7 @@ default: build
174174

175175
build: bin/docker-machine-driver-xhyve
176176

177-
vendor/github.com/zchee/libhyperkit/mirage_block_ocaml.syso:
177+
vendor/github.com/zchee/libhyperkit/mirage_block_ocaml.o:
178178
$(VERBOSE) $(GO_CMD) generate $(GO_BUILD_FLAG) $(GO_VERBOSE) ./vendor/github.com/zchee/libhyperkit
179179

180180
bin/docker-machine-driver-xhyve:

‎vendor/github.com/zchee/libhyperkit/acpitbl.c‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/zchee/libhyperkit/block_if.c‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/zchee/libhyperkit/consport.c‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/zchee/libhyperkit/fbsd.c‎

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/zchee/libhyperkit/xhyve.c‎ renamed to ‎vendor/github.com/zchee/libhyperkit/hyperkit.c‎

File renamed without changes.

‎vendor/github.com/zchee/libhyperkit/include/xhyve/firmware/kexec.h‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/zchee/libhyperkit/include/xhyve/pci_emul.h‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/zchee/libhyperkit/include/xhyve/rtc.h‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/zchee/libhyperkit/include/xhyve/support/apicreg.h‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)