summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-rw-r--r--classes/kernel.bbclass4
-rw-r--r--classes/package.bbclass2
2 files changed, 4 insertions, 2 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index f111c9f092..06ae2466ea 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -5,6 +5,8 @@ DEPENDS += "virtual/${TARGET_PREFIX}depmod-${@get_kernelmajorversion('${PV}')} v
KERNEL_IMAGETYPE ?= "zImage"
+# Add dependency on mkimage for kernels that build a uImage
+
python __anonymous () {
import bb
@@ -12,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-native" % depends
+ depends = "%s u-boot-mkimage-openmoko-native" % depends
bb.data.setVar("DEPENDS", depends, d)
}
diff --git a/classes/package.bbclass b/classes/package.bbclass
index eb43856c55..814715e1fa 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -904,7 +904,7 @@ python package_depchains() {
for suffix in pkgs:
for pkg in pkgs[suffix]:
(base, func) = pkgs[suffix][pkg]
- if suffix == "-dev":
+ if suffix == "-dev" and not pkg.startswith("kernel-module-"):
pkg_adddeprrecs(pkg, base, suffix, func, depends, d)
if len(pkgs[suffix]) == 1:
pkg_addrrecs(pkg, base, suffix, func, rdepends, d)