From 3506172d7d9f8d92362b6ebb75582b7c3e662dae Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Sun, 17 Jul 2016 20:32:46 -0700 Subject: package_deb.bbclass/package_ipk.bbclass: sort RPROVIDES The dict.fromkeys() creates a dict without order, there might be a problem when build the same recipe again, for example: - First build of make: Provides: es-translation, make-locale - Second build of acl: Provides: make-locale, es-translation They are exactly the same Provides, but tools like "diff" doesn't think so. Sort RPROVIDES will fix the problem. Signed-off-by: Robert Yang Signed-off-by: Ross Burton --- meta/classes/package_deb.bbclass | 2 ++ meta/classes/package_ipk.bbclass | 2 ++ 2 files changed, 4 insertions(+) diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 6db69332e2..4e5dc12850 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -52,6 +52,7 @@ python do_package_deb () { import re, copy import textwrap import subprocess + import collections oldcwd = os.getcwd() @@ -247,6 +248,7 @@ python do_package_deb () { debian_cmp_remap(rsuggests) # Deliberately drop version information here, not wanted/supported by deb rprovides = dict.fromkeys(bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or ""), []) + rprovides = collections.OrderedDict(sorted(rprovides.items(), key=lambda x: x[0])) debian_cmp_remap(rprovides) rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES", True) or "") debian_cmp_remap(rreplaces) diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 1b5f4f59e3..e32b9cb5fd 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -20,6 +20,7 @@ python do_package_ipk () { import re, copy import textwrap import subprocess + import collections oldcwd = os.getcwd() @@ -192,6 +193,7 @@ python do_package_ipk () { debian_cmp_remap(rsuggests) # Deliberately drop version information here, not wanted/supported by ipk rprovides = dict.fromkeys(bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES", True) or ""), []) + rprovides = collections.OrderedDict(sorted(rprovides.items(), key=lambda x: x[0])) debian_cmp_remap(rprovides) rreplaces = bb.utils.explode_dep_versions2(localdata.getVar("RREPLACES", True) or "") debian_cmp_remap(rreplaces) -- cgit 1.2.3-korg