[ptxdist] [PATCH] add xpkg extra-version support

[ptxdist] [PATCH] add xpkg extra-version support

[Hubert Feurstein]

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

Re: [ptxdist] [PATCH] add xpkg extra-version support

[Hubert Feurstein]

Hi,

I've just recognized that this is already obsolete. The patch "more
pkg_xpkg_version sanitizing and allow overwrite with
<PKG>_XPKG_VERSION" already addressed that problem.

Hubert

2012/1/5 Hubert Feurstein <h.feurstein@gmail.com>:
> 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