File _service:extract_file:warewulf-4.3.0-Makefilefi... of Package warewulf

File _service:extract_file:warewulf-4.3.0-Makefilefix.patch of Package warewulf (Revision a57df27a40443d1ac21a6e67a4fbf9b7)

Currently displaying revision a57df27a40443d1ac21a6e67a4fbf9b7 , Show latest

--- a/Makefile	2022-10-16 12:00:47.208447677 -0700
+++ b/Makefile	2022-10-16 12:08:53.320447677 -0700
@@ -1,5 +1,3 @@
-.PHONY: all
-
 -include Defaults.mk
 
 # Linux distro (try and set to /etc/os-release ID)
@@ -95,11 +93,14 @@
 # built tags needed for wwbuild binary
 WW_GO_BUILD_TAGS := containers_image_openpgp containers_image_ostree
 
+.PHONY: all
 all: config vendor wwctl wwclient bash_completion.d man_pages config_defaults
 
+.PHONY: build
 build: lint test-it vet all
 
 # set the go tools into the tools bin.
+.PHONY: setup_tools
 setup_tools: $(GO_TOOLS_BIN) $(GOLANGCI_LINT)
 
 # install go tools into TOOLS_BIN
@@ -110,8 +111,10 @@
 $(GOLANGCI_LINT):
 	@curl -qq -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TOOLS_BIN) $(GOLANGCI_LINT_VERSION)
 
+.PHONY: setup
 setup: vendor $(TOOLS_DIR) setup_tools
 
+.PHONY: vendor
 vendor:
 	go mod tidy -v
 	go mod vendor
@@ -120,6 +123,7 @@
 	@mkdir -p $@
 
 # Pre-build steps for source, such as "go generate"
+.PHONY: config
 config:
     # Store configuration for subsequent runs
 	printf " $(foreach V,$(VARLIST),$V := $(strip $($V))\n)" > Defaults.mk
@@ -128,23 +132,29 @@
 		-exec sh -c 'sed -ne "$(foreach V,$(VARLIST),s,@$V@,$(strip $($V)),g;)p" $${0} > $${0%.in}' {} \;
 	touch config
 
+.PHONY: rm_config
 rm_config:
 	rm -f config
 
+.PHONY: genconfig
 genconfig: rm_config config
 
 # Lint
+.PHONY: lint
 lint: setup_tools
 	@echo Running golangci-lint...
 	@$(GOLANGCI_LINT) run --build-tags "$(WW_GO_BUILD_TAGS)" --skip-dirs internal/pkg/staticfiles ./...
 
+.PHONY: vet
 vet:
 	go vet ./...
 
+.PHONY: test-it
 test-it:
 	go test -v ./... -ldflags="-X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=$(shell pwd)/etc/warewulf.conf'"
 
 # Generate test coverage
+.PHONY: test-cover
 test-cover:     ## Run test coverage and generate html report
 	rm -fr coverage
 	mkdir coverage
@@ -154,8 +164,10 @@
 	rm *.coverprofile
 	go tool cover -html=coverage/cover.out -o=coverage/cover.html
 
+.PHONY: debian
 debian: all
 
+.PHONY: files
 files: all
 	install -d -m 0755 $(DESTDIR)$(BINDIR)
 	install -d -m 0755 $(DESTDIR)$(WWCHROOTDIR)
@@ -189,6 +201,7 @@
 	install -m 0644 staticfiles/x86_64.efi $(DESTDIR)$(WWDATADIR)/ipxe
 	install -m 0644 staticfiles/x86_64.kpxe $(DESTDIR)$(WWDATADIR)/ipxe
 
+.PHONY: init
 init:
 	systemctl daemon-reload
 	cp -r tftpboot/* $(WWTFTPDIR)/ipxe/
@@ -201,6 +214,7 @@
 	cd cmd/wwclient; CGO_ENABLED=0 GOOS=linux go build -mod vendor -a -ldflags "-extldflags -static \
 	 -X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=/etc/warewulf/warewulf.conf'" -o ../../wwclient
 
+.PHONY: install_wwclient
 install_wwclient: wwclient
 	install -m 0755 wwclient $(DESTDIR)$(WWOVERLAYDIR)/wwinit/$(WWCLIENTDIR)/wwclient
 
@@ -218,6 +232,7 @@
 	 -X 'github.com/hpcng/warewulf/internal/pkg/node.ConfigFile=./etc/nodes.conf'"\
 	 -mod vendor -tags "$(WW_GO_BUILD_TAGS)" -o ../../man_page
 
+.PHONY: man_pages
 man_pages: man_page
 	install -d man_pages
 	./man_page ./man_pages
@@ -233,9 +248,11 @@
 	 -X 'github.com/hpcng/warewulf/internal/pkg/node.ConfigFile=./etc/nodes.conf'"\
 	 -mod vendor -tags "$(WW_GO_BUILD_TAGS)" -o ../../update_configuration
 
+.PHONY: warewulfconf
 warewulfconf: config_defaults
 	./config_defaults
 
+.PHONY: dist
 dist: vendor config
 	rm -rf .dist/$(WAREWULF)-$(VERSION)
 	mkdir -p .dist/$(WAREWULF)-$(VERSION)
@@ -243,6 +260,7 @@
 	cd .dist; tar -czf ../$(WAREWULF)-$(VERSION).tar.gz $(WAREWULF)-$(VERSION)
 	rm -rf .dist
 
+.PHONY: clean
 clean:
 	rm -f wwclient
 	rm -f wwctl
@@ -260,6 +278,8 @@
 	rm -f config_defaults
 	rm -f update_configuration
 
+.PHONY: install
 install: files install_wwclient
 
+.PHONY: debinstall
 debinstall: files debfiles