From cf24aa67b9d1eff14109dd95d74eb727c50635a0 Mon Sep 17 00:00:00 2001 From: Jeremy Laine Date: Thu, 27 Mar 2008 22:31:45 +0000 Subject: kernel.bbclass,linux.inc: move dependency on u-boot-openmoko-native to kernel.bbclass --- classes/kernel.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'classes') 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) } -- cgit v1.2.3 From 85039a6820d07a4cdcb7485dff31c3045a314c7d Mon Sep 17 00:00:00 2001 From: Thomas Kunze Date: Fri, 28 Mar 2008 14:45:21 +0000 Subject: package.bbclass: fix handling of kernel-modules which end with '-dev' Kernel-modules which end with -dev get update-modules-dev as RRECOMMENDS so update-modules-dev gets pulled in images. So we blacklist kernel-module packages for now. --- classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') 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) -- cgit v1.2.3