summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2018-04-16 15:00:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:04 +0100
commitab8b5cbfd6bcfd77322623683fe4f3a925445913 (patch)
tree3c533a137a2288977e61e662d8784457f33aeb8f /meta
parent776414fcf9e5ae237f04a7ca8365415d62da5580 (diff)
downloadpoky-ab8b5cbfd6bcfd77322623683fe4f3a925445913.tar.gz
native bbclass: handle base_libdir as well
Native.bbclass needs to fixup both base_libdir and libdir to handle things like multiarch. This fixes wic and ext4.* image failures during do_rootfs where mkfs.ext4 can't find its libraries. (From OE-Core rev: 464dad0dc93aeeedd34d90c2f06596060ec135fd) Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/native.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index a911f2aebd..7f2df17f23 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -78,6 +78,7 @@ exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
78 78
79bindir = "${STAGING_BINDIR_NATIVE}" 79bindir = "${STAGING_BINDIR_NATIVE}"
80sbindir = "${STAGING_SBINDIR_NATIVE}" 80sbindir = "${STAGING_SBINDIR_NATIVE}"
81base_libdir = "${STAGING_LIBDIR_NATIVE}"
81libdir = "${STAGING_LIBDIR_NATIVE}" 82libdir = "${STAGING_LIBDIR_NATIVE}"
82includedir = "${STAGING_INCDIR_NATIVE}" 83includedir = "${STAGING_INCDIR_NATIVE}"
83sysconfdir = "${STAGING_ETCDIR_NATIVE}" 84sysconfdir = "${STAGING_ETCDIR_NATIVE}"
@@ -89,6 +90,7 @@ export lt_cv_sys_lib_dlsearch_path_spec = "${libdir} ${base_libdir} /lib /lib64
89 90
90NATIVE_PACKAGE_PATH_SUFFIX ?= "" 91NATIVE_PACKAGE_PATH_SUFFIX ?= ""
91bindir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" 92bindir .= "${NATIVE_PACKAGE_PATH_SUFFIX}"
93base_libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}"
92libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" 94libdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}"
93libexecdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}" 95libexecdir .= "${NATIVE_PACKAGE_PATH_SUFFIX}"
94 96