diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-07 13:56:04 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-09 14:06:51 +0100 |
| commit | 534325fd1fb5f4b1d6c652e73d744061154f1eff (patch) | |
| tree | 48de1c053da50b8eeded9165ce5827de90ab82c2 /meta/classes/kernel-module-split.bbclass | |
| parent | e16faa55daca2a87190ce66dc98a37906ecf90af (diff) | |
| download | poky-534325fd1fb5f4b1d6c652e73d744061154f1eff.tar.gz | |
image/kernel-module-split/eglibc-ld.inc: Remove has_key() usage
The has_key() attribute has been removed in python 3 since there is better
syntax available. Use the improved syntax.
(From OE-Core rev: 3dff13793e875ff58cc38c4a960caca9b6969843)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/kernel-module-split.bbclass')
| -rw-r--r-- | meta/classes/kernel-module-split.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass index 45639c613c..9a4329dcc9 100644 --- a/meta/classes/kernel-module-split.bbclass +++ b/meta/classes/kernel-module-split.bbclass | |||
| @@ -109,7 +109,7 @@ python split_kernel_module_packages () { | |||
| 109 | # instead is prefixed with /lib/modules/${KERNEL_VERSION} | 109 | # instead is prefixed with /lib/modules/${KERNEL_VERSION} |
| 110 | file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1) | 110 | file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1) |
| 111 | 111 | ||
| 112 | if module_deps.has_key(file): | 112 | if file in module_deps: |
| 113 | dependencies = [] | 113 | dependencies = [] |
| 114 | for i in module_deps[file]: | 114 | for i in module_deps[file]: |
| 115 | m = re.match(pattern, os.path.basename(i)) | 115 | m = re.match(pattern, os.path.basename(i)) |
| @@ -153,7 +153,7 @@ python split_kernel_module_packages () { | |||
| 153 | files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename) | 153 | files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename) |
| 154 | d.setVar('FILES_%s' % pkg, files) | 154 | d.setVar('FILES_%s' % pkg, files) |
| 155 | 155 | ||
| 156 | if vals.has_key("description"): | 156 | if "description" in vals: |
| 157 | old_desc = d.getVar('DESCRIPTION_' + pkg, True) or "" | 157 | old_desc = d.getVar('DESCRIPTION_' + pkg, True) or "" |
| 158 | d.setVar('DESCRIPTION_' + pkg, old_desc + "; " + vals["description"]) | 158 | d.setVar('DESCRIPTION_' + pkg, old_desc + "; " + vals["description"]) |
| 159 | 159 | ||
