packagegroup/allarch: Convert to use allarch class
Currently there is some odd behaviour of the packagegroup class in relation to sstate since it sets PACKAGE_ARCH = "all" but does not use the allarch class leading to it being undetected by sstate. Previously it was not possible to use allarch as the recipe couldn't "undo" settings made by the allarch class. Since this no longer happens when PACKAGE_ARCH != all, we can use the allarch class. This patch also fixes up one case we need to preserve TRANSLATED_TARGET_ARCH and ensures sstate only assumes allarch when PACKAGE_ARCH is "all". (From OE-Core rev: 591fa7c1ab9e9ff75fdce602c77ecdeda3a255d9) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
668f7e36fe
commit
13ecfdb331
|
@ -13,7 +13,7 @@ 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 allarch
|
||||
|
||||
# This automatically adds -dbg and -dev flavours of all PACKAGES
|
||||
# to the list. Their dependencies (RRECOMMENDS) are handled as usual
|
||||
|
|
|
@ -46,7 +46,7 @@ python () {
|
|||
d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}"))
|
||||
elif bb.data.inherits_class('cross-canadian', d):
|
||||
d.setVar('SSTATE_PKGARCH', d.expand("${SDK_ARCH}_${PACKAGE_ARCH}"))
|
||||
elif bb.data.inherits_class('allarch', d):
|
||||
elif bb.data.inherits_class('allarch', d) and d.getVar("PACKAGE_ARCH", True) == "all":
|
||||
d.setVar('SSTATE_PKGARCH', "allarch")
|
||||
else:
|
||||
d.setVar('SSTATE_MANMACH', d.expand("${PACKAGE_ARCH}"))
|
||||
|
|
|
@ -3,6 +3,9 @@ PN = "packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
|
|||
PR = "r0"
|
||||
LICENSE = "MIT"
|
||||
|
||||
# Save TRANSLATED_TARGET_ARCH before allarch tramples it
|
||||
TRANSLATED_TARGET_ARCH = "${@d.getVar('TUNE_ARCH', True).replace('_', '-')}"
|
||||
|
||||
inherit cross-canadian packagegroup
|
||||
|
||||
PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
|
||||
|
|
Loading…
Reference in New Issue