From 56fa85dba2506fa0ceb38190bc3e428ddcc117dc Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 30 Oct 2022 13:57:04 +0100 Subject: Merging upstream version 20221030. Signed-off-by: Daniel Baumann --- Makefile | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5a5df6c..9ad53ec 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,11 @@ SHELL := sh -e +PROJECT = open-infrastructure +SOFTWARE = service-tools + VERSION := $(shell cat VERSION.txt) + TOOLS := $(shell find . -mindepth 1 -maxdepth 1 -type d -and -not -name ".*" -and -not -name debian) all: build @@ -65,7 +69,7 @@ clean: done distclean: - rm -rf service-tools-$(VERSION) + rm -rf $(SOFTWARE)-$(VERSION) @for TOOL in $(TOOLS); \ do \ @@ -80,19 +84,19 @@ release: distclean git commit -a -s -S -m 'Releasing version $(VERSION).' || true git tag -s -m 'Tagging version $(VERSION).' v$(VERSION) || true - mkdir service-tools-$(VERSION) - find . -mindepth 1 -maxdepth 1 -and -not -name ".git*" -and -not -name debian -and -not -name service-tools-$(VERSION) -exec cp \-a {} service-tools-$(VERSION) \; + mkdir $(SOFTWARE)-$(VERSION) + find . -mindepth 1 -maxdepth 1 -and -not -name ".git*" -and -not -name debian -and -not -name $(SOFTWARE)-$(VERSION) -exec cp \-a {} $(SOFTWARE)-$(VERSION) \; for FORMAT in xz lzip; \ do \ EXTENSION=$$(echo $${FORMAT} | cut -b-2); \ - tar --$${FORMAT} -cf ../service-tools-$(VERSION).tar.$${EXTENSION} service-tools-$(VERSION); \ - sha512sum ../service-tools-$(VERSION).tar.$${EXTENSION} > ../service-tools-$(VERSION).tar.$${EXTENSION}.sha512; \ - gpg --default-key 0xB62C61A10B93195F --armor -b ../service-tools-$(VERSION).tar.$${EXTENSION}; \ - mv ../service-tools-$(VERSION).tar.$${EXTENSION}.asc ../service-tools-$(VERSION).tar.$${EXTENSION}.sig; \ + tar --$${FORMAT} -cf ../$(SOFTWARE)-$(VERSION).tar.$${EXTENSION} $(SOFTWARE)-$(VERSION); \ + sha512sum ../$(SOFTWARE)-$(VERSION).tar.$${EXTENSION} > ../$(SOFTWARE)-$(VERSION).tar.$${EXTENSION}.sha512; \ + gpg --default-key 0xB62C61A10B93195F --armor -b ../$(SOFTWARE)-$(VERSION).tar.$${EXTENSION}; \ + mv ../$(SOFTWARE)-$(VERSION).tar.$${EXTENSION}.asc ../$(SOFTWARE)-$(VERSION).tar.$${EXTENSION}.sig; \ done - rm -rf service-tools-$(VERSION) + rm -rf $(SOFTWARE)-$(VERSION) upload: - scp ../service-tools-$(VERSION).* get.open-infrastructure.net:/srv/get.open-infrastructure.net/software/service-tools/upstream + scp ../$(SOFTWARE)-$(VERSION).* get.open-infrastructure.net:/srv/get.open-infrastructure.net/software/$(SOFTWARE)/upstream -- cgit v1.2.3