Skip to content

Commit 66e463f

Browse files
committed
vendor/libhyperkit: fix cgo LDFLAGS and ramdisk_start in kexec.c
- qcow2: remove go generate 'mv .o .syso', use '#cgo LDFLAGS: -lfoo.o' - kexec: temporary fix ramdisk_start to twice size - it would be incorrect, but can boot large size kernel. - Tested tinycore, debian testing, ubuntu yakkety, minikube-iso and boot2docker Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>
1 parent 8b542eb commit 66e463f

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
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/kexec.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/xhyve_qcow2.go

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

vendor/manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
"importpath": "github.com/zchee/libhyperkit",
121121
"repository": "https://github.com/zchee/libhyperkit",
122122
"vcs": "git",
123-
"revision": "6e3f2962326d2f2b095f1ad988bdaf5b6cfe3665",
123+
"revision": "e41061b1166fde4a17c134e22d15a744d18b0a90",
124124
"branch": "master",
125125
"notests": true
126126
}

0 commit comments

Comments
 (0)