On Tue Feb 09, 2021 at 07:54:30AM +0000, Luca De Pandis wrote:
> Hi,
> bumped to 4.6.16.
>
> If ok, could someone commit it, please?
>
>
> Best regards,
> Luca De Pandis
>
>
Works fine here. Some notes/tweaks:
- Remove uncomment line
- Fix MAINTAINER syntax.
- I would suggest to remove BUILDDATE. This information is not helpful
and it will change every time in a bulk build. oc runs and build fine
without this information:
$ oc version -o yaml
clientVersion:
buildDate: ""
compiler: gc
gitCommit: 18d7461aca47e77cefb355339252a8d4c149188f
gitTreeState: clean
gitVersion: 4.6.16
goVersion: go1.15.7
major: "4"
minor: "6"
platform: openbsd/amd64
With this changes, OK rsadowski
--- Makefile.orig Tue Feb 9 16:35:47 2021
+++ Makefile Tue Feb 9 16:38:36 2021
@@ -7,21 +7,18 @@ GH_PROJECT = oc
VERSION = 4.6.16
GH_COMMIT = 18d7461aca47e77cefb355339252a8d4c149188f
DISTNAME = oc-${VERSION}
-#PKGNAME = oc-${VERSION}
CATEGORIES = sysutils
HOMEPAGE = https://www.openshift.com
-MAINTAINER = [email protected]
+MAINTAINER = Luca De Pandis <[email protected]>
# Apache License 2.0
PERMIT_PACKAGE = Yes
WANTLIB = c pthread
-BUILDDATE = $$(date -u +%Y-%m-%dT%H:%M:%SZ)
-
MODULES = lang/go
GO_PKGNAME = github.com/openshift/oc
@@ -29,7 +26,6 @@ WRKSRC = ${MODGO_WORKSPACE}/src/${GO_PKGNAME}
ALL_TARGET = ${GO_PKGNAME}/cmd/oc
MODGO_LDFLAGS += \
- -X ${GO_PKGNAME}/pkg/version.buildDate=${BUILDDATE} \
-X ${GO_PKGNAME}/pkg/version.commitFromGit=${GH_COMMIT} \
-X ${GO_PKGNAME}/pkg/version.versionFromGit=${VERSION} \
-X ${GO_PKGNAME}/pkg/version.majorFromGit=${VERSION:R:R} \
