From 2c9b1d304daade7b0907320aeb9c522e7ab9dcab Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 6 Sep 2014 16:41:55 -0300 Subject: 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. Signed-off-by: Otavio Salvador --- meta/classes/packagegroup.bbclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'meta') 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}" # By default, packagegroup packages do not depend on a certain architecture. # Only if dependencies are modified by MACHINE_FEATURES, packages # need to be set to MACHINE_ARCH after inheriting packagegroup.bbclass -PACKAGE_ARCH ??= "all" -inherit ${@oe.utils.ifelse(d.getVar('PACKAGE_ARCH', True) == 'all', 'allarch', '')} +PACKAGE_ARCH ?= "all" + +# Fully expanded - so it applies the overrides as well +PACKAGE_ARCH_EXPANDED := "${PACKAGE_ARCH}" + +inherit ${@oe.utils.ifelse(d.getVar('PACKAGE_ARCH_EXPANDED', True) == 'all', 'allarch', '')} # This automatically adds -dbg and -dev flavours of all PACKAGES # to the list. Their dependencies (RRECOMMENDS) are handled as usual -- cgit 1.2.3-korg