kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

using right syntax in Makefile

Browse Source
This commit is contained in:
Christian Goll
2021-10-04 19:23:11 +02:00
parent 32e0de5a0f
commit 58c6adaff4
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -5,6 +5,12 @@ RELEASE ?= 1
SRC ?= main
VERSION_FULL ?= $(shell test -e .git && git describe --tags --long)
ifeq ($(VERSION_FULL),)
VERSION_FULL := $(VERSION)
endif
# auto installed tooling
TOOLS_DIR := .tools
TOOLS_BIN := $(TOOLS_DIR)/bin
@@ -115,7 +121,7 @@ debfiles: debian
cp wwclient $(DESTDIR)/var/warewulf/overlays/system/debian/warewulf/bin/
wwctl:
cd cmd/wwctl; GOOS=linux go build -ldflags="-X 'github.com/hpcng/warewulf/internal/app/wwctl/version/version.Version=$(VERSION)'" -mod vendor -tags "$(WW_BUILD_GO_BUILD_TAGS)" -o ../../wwctl
cd cmd/wwctl; GOOS=linux go build -ldflags="-X 'github.com/hpcng/warewulf/internal/app/wwctl/version.Version=$(VERSION_FULL)'" -mod vendor -tags "$(WW_BUILD_GO_BUILD_TAGS)" -o ../../wwctl
wwclient:
cd cmd/wwclient; CGO_ENABLED=0 GOOS=linux go build -mod vendor -a -ldflags '-extldflags -static' -o ../../wwclient

2
internal/app/wwctl/version/main.go
View File

@@ -10,7 +10,7 @@ var Version = "development"
func CobraRunE(cmd *cobra.Command, args []string) error {
fmt.Println("Version foo:\t", Version)
fmt.Println("Version:\t", Version)
return nil
}