Fix docker-machine-driver-kvm2 build

pull/4781/head
tstromberg 2019-07-16 14:42:56 -07:00
parent 6729f6cfe4
commit 9896386d03
3 changed files with 71 additions and 1 deletions

View File

@ -413,7 +413,7 @@ release-minikube: out/minikube checksum
gsutil cp out/minikube-$(GOOS)-$(GOARCH) $(MINIKUBE_UPLOAD_LOCATION)/$(MINIKUBE_VERSION)/minikube-$(GOOS)-$(GOARCH)
gsutil cp out/minikube-$(GOOS)-$(GOARCH).sha256 $(MINIKUBE_UPLOAD_LOCATION)/$(MINIKUBE_VERSION)/minikube-$(GOOS)-$(GOARCH).sha256
out/docker-machine-driver-kvm2:
out/docker-machine-driver-kvm2: pkg/minikube/assets/assets.go pkg/minikube/translate/translations.go
go build \
-installsuffix "static" \
-ldflags="$(KVM2_LDFLAGS)" \

View File

@ -0,0 +1,33 @@
// +build !linux
/*
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package main
import (
"fmt"
"os"
)
func main() {
fmt.Println(
"this driver was built on a non-linux machine, so it is " +
"unavailable. Please re-build minikube on a linux machine to enable " +
"it.",
)
os.Exit(1)
}

37
cmd/drivers/kvm/main.go Normal file
View File

@ -0,0 +1,37 @@
// +build linux
/*
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package main
import (
"fmt"
"os"
"github.com/docker/machine/libmachine/drivers/plugin"
"k8s.io/minikube/pkg/drivers/kvm"
)
func main() {
if len(os.Args) > 1 && os.Args[1] == "version" {
fmt.Println("version:", kvm.GetVersion())
fmt.Println("commit:", kvm.GetGitCommitID())
return
}
plugin.RegisterDriver(kvm.NewDriver("", ""))
}