From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from mail-ee0-f44.google.com ([74.125.83.44])
	by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <h.feurstein@gmail.com>) id 1Ringd-0007OL-Fx
	for ptxdist@pengutronix.de; Thu, 05 Jan 2012 14:48:56 +0100
Received: by eekc14 with SMTP id c14so379270eek.31
	for <ptxdist@pengutronix.de>; Thu, 05 Jan 2012 05:48:48 -0800 (PST)
From: Hubert Feurstein <h.feurstein@gmail.com>
Date: Thu,  5 Jan 2012 14:48:28 +0100
Message-Id: <1325771308-8732-1-git-send-email-h.feurstein@gmail.com>
Subject: [ptxdist] [PATCH] add xpkg extra-version support
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de

With this it is possible to specify an extra-version string in the package
make rule. e.g.: <PKG>_EXTRAVERSION := "-1"

The extra-version string is added to the package version only.

Signed-off-by: Hubert Feurstein <h.feurstein@gmail.com>
---
 rules/post/ptxd_make_world_common.make |    1 +
 scripts/lib/ptxd_make_xpkg_common.sh   |    7 +++++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/rules/post/ptxd_make_world_common.make b/rules/post/ptxd_make_world_common.make
index 25d5f02..ec7a87d 100644
--- a/rules/post/ptxd_make_world_common.make
+++ b/rules/post/ptxd_make_world_common.make
@@ -55,6 +55,7 @@ world/env/impl = \
 										\
 	pkg_pkg="$(call ptx/escape,$($(1)))"					\
 	pkg_version="$(call ptx/escape,$($(1)_VERSION))"			\
+	pkg_extraversion="$(call ptx/escape,$($(1)_EXTRAVERSION))"		\
 	pkg_path="$(call ptx/escape,$($(1)_PATH))"				\
 	pkg_src="$(call ptx/escape,$($(1)_SOURCE))"				\
 	pkg_md5="$(call ptx/escape,$($(1)_MD5))"				\
diff --git a/scripts/lib/ptxd_make_xpkg_common.sh b/scripts/lib/ptxd_make_xpkg_common.sh
index deccd12..04bc849 100644
--- a/scripts/lib/ptxd_make_xpkg_common.sh
+++ b/scripts/lib/ptxd_make_xpkg_common.sh
@@ -77,6 +77,13 @@ ptxd_make_xpkg_init() {
 	ptxd_bailout "${FUNCNAME}: please define <PKG>_VERSION"
     fi

+    #
+    # Add extra version to package version
+    #
+    if [ ! -z ${pkg_extraversion} ]; then
+	pkg_xpkg_version="${pkg_xpkg_version}${pkg_extraversion//\"/}"
+    fi
+
     ptxd_make_world_init || return

     # license
--
1.7.4.1


-- 
ptxdist mailing list
ptxdist@pengutronix.de