diff options
| author | Colin Walters <walters@verbum.org> | 2014-06-02 15:27:40 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2014-06-02 15:27:40 -0400 |
| commit | 93c68083ac68c87627a1b4fb43510fa064260320 (patch) | |
| tree | 920c5d7090852cead7ee0a1354c1c2114fccde27 | |
| parent | 47610b45c2ac91d7d9749bc0a1ea5b3150a09a70 (diff) | |
| download | ostree-93c68083ac68c87627a1b4fb43510fa064260320.tar.gz | |
Move Makefile.dist-packaging under packaging/
| -rw-r--r-- | packaging/Makefile.dist-packaging (renamed from Makefile.dist-packaging) | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/Makefile.dist-packaging b/packaging/Makefile.dist-packaging index 75a52f6d..103b1e8c 100644 --- a/Makefile.dist-packaging +++ b/packaging/Makefile.dist-packaging @@ -4,7 +4,7 @@ GITREV = $$(git describe --always --tags) GITREV_FOR_PKG = $(shell echo "$(GITREV)" | sed -e 's,-,\.,g' -e 's,^v,,') srcdir=$(shell pwd) -PACKAGE=$(shell basename $(srcdir)) +PACKAGE=ostree PKG_VER = $(PACKAGE)-$(GITREV_FOR_PKG) @@ -13,7 +13,7 @@ dist-snapshot: echo "PACKAGE=$(PACKAGE)"; \ TARFILE_TMP=$(PKG_VER).tar.tmp; \ echo "Archiving $(PACKAGE) at $(GITREV)"; \ - (cd $(srcdir); git archive --format=tar --prefix=$(PKG_VER)/ $(GITREV)) > $${TARFILE_TMP}; \ + (cd ..; git archive --format=tar --prefix=$(PKG_VER)/ $(GITREV)) > $${TARFILE_TMP}; \ (cd $$(git rev-parse --show-toplevel); git submodule status) | while read line; do \ rev=$$(echo $$line | cut -f 1 -d ' '); path=$$(echo $$line | cut -f 2 -d ' '); \ echo "Archiving $${path} at $${rev}"; \ @@ -26,14 +26,8 @@ dist-snapshot: xz $(PKG_VER).tar srpm: dist-snapshot - (cd $(srcdir)/packaging; \ - cp ../$(PKG_VER).tar.xz . ; \ sed -e "s,^Version:.*,Version: $(GITREV_FOR_PKG)," $(PACKAGE).spec.in > $(PACKAGE).spec; \ - ./rpmbuild-cwd -bs $(PACKAGE).spec) + ./rpmbuild-cwd -bs $(PACKAGE).spec rpm: srpm - $(srcdir)/packaging/rpmbuild-cwd --rebuild packaging/$(PKG_VER)*.src.rpm - -buildinstall: rpm - sudo yum localinstall $(PKG_VER)*.src.rpm - + $(srcdir)/rpmbuild-cwd --rebuild $(PKG_VER)*.src.rpm |