From: Richard Purdie Date: Tue, 19 Aug 2014 12:38:34 +0000 (+0100) Subject: sstatesig: Only squash dependencies for allarch packagegroups X-Git-Tag: 2015-4~1795 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=bd8018792155ae842952432900c8431feeaffe30;p=openembedded-core.git sstatesig: Only squash dependencies for allarch packagegroups The idea of squashing packagegroup dependencies was to avoid allarch packages rebuilding upon tune/arch changes. Now that the allarch class inclusion is conditional, we can narrow down the packagegroup squashing to be specifically applied to allarch recipes. Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index d58147f78f..4188873c20 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -14,6 +14,9 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCache): def isPackageGroup(fn): inherits = " ".join(dataCache.inherits[fn]) return "/packagegroup.bbclass" in inherits + def isAllArch(fn): + inherits = " ".join(dataCache.inherits[fn]) + return "/allarch.bbclass" in inherits def isImage(fn): return "/image.bbclass" in " ".join(dataCache.inherits[fn]) @@ -36,8 +39,8 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCache): # Only target packages beyond here - # packagegroups are assumed to have well behaved names which don't change between architecures/tunes - if isPackageGroup(fn): + # allarch packagegroups are assumed to have well behaved names which don't change between architecures/tunes + if isPackageGroup(fn) and isAllArch(fn): return False # Exclude well defined machine specific configurations which don't change ABI