diff options
Diffstat (limited to 'meta')
-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 @@ | |||
1 | NATIVELSBSTRING = "universal" | 1 | NATIVELSBSTRING = "universal" |
2 | 2 | ||
3 | 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)}" | 3 | 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)}" |
4 | 4 | ||
5 | UNINATIVE_URL ?= "unset" | 5 | UNINATIVE_URL ?= "unset" |
6 | UNINATIVE_TARBALL ?= "${BUILD_ARCH}-nativesdk-libc.tar.bz2" | 6 | UNINATIVE_TARBALL ?= "${BUILD_ARCH}-nativesdk-libc.tar.bz2" |
@@ -41,7 +41,8 @@ python uninative_eventhandler() { | |||
41 | fetcher.download() | 41 | fetcher.download() |
42 | except Exception as exc: | 42 | except Exception as exc: |
43 | bb.fatal("Unable to download uninative tarball: %s" % str(exc)) | 43 | bb.fatal("Unable to download uninative tarball: %s" % str(exc)) |
44 | 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") | 44 | |
45 | 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") | ||
45 | try: | 46 | try: |
46 | subprocess.check_call(cmd, shell=True) | 47 | subprocess.check_call(cmd, shell=True) |
47 | except subprocess.CalledProcessError as exc: | 48 | except subprocess.CalledProcessError as exc: |
@@ -51,6 +52,8 @@ python uninative_eventhandler() { | |||
51 | 52 | ||
52 | SSTATEPOSTUNPACKFUNCS_append = " uninative_changeinterp" | 53 | SSTATEPOSTUNPACKFUNCS_append = " uninative_changeinterp" |
53 | 54 | ||
55 | PATH_prepend = "${STAGING_DIR}-uninative/${BUILD_ARCH}-linux${bindir_native}:" | ||
56 | |||
54 | python uninative_changeinterp () { | 57 | python uninative_changeinterp () { |
55 | import subprocess | 58 | import subprocess |
56 | import stat | 59 | import stat |