From: Michael Tremer Date: Thu, 16 Sep 2010 11:16:54 +0000 (+0200) Subject: naoki: Add epoch information to packages. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c89d06df241ff50cd59eddf9d1ef6baf9e9ec98c;p=ipfire-3.x.git naoki: Add epoch information to packages. --- diff --git a/pkgs/Constants b/pkgs/Constants index 8f5c980e0..e88552b3b 100644 --- a/pkgs/Constants +++ b/pkgs/Constants @@ -60,6 +60,7 @@ PKG_VARIABLES = \ PKG_BUILD_DEPS \ PKG_DEPS \ PKG_DESCRIPTION \ + PKG_EPOCH \ PKG_FILES \ PKG_GROUP \ PKG_MAINTAINER \ @@ -96,6 +97,9 @@ PKG_SUFFIX = -$(PKG_VER)-$(DISTRO_SNAME)$(DISTRO_EPOCH)-$(PKG_ARCH).$(PKG_REL).i PKG_NAME_REAL = $(notdir $(CURDIR)) PKG_NAME = $(PKG_NAME_REAL) +# Set default epoch +PKG_EPOCH = 0 + # Shortcut to package name + version THISAPP = $(PKG_NAME)-$(PKG_VER) diff --git a/pkgs/Targets b/pkgs/Targets index 0ee051c8a..a8d9caf2f 100644 --- a/pkgs/Targets +++ b/pkgs/Targets @@ -7,9 +7,11 @@ .PHONY: info info: + @echo "PKG_ARCH=\"$(PKG_ARCH)\"" @echo "PKG_BUILD_DEPENDENCIES=\"$(PKG_BUILD_DEPS)\"" @echo "PKG_DEPENDENCIES=\"$(PKG_DEPS)\"" @echo "PKG_DESCRIPTION=\"$(strip $(PKG_DESCRIPTION))\"" + @echo "PKG_EPOCH=\"$(PKG_EPOCH)\"" @echo "PKG_GROUP=\"$(PKG_GROUP)\"" @echo "PKG_LICENSE=\"$(PKG_LICENSE)\"" @echo "PKG_MAINTAINER=\"$(PKG_MAINTAINER)\"" diff --git a/tools/packager b/tools/packager index 6bd50b589..59d71f62c 100755 --- a/tools/packager +++ b/tools/packager @@ -19,8 +19,6 @@ # # ############################################################################### -## XXX SYMLINK DEPENDENCIES - BASEDIR=$(dirname ${0}) PACKAGER_HASH_ALGORITHMS="md5 sha1 sha256 sha512" @@ -64,6 +62,8 @@ BUILD_ID="${BUILD_ID}" PKG_NAME="${PKG_NAME}" PKG_VER="${PKG_VER}" PKG_REL="${PKG_REL}" +PKG_EPOCH="${PKG_EPOCH}" + PKG_GROUP="${PKG_GROUP}" PKG_ARCH="${PKG_ARCH}" PKG_ORIGIN="${PKG_ORIGIN}"