[icinga-checkins] icinga.org: icinga-web/master: * create-tarball fix for package creation

git at icinga.org git at icinga.org
Tue Feb 21 13:16:52 CET 2012


Module: icinga-web
Branch: master
Commit: d8c1fb633093b563e47c7a5a50ff64031b2628cf
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=d8c1fb633093b563e47c7a5a50ff64031b2628cf

Author: Marius Hein <marius.hein at netways.de>
Date:   Tue Feb 21 13:16:16 2012 +0100

* create-tarball fix for package creation

---

 Makefile.in      |    3 +--
 bin/make-tarball |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index e803035..e2261b2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -149,8 +149,7 @@ remove-temp-files:
 	bin/rmtmp-files.sh
 
 create-tarball:
-	#tar -czf ../$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz ../$(TAR_DIR_NAME)
-	./bin/make-tarball --prefix $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/
+	@./bin/make-tarball --prefix $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/
 
 create-tarball-nightly:
 	#${MAKE} submodule-update
diff --git a/bin/make-tarball b/bin/make-tarball
index 0bc8fb0..58c2b0c 100755
--- a/bin/make-tarball
+++ b/bin/make-tarball
@@ -144,8 +144,8 @@ git archive --format=$FORMAT --prefix="$PREFIX" $TREEISH > $TMPDIR/$(basename $(
 echo $TMPDIR/$(basename $(pwd)).$FORMAT >| $TMPFILE # clobber on purpose
 superfile=`head -n 1 $TMPFILE`
 
-# find all '.git' dirs, these show us the remaining to-be-archived dirs
-find . -name '.git' -type d -print | sed -e 's/^\.\///' -e 's/\.git$//' | grep -v '^$' >> $TOARCHIVE
+# DEACTIVATED: We do not have any exportable sub repositories
+# find . -name '.git' -type d -print | sed -e 's/^\.\///' -e 's/\.git$//' | grep -v '^$' >> $TOARCHIVE
 
 while read path; do
     TREEISH=$(git submodule | grep "^ .*${path%/}" | cut -d ' ' -f 2) # git-submodule does not list trailing slashes in $path





More information about the icinga-checkins mailing list