RPM flags

Mirantis · Jan 23, 2023 · 9a87d6a · 9a87d6a
1 parent 7e528b9
commit 9a87d6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packaging/rpm/Makefile b/packaging/rpm/Makefile
@@ -35,7 +35,7 @@ RPMBUILD_FLAGS?=-ba\
 	--define '_release $(word 2,$(GEN_RPM_VER))' \
 	--define '_version $(word 1,$(GEN_RPM_VER))' \
 	--define '_origversion $(word 4, $(GEN_RPM_VER))' \
-	--define '_buildldflags $(CRI_DOCKERD_LDFLAGS)' \
+	--define '_buildldflags $(shell echo ${CRI_DOCKERD_LDFLAGS} | sed -e "s/-ldflags //")' \
 	$(SPECS)
 RUN?=$(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS)
 

diff --git a/packaging/rpm/SPECS/cri-dockerd.spec b/packaging/rpm/SPECS/cri-dockerd.spec
@@ -63,7 +63,7 @@ export CRI_DOCKER_GITCOMMIT=%{_gitcommit}
 mkdir -p /go/src/github.com/Mirantis
 ln -s /root/rpmbuild/BUILD/src/app /go/src/github.com/Mirantis/cri-dockerd
 cd /root/rpmbuild/BUILD/src/app
-GOPROXY="https://proxy.golang.org" GO111MODULE=on go build %{_buildldflags}
+GOPROXY="https://proxy.golang.org" GO111MODULE=on go build -ldflags "%{_buildldflags}"
 
 %check
 app/cri-dockerd --version