summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-09-06 16:41:55 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-10 15:38:57 +0100
commitc2c8c0283f01991b18454a6dbea834addfc0103e (patch)
tree2f470027c1b48b90195624bd927f7062e6f87329
parent7c16a538bc57116b87cf1912e7f4a460b38e015c (diff)
downloadpoky-c2c8c0283f01991b18454a6dbea834addfc0103e.tar.gz
packagegroup.bbclass: Use immediate expanded PACKAGE_ARCH value
When the PACKAGE_ARCH is dependant of a override, the expanding is done too late triggering the false-positive error of wrong inclusion order. To fix this we use immediate expansion operator to evaluate the PACKAGE_ARCH value in order to choose to load 'allarch' class or not. (From OE-Core rev: 2c9b1d304daade7b0907320aeb9c522e7ab9dcab) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/packagegroup.bbclass8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass
index a79d5b05a6..56cfead82a 100644
--- a/meta/classes/packagegroup.bbclass
+++ b/meta/classes/packagegroup.bbclass
@@ -9,8 +9,12 @@ PACKAGES = "${PN}"
9# By default, packagegroup packages do not depend on a certain architecture. 9# By default, packagegroup packages do not depend on a certain architecture.
10# Only if dependencies are modified by MACHINE_FEATURES, packages 10# Only if dependencies are modified by MACHINE_FEATURES, packages
11# need to be set to MACHINE_ARCH after inheriting packagegroup.bbclass 11# need to be set to MACHINE_ARCH after inheriting packagegroup.bbclass
12PACKAGE_ARCH ??= "all" 12PACKAGE_ARCH ?= "all"
13inherit ${@oe.utils.ifelse(d.getVar('PACKAGE_ARCH', True) == 'all', 'allarch', '')} 13
14# Fully expanded - so it applies the overrides as well
15PACKAGE_ARCH_EXPANDED := "${PACKAGE_ARCH}"
16
17inherit ${@oe.utils.ifelse(d.getVar('PACKAGE_ARCH_EXPANDED', True) == 'all', 'allarch', '')}
14 18
15# This automatically adds -dbg and -dev flavours of all PACKAGES 19# This automatically adds -dbg and -dev flavours of all PACKAGES
16# to the list. Their dependencies (RRECOMMENDS) are handled as usual 20# to the list. Their dependencies (RRECOMMENDS) are handled as usual