diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-25 15:48:26 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-25 15:48:26 +0000 |
| commit | e06e7e8cbfd645481971be84750e24c029c90921 (patch) | |
| tree | 98fd723baf4e621e094c66627c845b97165b56ec | |
| parent | ecc896be992f1bdf53f50bfd7d0210a4eaecf6a6 (diff) | |
| download | openembedded-core-e06e7e8cbfd645481971be84750e24c029c90921.tar.gz openembedded-core-e06e7e8cbfd645481971be84750e24c029c90921.tar.bz2 openembedded-core-e06e7e8cbfd645481971be84750e24c029c90921.zip | |
kernel.bbclass: use u-boot-mkimage-native for uImage kernels (from linux.inc)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4116 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/classes/kernel.bbclass | 14 | ||||
| -rw-r--r-- | meta/packages/linux/linux.inc | 11 |
2 files changed, 13 insertions, 12 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 67dff3f7e6..4b72b682ce 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -3,6 +3,19 @@ inherit linux-kernel-base module_strip PROVIDES += "virtual/kernel" DEPENDS += "virtual/${TARGET_PREFIX}depmod-${@get_kernelmajorversion('${PV}')} virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules" +KERNEL_IMAGETYPE ?= "zImage" + +python __anonymous () { + + import bb + + 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 + bb.data.setVar("DEPENDS", depends, d) +} + inherit kernel-arch PACKAGES_DYNAMIC += "kernel-module-*" @@ -10,7 +23,6 @@ PACKAGES_DYNAMIC += "kernel-image-*" export OS = "${TARGET_OS}" export CROSS_COMPILE = "${TARGET_PREFIX}" -KERNEL_IMAGETYPE ?= "zImage" KERNEL_PRIORITY = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[-1]}" diff --git a/meta/packages/linux/linux.inc b/meta/packages/linux/linux.inc index 2b376e2d01..6993091dfc 100644 --- a/meta/packages/linux/linux.inc +++ b/meta/packages/linux/linux.inc @@ -6,17 +6,6 @@ inherit kernel DEPENDS_append_em-x270 = " mtd-utils " -python __anonymous () { - - import bb - - 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 - bb.data.setVar("DEPENDS", depends, d) -} - RPSRC = "http://www.rpsys.net/openzaurus/patches/archive" # Specify the commandline for your device |