summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-14 16:52:18 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-15 22:47:53 (GMT)
commit0d9db439e44ee360f2cd9044f677d55325ec475d (patch)
tree7d4ff1bde01d9ca435766ae24d93a80199959498
parent3a5581ed6d1c75b62c45a096e2453bb60f90860b (diff)
downloadpoky-0d9db439e44ee360f2cd9044f677d55325ec475d.tar.gz
uninative: Add compatiblity version check
If glibc is newer on the host than in uninative, the failure mode is pretty nasty for clusters where the sstate is shared, including the Yocto Project autobuilder. This check aborts the use of uninative in such scenarios where a newer glibc version appears and avoids corruption of sstate caches. We use ldd to check the glibc version since that is included in libc-bin (or equivalent) which locales use so it should always be present. (From OE-Core rev: 8147911a951c7b0508f9c2aef93480d65b4362c0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/uninative.bbclass7
-rw-r--r--meta/conf/distro/include/yocto-uninative.inc2
2 files changed, 9 insertions, 0 deletions
diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass
index 8f34483..682c627 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("\
63mkdir -p ${UNINATIVE_STAGING_DIR}-uninative; \ 68mkdir -p ${UNINATIVE_STAGING_DIR}-uninative; \
64cd ${UNINATIVE_STAGING_DIR}-uninative; \ 69cd ${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 b3f8c24..cd5fc0b 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
9UNINATIVE_MAXGLIBCVERSION = "2.27"
10
9UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/1.8/" 11UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/1.8/"
10UNINATIVE_CHECKSUM[i686] ?= "427ce522ec97f65c75fd89587d90ef789e8cbca4a617abc4b5822abb01c2d0ae" 12UNINATIVE_CHECKSUM[i686] ?= "427ce522ec97f65c75fd89587d90ef789e8cbca4a617abc4b5822abb01c2d0ae"
11UNINATIVE_CHECKSUM[x86_64] ?= "de4947e98e09e1432d069311cc2093974ecb9138a714fd5466f73524de66a693" 13UNINATIVE_CHECKSUM[x86_64] ?= "de4947e98e09e1432d069311cc2093974ecb9138a714fd5466f73524de66a693"