aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes/uninative.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-07 12:06:53 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-07 12:41:09 +0000
commit1a6b39ccd55e6b26f9eb4e05089b8b97396d53d5 (patch)
tree764e536d8ba499a0b2a888e50b47ac64c4c9fe55 /meta/classes/uninative.bbclass
parent1925ead3828dcd50ef96212c2d1ea9c35bc9f13c (diff)
downloadopenembedded-core-contrib-1a6b39ccd55e6b26f9eb4e05089b8b97396d53d5.tar.gz
uninative: Refactor common code
Move duplicate code into a common function Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/uninative.bbclass')
-rw-r--r--meta/classes/uninative.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass
index 0a27ec41a7c..01fcbc10ca0 100644
--- a/meta/classes/uninative.bbclass
+++ b/meta/classes/uninative.bbclass
@@ -63,9 +63,7 @@ python uninative_event_fetchloader() {
cmd = d.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/${bindir_native}/patchelf-uninative")
subprocess.check_call(cmd, shell=True)
- d.setVar("NATIVELSBSTRING", "universal")
- d.appendVar("SSTATEPOSTUNPACKFUNCS", " uninative_changeinterp")
- d.prependVar("PATH", "${STAGING_DIR}-uninative/${BUILD_ARCH}-linux${bindir_native}:")
+ enable_uninative(d)
except bb.fetch2.BBFetchException as exc:
bb.warn("Disabling uninative as unable to fetch uninative tarball: %s" % str(exc))
@@ -82,14 +80,16 @@ python uninative_event_enable() {
This event handler is called in the workers and is responsible for setting
up uninative if a loader is found.
"""
+ enable_uninative(d)
+}
+def enable_uninative(d):
loader = d.getVar("UNINATIVE_LOADER", True)
if os.path.exists(loader):
bb.debug(2, "Enabling uninative")
d.setVar("NATIVELSBSTRING", "universal")
d.appendVar("SSTATEPOSTUNPACKFUNCS", " uninative_changeinterp")
d.prependVar("PATH", "${STAGING_DIR}-uninative/${BUILD_ARCH}-linux${bindir_native}:")
-}
python uninative_changeinterp () {
import subprocess