[OE-core] [PATCH 25/26] distrodata.bbclass: do not use get_recipe_pv_without_srcpv() before comparing versions in checkpkg

Aníbal Limón anibal.limon at linux.intel.com
Fri Jul 31 14:54:19 UTC 2015


Hi Alexander,

I added get_recipe_pv_without_srcpv for compare git versions because 
vercmp_string
don't take into account git versioning (git, gitAUTOINC) causing wrong 
comparisons.

We need to review if removal don't affect the current upstream detection.

Regards,
     alimon

On 30/07/15 08:31, Alexander Kanavin wrote:
> That function is intended for use with git sources and contains some restrictive regexes
> that don't work correctly when there are alphabetic characters in the version string.
> We can simply compare the versions directly.
>
> Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
> ---
>   meta/classes/distrodata.bbclass | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
> index af3af33..d33187b 100644
> --- a/meta/classes/distrodata.bbclass
> +++ b/meta/classes/distrodata.bbclass
> @@ -341,10 +341,7 @@ python do_checkpkg() {
>           if not pupver:
>               pupver = "N/A"
>           else:
> -            pv, _, _ = oe.recipeutils.get_recipe_pv_without_srcpv(pversion, uri_type)
> -            upv, _, _ = oe.recipeutils.get_recipe_pv_without_srcpv(pupver, uri_type)
> -
> -            cmp = vercmp_string(pv, upv)
> +            cmp = vercmp_string(pversion, pupver)
>               if cmp == -1:
>                   pstatus = "UPDATE"
>               elif cmp == 0:




More information about the Openembedded-core mailing list