From 42cf8d5c1b166f71828cae7f7fcc97f4aa6b3929 Mon Sep 17 00:00:00 2001 From: mefistotelis Date: Fri, 11 Sep 2015 21:44:35 +0200 Subject: [PATCH] Improved package creation to exclude archives. This fixes error with packages containing packages. Also, increased version number. --- Makefile | 5 +++-- version.mk | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 542e87c..f5f5599 100644 --- a/Makefile +++ b/Makefile @@ -125,7 +125,8 @@ pkg-before: pkg/%.tar.gz: pkg-before $(ECHO) 'Creating package: $<' - $(TAR) zcf "$@" pkg + cd $(@D); \ + $(TAR) --exclude=*.tar.gz --exclude=*.zip -zcf "$(@F)" . $(ECHO) 'Finished creating: $<' $(ECHO) ' ' @@ -134,7 +135,7 @@ tar.gz: pkg/peresec-$(subst .,_,$(VER_STRING))-$(PACKAGE_SUFFIX)-$(PKGOS).tar.gz pkg/%.zip: pkg-before $(ECHO) 'Creating package: $<' cd $(@D); \ - $(ZIP) -9 -r "$(@F)" . + $(ZIP) -x*.tar.gz -x*.zip -9 -r "$(@F)" . $(ECHO) 'Finished creating: $<' $(ECHO) ' ' diff --git a/version.mk b/version.mk index cb0acff..7b9eb1d 100644 --- a/version.mk +++ b/version.mk @@ -1,5 +1,5 @@ VER_MAJOR=1 -VER_MINOR=0 -VER_RELEASE=9 -VER_BUILD=15 +VER_MINOR=1 +VER_RELEASE=0 +VER_BUILD=16 PACKAGE_SUFFIX=devel