diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/uninative.bbclass | 7 | ||||
-rw-r--r-- | meta/conf/distro/include/yocto-uninative.inc | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index 8f3448336f..682c627552 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass | |||
@@ -59,6 +59,11 @@ python uninative_event_fetchloader() { | |||
59 | if localpath != tarballpath and os.path.exists(localpath) and not os.path.exists(tarballpath): | 59 | if localpath != tarballpath and os.path.exists(localpath) and not os.path.exists(tarballpath): |
60 | os.symlink(localpath, tarballpath) | 60 | os.symlink(localpath, tarballpath) |
61 | 61 | ||
62 | # ldd output is "ldd (Ubuntu GLIBC 2.23-0ubuntu10) 2.23", extract last option from first line | ||
63 | glibcver = subprocess.check_output(["ldd", "--version"]).decode('utf-8').split('\n')[0].split()[-1] | ||
64 | if bb.utils.vercmp_string(d.getVar("UNINATIVE_MAXGLIBCVERSION"), glibcver) < 0: | ||
65 | raise RuntimeError("Your host glibc verson (%s) is newer than that in uninative (%s). Disabling uninative so that sstate is not corrupted." % (glibcver, d.getVar("UNINATIVE_MAXGLIBCVERSION"))) | ||
66 | |||
62 | cmd = d.expand("\ | 67 | cmd = d.expand("\ |
63 | mkdir -p ${UNINATIVE_STAGING_DIR}-uninative; \ | 68 | mkdir -p ${UNINATIVE_STAGING_DIR}-uninative; \ |
64 | cd ${UNINATIVE_STAGING_DIR}-uninative; \ | 69 | cd ${UNINATIVE_STAGING_DIR}-uninative; \ |
@@ -76,6 +81,8 @@ ${UNINATIVE_STAGING_DIR}-uninative/relocate_sdk.py \ | |||
76 | 81 | ||
77 | enable_uninative(d) | 82 | enable_uninative(d) |
78 | 83 | ||
84 | except RuntimeError as e: | ||
85 | bb.warn(str(e)) | ||
79 | except bb.fetch2.BBFetchException as exc: | 86 | except bb.fetch2.BBFetchException as exc: |
80 | bb.warn("Disabling uninative as unable to fetch uninative tarball: %s" % str(exc)) | 87 | bb.warn("Disabling uninative as unable to fetch uninative tarball: %s" % str(exc)) |
81 | bb.warn("To build your own uninative loader, please bitbake uninative-tarball and set UNINATIVE_TARBALL appropriately.") | 88 | bb.warn("To build your own uninative loader, please bitbake uninative-tarball and set UNINATIVE_TARBALL appropriately.") |
diff --git a/meta/conf/distro/include/yocto-uninative.inc b/meta/conf/distro/include/yocto-uninative.inc index b3f8c247f5..cd5fc0bfe5 100644 --- a/meta/conf/distro/include/yocto-uninative.inc +++ b/meta/conf/distro/include/yocto-uninative.inc | |||
@@ -6,6 +6,8 @@ | |||
6 | # to the distro running on the build machine. | 6 | # to the distro running on the build machine. |
7 | # | 7 | # |
8 | 8 | ||
9 | UNINATIVE_MAXGLIBCVERSION = "2.27" | ||
10 | |||
9 | UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/1.8/" | 11 | UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/1.8/" |
10 | UNINATIVE_CHECKSUM[i686] ?= "427ce522ec97f65c75fd89587d90ef789e8cbca4a617abc4b5822abb01c2d0ae" | 12 | UNINATIVE_CHECKSUM[i686] ?= "427ce522ec97f65c75fd89587d90ef789e8cbca4a617abc4b5822abb01c2d0ae" |
11 | UNINATIVE_CHECKSUM[x86_64] ?= "de4947e98e09e1432d069311cc2093974ecb9138a714fd5466f73524de66a693" | 13 | UNINATIVE_CHECKSUM[x86_64] ?= "de4947e98e09e1432d069311cc2093974ecb9138a714fd5466f73524de66a693" |