Skip to content

Commit dc39b13

Browse files
authored
Merge pull request #3745 from afbjorklund/deb
Improve building of deb package (versioning and permissions)
2 parents afced6c + e793576 commit dc39b13

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ VERSION_BUILD ?= 1
2020
ISO_VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).0
2121

2222
VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
23-
DEB_VERSION ?= $(VERSION_MAJOR).$(VERSION_MINOR)-$(VERSION_BUILD)
23+
DEB_VERSION ?= $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
2424
INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
2525
BUILDROOT_BRANCH ?= 2018.05
2626
REGISTRY?=gcr.io/k8s-minikube
@@ -235,7 +235,7 @@ out/minikube_$(DEB_VERSION).deb: out/minikube-linux-amd64
235235
sed -E -i 's/--VERSION--/'$(DEB_VERSION)'/g' out/minikube_$(DEB_VERSION)/DEBIAN/control
236236
mkdir -p out/minikube_$(DEB_VERSION)/usr/bin
237237
cp out/minikube-linux-amd64 out/minikube_$(DEB_VERSION)/usr/bin/minikube
238-
dpkg-deb --build out/minikube_$(DEB_VERSION)
238+
fakeroot dpkg-deb --build out/minikube_$(DEB_VERSION)
239239
rm -rf out/minikube_$(DEB_VERSION)
240240

241241
.SECONDEXPANSION:

hack/jenkins/release_build_and_upload.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
set -e
2828

2929
export TAGNAME=v${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}
30-
export DEB_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}-${VERSION_BUILD}
30+
export DEB_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}
3131
export GOPATH=~/go
3232

3333
# Make sure the tag matches the Makefile

hack/jenkins/release_github_page.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
set -e
2828
export TAGNAME=v${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}
29-
export DEB_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}-${VERSION_BUILD}
29+
export DEB_VERSION=${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUILD}
3030

3131
export GITHUB_ORGANIZATION="kubernetes"
3232
export GITHUB_REPO="minikube"

0 commit comments

Comments
 (0)