[OE-core] [PATCH] migrate_localcount.bbclass: use PRAUTOINX instead of PN & PV
Martin Jansa
martin.jansa at gmail.com
Mon Jan 28 12:56:37 UTC 2013
On Mon, Jan 28, 2013 at 11:01:20AM +0200, Constantin Musca wrote:
> - we need to use PRAUTOINX (it covers all cases)
> - it addresses bumped PE issues
Build is still runing, but entries in prserv db look correct now,
thanks!
Cheers,
>
> [YOCTO #3071]
>
> Signed-off-by: Constantin Musca <constantinx.musca at intel.com>
> ---
> meta/classes/migrate_localcount.bbclass | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/meta/classes/migrate_localcount.bbclass b/meta/classes/migrate_localcount.bbclass
> index 59f14e8..3916ad4 100644
> --- a/meta/classes/migrate_localcount.bbclass
> +++ b/meta/classes/migrate_localcount.bbclass
> @@ -18,14 +18,13 @@ python migrate_localcount_handler () {
> if not revs or not counts:
> return
>
> - srcrev = bb.fetch2.get_srcrev(e.data)
> - bpv = pv[:pv.find(srcrev)]
> -
> if len(revs) != len(counts):
> bb.warn("The number of revs and localcounts don't match in %s" % pn)
> return
>
> - version = 'AUTOINC-%s-%s' % (pn, bpv)
> + version = e.data.getVar('PRAUTOINX', True)
> + srcrev = bb.fetch2.get_srcrev(e.data)
> + base_ver = 'AUTOINC-%s' % version[:version.find(srcrev)]
> pkgarch = e.data.getVar('PACKAGE_ARCH', True)
> value = max(int(count) for count in counts)
>
> @@ -40,7 +39,7 @@ python migrate_localcount_handler () {
> flock = bb.utils.lockfile("%s.lock" % df)
> with open(df, 'a') as fd:
> fd.write('PRAUTO$%s$%s$%s = "%s"\n' %
> - (version, pkgarch, srcrev, str(value)))
> + (base_ver, pkgarch, srcrev, str(value)))
> bb.utils.unlockfile(flock)
> }
>
> --
> 1.7.11.7
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20130128/ece82914/attachment-0002.sig>
More information about the Openembedded-core
mailing list