emo/sysvinit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverted changes to Makefile which caused tarball to be

Browse Source 
created with incorrect name and parent folder version.
This commit is contained in:
Jesse Smith 2018-05-20 17:10:54 -03:00
parent 75d85cc876
commit 4732d28994
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Makefile
View File

@ -2,17 +2,21 @@ all install clean distclean:
$(MAKE) -C src $@ $(MAKE) -C src $@
PACKAGE=sysvinit PACKAGE=sysvinit
VERSION=$(shell git describe --tags --abbrev=0 HEAD 2>/dev/null) VERSION=$(shell sed -rn '1s/.*[[:blank:]]\((.*)\)[[:blank:]].*/\1/p' doc/Changelog)
GITLOGIN=$(shell git remote -v | head -n 1 | cut -f 1 -d '@' | sed 's/origin\t//g') GITLOGIN=$(shell git remote -v | head -n 1 | cut -f 1 -d '@' | sed 's/origin\t//g')
override TARBALL=$(PACKAGE)-$(VERSION).tar.xz override TMP:=$(shell mktemp -d $(VERSION).XXXXXXXX)
override TARBALL_LATEST=$(PACKAGE)-latest.tar.xz override TARBALL:=$(TMP)/$(PACKAGE)-$(VERSION).tar.xz
override SFTPBATCH=upload-$(VERSION)-sftpbatch override SFTPBATCH:=$(TMP)/$(VERSION)-sftpbatch
SOURCES=contrib COPYING COPYRIGHT doc Makefile man README src
dist: $(TARBALL) dist: $(TARBALL)
@echo "tarball $(TARBALL) ready" @cp $(TARBALL) .
@echo "tarball $(PACKAGE)-$(VERSION).tar.bz2 ready"
rm -rf $(TMP)
upload: $(SFTPBATCH) upload: $(SFTPBATCH)
echo @sftp -b $< $(GITLOGIN)@dl.sv.nongnu.org:/releases/$(PACKAGE) echo @sftp -b $< $(GITLOGIN)@dl.sv.nongnu.org:/releases/$(PACKAGE)
rm -rf $(TMP)
$(SFTPBATCH): $(TARBALL).sig $(SFTPBATCH): $(TARBALL).sig
@echo progress > $@ @echo progress > $@
@ -20,12 +24,18 @@ $(SFTPBATCH): $(TARBALL).sig
@echo chmod 664 $(notdir $(TARBALL)) >> $@ @echo chmod 664 $(notdir $(TARBALL)) >> $@
@echo put $(TARBALL).sig >> $@ @echo put $(TARBALL).sig >> $@
@echo chmod 664 $(notdir $(TARBALL)).sig >> $@ @echo chmod 664 $(notdir $(TARBALL)).sig >> $@
@echo rm $(TARBALL_LATEST) >> $@ @echo rm $(PACKAGE)-latest.tar.bz2 >> $@
@echo symlink $(notdir $(TARBALL)) $(TARBALL_LATEST) >> $@ @echo symlink $(notdir $(TARBALL)) $(PACKAGE)-latest.tar.bz2 >> $@
@echo quit >> $@ @echo quit >> $@
$(TARBALL).sig: $(TARBALL) $(TARBALL).sig: $(TARBALL)
@gpg -q -ba --use-agent -o $@ $< @gpg -q -ba --use-agent -o $@ $<
$(TARBALL): .git $(TARBALL): $(TMP)/$(PACKAGE)-$(VERSION)
@git archive --prefix=$(PACKAGE)-$(VERSION)/ $(VERSION) -o $(TARBALL) @tar --exclude=.git --owner=nobody --group=nogroup -cf $@ -C $(TMP) $(PACKAGE)-$(VERSION)
$(TMP)/$(PACKAGE)-$(VERSION):
@mkdir $(TMP)/$(PACKAGE)-$(VERSION)
@cp -R $(SOURCES) $(TMP)/$(PACKAGE)-$(VERSION)/
@chmod -R a+r,u+w,og-w $@
@find $@ -type d | xargs -r chmod a+rx,u+w,og-w