diff options
Diffstat (limited to 'classes/kernel.bbclass')
| -rw-r--r-- | classes/kernel.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index a157dfc0e9..9555f30a30 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -14,7 +14,7 @@ python __anonymous () { kerneltype = bb.data.getVar('KERNEL_IMAGETYPE', d, 1) or '' if kerneltype == 'uImage': depends = bb.data.getVar("DEPENDS", d, 1) - depends = "%s u-boot-mkimage-openmoko-native" % depends + depends = "%s u-boot-mkimage-native" % depends bb.data.setVar("DEPENDS", depends, d) image = bb.data.getVar('INITRAMFS_IMAGE', d, True) @@ -476,6 +476,7 @@ python populate_packages_prepend () { bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d) bb.data.setVar('FILES_' + metapkg, "", d) blacklist = [ 'kernel-dev', 'kernel-image', 'kernel-base', 'kernel-vmlinux' ] + depchains = (d.getVar("DEPCHAIN_POST", True) or "").split() for l in module_deps.values(): for i in l: pkg = module_pattern % legitimize_package_name(re.match(module_regex, os.path.basename(i)).group(1)) @@ -483,7 +484,7 @@ python populate_packages_prepend () { metapkg_rdepends = [] packages = bb.data.getVar('PACKAGES', d, 1).split() for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends: + if not pkg in blacklist and not pkg in metapkg_rdepends and not any(pkg.endswith(post) for post in depchains): metapkg_rdepends.append(pkg) bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) bb.data.setVar('DESCRIPTION_' + metapkg, 'Kernel modules meta package', d) |