From c490ba0a93be2cbf81392683a663899cca8a3670 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 19 Aug 2014 13:38:34 +0100 Subject: 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. (From OE-Core rev: bd8018792155ae842952432900c8431feeaffe30) Signed-off-by: Richard Purdie --- meta/lib/oe/sstatesig.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'meta/lib/oe') 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 -- cgit v1.2.3-54-g00ecf