diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/packagegroup.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/sstate.bbclass | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass index e0e5b1cf65..fc67302a2c 100644 --- a/meta/classes/packagegroup.bbclass +++ b/meta/classes/packagegroup.bbclass | |||
@@ -13,7 +13,7 @@ PACKAGES = "${PN}" | |||
13 | # By default, packagegroup packages do not depend on a certain architecture. | 13 | # By default, packagegroup packages do not depend on a certain architecture. |
14 | # Only if dependencies are modified by MACHINE_FEATURES, packages | 14 | # Only if dependencies are modified by MACHINE_FEATURES, packages |
15 | # need to be set to MACHINE_ARCH after inheriting packagegroup.bbclass | 15 | # need to be set to MACHINE_ARCH after inheriting packagegroup.bbclass |
16 | PACKAGE_ARCH = "all" | 16 | inherit allarch |
17 | 17 | ||
18 | # This automatically adds -dbg and -dev flavours of all PACKAGES | 18 | # This automatically adds -dbg and -dev flavours of all PACKAGES |
19 | # to the list. Their dependencies (RRECOMMENDS) are handled as usual | 19 | # to the list. Their dependencies (RRECOMMENDS) are handled as usual |
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index e1bc89d05e..6de35e6dc9 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -46,7 +46,7 @@ python () { | |||
46 | d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}")) | 46 | d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}")) |
47 | elif bb.data.inherits_class('cross-canadian', d): | 47 | elif bb.data.inherits_class('cross-canadian', d): |
48 | d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${PACKAGE_ARCH}")) | 48 | d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${PACKAGE_ARCH}")) |
49 | elif bb.data.inherits_class('allarch', d): | 49 | elif bb.data.inherits_class('allarch', d) and d.getVar("PACKAGE_ARCH", True) == "all": |
50 | d.setVar('SSTATE_PKGARCH', "allarch") | 50 | d.setVar('SSTATE_PKGARCH', "allarch") |
51 | else: | 51 | else: |
52 | d.setVar('SSTATE_MANMACH', d.expand("${PACKAGE_ARCH}")) | 52 | d.setVar('SSTATE_MANMACH', d.expand("${PACKAGE_ARCH}")) |