diff options
author | Khem Raj <raj.khem@gmail.com> | 2014-11-21 10:05:03 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 10:18:53 +0000 |
commit | 49ece9bb51a3289974b1166cba71243c49fc318a (patch) | |
tree | 2edf937203ff9b4532a4d2e8f91a9d93d1748020 /meta | |
parent | 10710d7a9253d80fb40cda72ec8c17751c93d66e (diff) | |
download | poky-49ece9bb51a3289974b1166cba71243c49fc318a.tar.gz |
package.bbclass: Create empty key/value if not there for shlib_provider
When we use ASSUME_SHLIBS,e.g.
ASSUME_SHLIBS = "libEGL.so.1:libegl-implementation"
then we end up with errors like below when using shlibs2 (dizzy+)
File: 'package_do_shlibs', lineno: 216, function: package_do_shlibs
0212: dep_pkg = dep_pkg.rsplit("_", 1)
0213: if len(dep_pkg) == 2:
0214: lib_ver = dep_pkg[1]
0215: dep_pkg = dep_pkg[0]
*** 0216: shlib_provider[l][libdir] = (dep_pkg, lib_ver)
0217:
0218: libsearchpath = [d.getVar('libdir', True),
d.getVar('base_libdir', True)]
0219:
0220: for pkg in packages.split():
Exception: KeyError: 'libEGL.so.1'
This is because the entry which is being populated does not exist
so lets create it if its not already there.
Change-Id: I9e292c5439e5d1e01ea48341334507aacc3784ae
(From OE-Core rev: a64f81fcef42172f788cec7a63bb4672eac99f94)
(From OE-Core rev: b143340700961f916e4a21da42b859ec014dd366)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/package.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 2aec3e6bd9..696d173ced 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -1554,6 +1554,8 @@ python package_do_shlibs() { | |||
1554 | if len(dep_pkg) == 2: | 1554 | if len(dep_pkg) == 2: |
1555 | lib_ver = dep_pkg[1] | 1555 | lib_ver = dep_pkg[1] |
1556 | dep_pkg = dep_pkg[0] | 1556 | dep_pkg = dep_pkg[0] |
1557 | if l not in shlib_provider: | ||
1558 | shlib_provider[l] = {} | ||
1557 | shlib_provider[l][libdir] = (dep_pkg, lib_ver) | 1559 | shlib_provider[l][libdir] = (dep_pkg, lib_ver) |
1558 | 1560 | ||
1559 | libsearchpath = [d.getVar('libdir', True), d.getVar('base_libdir', True)] | 1561 | libsearchpath = [d.getVar('libdir', True), d.getVar('base_libdir', True)] |