diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-22 17:17:10 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-23 23:04:40 +0000 |
| commit | e2403bc637e2967a028718058f987cc8841a6edc (patch) | |
| tree | 986196b81d6df5795b5bf91291f925409c126986 /meta/classes/uninative.bbclass | |
| parent | 59360521880a6ffbf893235bdc556533fab0a152 (diff) | |
| download | openembedded-core-e2403bc637e2967a028718058f987cc8841a6edc.tar.gz openembedded-core-e2403bc637e2967a028718058f987cc8841a6edc.tar.bz2 openembedded-core-e2403bc637e2967a028718058f987cc8841a6edc.zip | |
uninative: Fix conflicts with normal sysroot
Currently this code installs into the standard sysroot, however this causes
some conflicts when linking since the linker can look specifically for
versioned .so files (e.g. like libpthreads.so.0). This breaks builds
of util-linux-native for example.
The easiest solution is to install uninative into its own separate sysroot.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/uninative.bbclass')
| -rw-r--r-- | meta/classes/uninative.bbclass | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index fe1e89b29c..8686159e84 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass @@ -1,6 +1,6 @@ NATIVELSBSTRING = "universal" -UNINATIVE_LOADER ?= "${@bb.utils.contains('BUILD_ARCH', 'x86_64', '${STAGING_DIR_NATIVE}/lib/ld-linux-x86-64.so.2', '${STAGING_DIR_NATIVE}/lib/ld-linux.so.2', d)}" +UNINATIVE_LOADER ?= "${STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', 'ld-linux.so.2', d)}" UNINATIVE_URL ?= "unset" UNINATIVE_TARBALL ?= "${BUILD_ARCH}-nativesdk-libc.tar.bz2" @@ -41,7 +41,8 @@ python uninative_eventhandler() { fetcher.download() except Exception as exc: bb.fatal("Unable to download uninative tarball: %s" % str(exc)) - cmd = e.data.expand("mkdir -p ${STAGING_DIR}; cd ${STAGING_DIR}; tar -xjf ${UNINATIVE_DLDIR}/${UNINATIVE_TARBALL}; ${STAGING_DIR}/relocate_sdk.py ${STAGING_DIR_NATIVE} ${UNINATIVE_LOADER} ${UNINATIVE_LOADER} ${STAGING_BINDIR_NATIVE}/patchelf-uninative") + + cmd = e.data.expand("mkdir -p ${STAGING_DIR}-uninative; cd ${STAGING_DIR}-uninative; tar -xjf ${UNINATIVE_DLDIR}/${UNINATIVE_TARBALL}; ${STAGING_DIR}-uninative/relocate_sdk.py ${STAGING_DIR}-uninative/${BUILD_ARCH}-linux ${UNINATIVE_LOADER} ${UNINATIVE_LOADER} ${STAGING_DIR}-uninative/${BUILD_ARCH}-linux/patchelf-uninative") try: subprocess.check_call(cmd, shell=True) except subprocess.CalledProcessError as exc: @@ -51,6 +52,8 @@ python uninative_eventhandler() { SSTATEPOSTUNPACKFUNCS_append = " uninative_changeinterp" +PATH_prepend = "${STAGING_DIR}-uninative/${BUILD_ARCH}-linux${bindir_native}:" + python uninative_changeinterp () { import subprocess import stat |