diff --git a/Makefile b/Makefile index c4a35e48e5003862158f822ac345e88b2a71f346..dcff29b7fcb607125653c5eb7fa001118a56466c 100755 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ VERSION_BUILD ?= 1 ISO_VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).0 VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD) -DEB_VERSION ?= $(VERSION_MAJOR).$(VERSION_MINOR)-$(VERSION_BUILD) +DEB_VERSION ?= $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD) INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1) BUILDROOT_BRANCH ?= 2018.05 REGISTRY?=gcr.io/k8s-minikube @@ -235,7 +235,7 @@ out/minikube_$(DEB_VERSION).deb: out/minikube-linux-amd64 sed -E -i 's/--VERSION--/'$(DEB_VERSION)'/g' out/minikube_$(DEB_VERSION)/DEBIAN/control mkdir -p out/minikube_$(DEB_VERSION)/usr/bin cp out/minikube-linux-amd64 out/minikube_$(DEB_VERSION)/usr/bin/minikube - dpkg-deb --build out/minikube_$(DEB_VERSION) + fakeroot dpkg-deb --build out/minikube_$(DEB_VERSION) rm -rf out/minikube_$(DEB_VERSION) .SECONDEXPANSION: diff --git a/hack/jenkins/release_build_and_upload.sh b/hack/jenkins/release_build_and_upload.sh index c16dbdeedbb8f3649d0531a902c084692182d9a4..172ed43d0545996442afa485b0f0c9fdf66a3ca2 100755 --- a/hack/jenkins/release_build_and_upload.sh +++ b/hack/jenkins/release_build_and_upload.sh @@ -27,7 +27,7 @@ set -e export TAGNAME=v${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD} -export DEB_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}-${VERSION_BUILD} +export DEB_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD} export GOPATH=~/go # Make sure the tag matches the Makefile diff --git a/hack/jenkins/release_github_page.sh b/hack/jenkins/release_github_page.sh index 282eee88ab8655188b83336a862aa119a70ff8ab..38ec5e601e04572ab45dfffbb0d7d3d3058cdbe7 100755 --- a/hack/jenkins/release_github_page.sh +++ b/hack/jenkins/release_github_page.sh @@ -26,7 +26,7 @@ set -e export TAGNAME=v${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD} -export DEB_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}-${VERSION_BUILD} +export DEB_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD} export GITHUB_ORGANIZATION="kubernetes" export GITHUB_REPO="minikube"