[OE-core] [PATCH 2/2] classes/buildhistory: sort list fields in package info

[Koen Kooi]

Op 7 feb. 2012, om 17:25 heeft Paul Eggleton het volgende geschreven:

> Sort DEPENDS, PACKAGES, RDEPENDS, and RRECOMMENDS in package info files
> so that any changes in order (which are not important) are smoothed out
> in the change history.
> 
> Fixes [YOCTO #1961]
> 
> Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
> ---
> meta/classes/buildhistory.bbclass |   19 +++++++++++++++----
> 1 files changed, 15 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
> 
> -	packages = squashspaces(d.getVar('PACKAGES', True))
> +	packages = sortlist(squashspaces(d.getVar('PACKAGES', True)))

Sorting PACKAGES is a bad idea, since order does matter in there.

> 
> 	rcpinfo = RecipeInfo(pn)
> 	rcpinfo.pe = pe
> 	rcpinfo.pv = pv
> 	rcpinfo.pr = pr
> -	rcpinfo.depends = squashspaces(d.getVar('DEPENDS', True) or "")
> +	rcpinfo.depends = sortlist(squashspaces(d.getVar('DEPENDS', True) or ""))
> 	rcpinfo.packages = packages
> 	write_recipehistory(rcpinfo, d)
> 	write_latestlink(None, pe, pv, pr, d)
> @@ -164,8 +175,8 @@ python buildhistory_emit_pkghistory() {
> 		pkginfo.pe = pe
> 		pkginfo.pv = pv
> 		pkginfo.pr = pr
> -		pkginfo.rdepends = squashspaces(getpkgvar(pkg, 'RDEPENDS') or "")
> -		pkginfo.rrecommends = squashspaces(getpkgvar(pkg, 'RRECOMMENDS') or "")
> +		pkginfo.rdepends = sortpkglist(squashspaces(getpkgvar(pkg, 'RDEPENDS') or ""))
> +		pkginfo.rrecommends = sortpkglist(squashspaces(getpkgvar(pkg, 'RRECOMMENDS') or ""))

Not sure what went wrong, but R* didn't seem to get sorted after these patches: https://github.com/Angstrom-distribution/buildhistory/commit/7a9f2f9308b468706799be18b3f400410ee1f664

regards,

Koen