diff options
author | Ross Burton <ross.burton@intel.com> | 2016-02-22 21:06:38 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-28 11:32:35 +0000 |
commit | 99ae0859ba5fa83c9cfd75a814f8281624e8987e (patch) | |
tree | 9fae59b99a3ac85082888038aac5add5da769aeb /meta/classes/uninative.bbclass | |
parent | 938687db0255d749ed8110d68628e505967b7131 (diff) | |
download | openembedded-core-contrib-99ae0859ba5fa83c9cfd75a814f8281624e8987e.tar.gz |
uninative.bbclass: if the loader can't be found disable instead of failing
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/uninative.bbclass')
-rw-r--r-- | meta/classes/uninative.bbclass | 64 |
1 files changed, 38 insertions, 26 deletions
diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index 270c1b0be4f..9a5717020c1 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass @@ -1,5 +1,3 @@ -NATIVELSBSTRING = "universal" - 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" @@ -13,19 +11,16 @@ addhandler uninative_eventhandler uninative_eventhandler[eventmask] = "bb.event.BuildStarted" python uninative_eventhandler() { - loader = e.data.getVar("UNINATIVE_LOADER", True) + enabled = True + + loader = d.getVar("UNINATIVE_LOADER", True) tarball = d.getVar("UNINATIVE_TARBALL", True) tarballdir = d.getVar("UNINATIVE_DLDIR", True) tarballpath = os.path.join(tarballdir, tarball) if not os.path.exists(loader): - import subprocess - - olddir = os.getcwd() + # If the tarball doesn't exist, try to fetch it. if not os.path.exists(tarballpath): - # Copy the data object and override DL_DIR and SRC_URI - localdata = bb.data.createCopy(d) - if d.getVar("UNINATIVE_URL", True) == "unset": bb.fatal("Uninative selected but not configured, please set UNINATIVE_URL") @@ -33,31 +28,48 @@ python uninative_eventhandler() { if not chksum: bb.fatal("Uninative selected but not configured correctly, please set UNINATIVE_CHECKSUM[%s]" % d.getVar("BUILD_ARCH", True)) - srcuri = d.expand("${UNINATIVE_URL}${UNINATIVE_TARBALL};md5sum=%s" % chksum) - localdata.setVar('FILESPATH', tarballdir) - localdata.setVar('DL_DIR', tarballdir) - bb.note("Fetching uninative binary shim from %s" % srcuri) - fetcher = bb.fetch2.Fetch([srcuri], localdata, cache=False) try: + # Save and restore cwd as Fetch.download() does a chdir() + olddir = os.getcwd() + + localdata = bb.data.createCopy(d) + localdata.setVar('FILESPATH', "") + localdata.setVar('DL_DIR', tarballdir) + + srcuri = d.expand("${UNINATIVE_URL}${UNINATIVE_TARBALL};md5sum=%s" % chksum) + bb.note("Fetching uninative binary shim from %s" % srcuri) + + fetcher = bb.fetch2.Fetch([srcuri], localdata, cache=False) fetcher.download() localpath = fetcher.localpath(srcuri) if localpath != tarballpath and os.path.exists(localpath) and not os.path.exists(tarballpath): os.symlink(localpath, tarballpath) except Exception as exc: - bb.fatal("Unable to download uninative tarball: %s" % str(exc)) - - 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/${bindir_native}/patchelf-uninative") - try: - subprocess.check_call(cmd, shell=True) - except subprocess.CalledProcessError as exc: - bb.fatal("Unable to install uninative tarball: %s" % str(exc)) - os.chdir(olddir) + bb.warn("Unable to download uninative tarball: %s" % str(exc)) + enabled = False + finally: + os.chdir(olddir) + + # If we're still enabled then the fetch didn't fail, so unpack the tarball + if enabled: + import subprocess + try: + 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) + except subprocess.CalledProcessError as exc: + bb.warn("Unable to install uninative tarball: %s" % str(exc)) + enabled = False + + if enabled: + 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}:") + else: + bb.warn("Uninative selected but the loader isn't present and can't be downloaded. Disabling uninative.\n" + "To build your own uninative loader, please bitbake uninative-tarball and set UNINATIVE_TARBALL appropriately.") } -SSTATEPOSTUNPACKFUNCS_append = " uninative_changeinterp" - -PATH_prepend = "${STAGING_DIR}-uninative/${BUILD_ARCH}-linux${bindir_native}:" - python uninative_changeinterp () { import subprocess import stat |