mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

uninative: Refactor common code

Browse Source 
Move duplicate code into a common function

(From OE-Core rev: 1a6b39ccd55e6b26f9eb4e05089b8b97396d53d5)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2016-03-07 12:06:53 +00:00
parent 4feb00df18
commit 73265d10da
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/uninative.bbclass
+4 -4
View File
@@ -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") 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) subprocess.check_call(cmd, shell=True)
d.setVar("NATIVELSBSTRING", "universal") enable_uninative(d)
d.appendVar("SSTATEPOSTUNPACKFUNCS", " uninative_changeinterp")
d.prependVar("PATH", "${STAGING_DIR}-uninative/${BUILD_ARCH}-linux${bindir_native}:")
except bb.fetch2.BBFetchException as exc: except bb.fetch2.BBFetchException as exc:
bb.warn("Disabling uninative as unable to fetch uninative tarball: %s" % str(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 This event handler is called in the workers and is responsible for setting
up uninative if a loader is found. up uninative if a loader is found.
""" """
enable_uninative(d)
}
def enable_uninative(d):
loader = d.getVar("UNINATIVE_LOADER", True) loader = d.getVar("UNINATIVE_LOADER", True)
if os.path.exists(loader): if os.path.exists(loader):
bb.debug(2, "Enabling uninative") bb.debug(2, "Enabling uninative")
d.setVar("NATIVELSBSTRING", "universal") d.setVar("NATIVELSBSTRING", "universal")
d.appendVar("SSTATEPOSTUNPACKFUNCS", " uninative_changeinterp") d.appendVar("SSTATEPOSTUNPACKFUNCS", " uninative_changeinterp")
d.prependVar("PATH", "${STAGING_DIR}-uninative/${BUILD_ARCH}-linux${bindir_native}:") d.prependVar("PATH", "${STAGING_DIR}-uninative/${BUILD_ARCH}-linux${bindir_native}:")
}
python uninative_changeinterp () { python uninative_changeinterp () {
import subprocess import subprocess