cagent: BuildTime var removed and align other ldflags

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>

Author: crazy-max

pkg/cagent/Dockerfile

@@ -109,7 +109,6 @@ ARG PKG_DEB_REVISION
 ARG PKG_DEB_EPOCH
 ARG SOURCE_DATE_EPOCH
 RUN --mount=type=bind,source=scripts/pkg-deb-build.sh,target=/usr/local/bin/pkg-deb-build \
-    --mount=type=bind,source=scripts/gen-ldflags.sh,target=/usr/local/bin/gen-ldflags \
     --mount=type=bind,from=scripts,source=gen-ver.sh,target=/usr/local/bin/gen-ver \
     --mount=type=bind,from=scripts,source=gen-deb-changelog.sh,target=/usr/local/bin/gen-deb-changelog \
     --mount=type=bind,from=scripts,source=fix-cc.sh,target=/usr/local/bin/fix-cc \
@@ -147,7 +146,6 @@ ARG PKG_RPM_BUILDFLAGS
 ARG PKG_RPM_RELEASE
 ARG SOURCE_DATE_EPOCH
 RUN --mount=type=bind,source=scripts/pkg-rpm-build.sh,target=/usr/local/bin/pkg-rpm-build \
-    --mount=type=bind,source=scripts/gen-ldflags.sh,target=/usr/local/bin/gen-ldflags \
     --mount=type=bind,from=scripts,source=gen-ver.sh,target=/usr/local/bin/gen-ver \
     --mount=type=bind,from=scripts,source=fix-cc.sh,target=/usr/local/bin/fix-cc \
     --mount=type=bind,from=src-tgz,source=/out/cagent.tgz,target=/root/rpmbuild/SOURCES/cagent.tgz \

pkg/cagent/deb/rules

@@ -15,7 +15,7 @@ override_dh_builddeb:
 override_dh_auto_build:
 	set -x; \
 	cd $(CURDIR)/cagent && \
-		go build -trimpath -ldflags="$$(gen-ldflags)" -o /usr/bin/cagent main.go
+		go build -trimpath -ldflags="-w -X 'github.com/docker/cagent/pkg/version.Version=$(VERSION)' -X 'github.com/docker/cagent/pkg/version.Commit=$(REVISION)'" -o /usr/bin/cagent .
 
 override_dh_auto_test:
 	ver="$$(/usr/bin/cagent version | grep 'cagent version' | awk '{print $$3}')"; \

pkg/cagent/rpm/cagent.spec

@@ -7,7 +7,7 @@ Epoch: 0
 Source0: cagent.tgz
 Summary: TODO
 Group: Tools/Docker
-License: ASL 2.0
+License: Apache-2.0
 URL: https://github.com/docker/cagent
 Vendor: Docker
 Packager: Docker <support@docker.com>
@@ -23,7 +23,7 @@ TODO
 %build
 pushd ${RPM_BUILD_DIR}/src/cagent
     mkdir bin && \
-    go build -trimpath -ldflags="$(VERSION="%{_origversion}" COMMIT="%{_commit}" gen-ldflags)" -o bin/cagent main.go
+    go build -trimpath -ldflags="-w -X github.com/docker/cagent/pkg/version.Version=%{_origversion} -X github.com/docker/cagent/pkg/version.Commit=%{_commit}" -o bin/cagent .
 popd
 
 %check

pkg/cagent/scripts/gen-ldflags.sh

@@ -49,9 +49,9 @@ mkdir -p ${BUILDDIR}/${PKG_NAME}
 (
   set -x
   pushd ${SRCDIR}
-    go build -trimpath -ldflags "-s -w -X 'github.com/docker/cagent/pkg/version.Version=${GENVER_VERSION}' -X 'github.com/docker/cagent/pkg/version.Commit=${GENVER_COMMIT}'" -o "${BUILDDIR}/${PKG_NAME}/docker-cagent${binext}" .
+    go build -trimpath -ldflags "-w -X 'github.com/docker/cagent/pkg/version.Version=${GENVER_VERSION}' -X 'github.com/docker/cagent/pkg/version.Commit=${GENVER_COMMIT}'" -o "${BUILDDIR}/${PKG_NAME}/cagent${binext}" .
   popd
-  xx-verify --static "${BUILDDIR}/${PKG_NAME}/docker-cagent${binext}"
+  xx-verify --static "${BUILDDIR}/${PKG_NAME}/cagent${binext}"
 )
 
 pkgoutput="$OUTDIR/static/$(xx-info os)/$(xx-info arch)"