diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-06-11 16:38:21 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-18 11:07:58 +0100 |
commit | bdfca89b8025dd1fe7c09445c178993dfa9cdab9 (patch) | |
tree | 89cac0cfe10bd32b69b69d38fdd8d26e58e88ca5 /meta/classes | |
parent | 87631af64032b18ea354b27cc586ec13391bd143 (diff) | |
download | poky-bdfca89b8025dd1fe7c09445c178993dfa9cdab9.tar.gz |
image.bbclass, populate_sdk_base.bbclass: make all variants of qemuwrapper-cross available in sysroots
The variants are needed in particular when executing postinst_intercepts as
those may require running binaries built for different architectures and
against different sets of library paths, when multilib is in use (or nativesdk host
packages are installed), so a single global variant of the script was not working.
I do understand expanding PATH and DEPENDS in this manner is hackish, however
every other approach I could think of is worse.
(From OE-Core rev: 2f31eecc40ea4d0865aa28d65a0ba7d5a629393a)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/image.bbclass | 3 | ||||
-rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 2247b305da..16c6b1256e 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -11,9 +11,10 @@ POPULATE_SDK_POST_TARGET_COMMAND += "rootfs_sysroot_relativelinks; " | |||
11 | 11 | ||
12 | LICENSE ?= "MIT" | 12 | LICENSE ?= "MIT" |
13 | PACKAGES = "" | 13 | PACKAGES = "" |
14 | DEPENDS += "${MLPREFIX}qemuwrapper-cross depmodwrapper-cross" | 14 | DEPENDS += "${@' '.join(["%s-qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])} qemuwrapper-cross depmodwrapper-cross" |
15 | RDEPENDS += "${PACKAGE_INSTALL} ${LINGUAS_INSTALL}" | 15 | RDEPENDS += "${PACKAGE_INSTALL} ${LINGUAS_INSTALL}" |
16 | RRECOMMENDS += "${PACKAGE_INSTALL_ATTEMPTONLY}" | 16 | RRECOMMENDS += "${PACKAGE_INSTALL_ATTEMPTONLY}" |
17 | PATH_prepend = "${@":".join(all_multilib_tune_values(d, 'STAGING_BINDIR_CROSS').split())}:" | ||
17 | 18 | ||
18 | INHIBIT_DEFAULT_DEPS = "1" | 19 | INHIBIT_DEFAULT_DEPS = "1" |
19 | 20 | ||
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 3da350747e..aae6786e58 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass | |||
@@ -46,7 +46,8 @@ TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= "" | |||
46 | TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}" | 46 | TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}" |
47 | 47 | ||
48 | SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" | 48 | SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" |
49 | SDK_DEPENDS = "virtual/fakeroot-native xz-native cross-localedef-native ${MLPREFIX}qemuwrapper-cross" | 49 | SDK_DEPENDS = "virtual/fakeroot-native xz-native cross-localedef-native nativesdk-qemuwrapper-cross ${@' '.join(["%s-qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])} qemuwrapper-cross" |
50 | PATH_prepend = "${STAGING_DIR_HOST}${SDKPATHNATIVE}${bindir}/crossscripts:${@":".join(all_multilib_tune_values(d, 'STAGING_BINDIR_CROSS').split())}:" | ||
50 | SDK_DEPENDS_append_libc-glibc = " nativesdk-glibc-locale" | 51 | SDK_DEPENDS_append_libc-glibc = " nativesdk-glibc-locale" |
51 | 52 | ||
52 | # We want the MULTIARCH_TARGET_SYS to point to the TUNE_PKGARCH, not PACKAGE_ARCH as it | 53 | # We want the MULTIARCH_TARGET_SYS to point to the TUNE_PKGARCH, not PACKAGE_ARCH as it |