diff options
author | Richard Purdie <richard@openedhand.com> | 2005-10-10 10:41:35 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2005-10-10 10:41:35 +0000 |
commit | cbf3ef91305558fb8a59e19c5987a9e9ca22013a (patch) | |
tree | f7142e57734a8b2fac92ff758a6617d4464a82f9 /openembedded/classes/kernel.bbclass | |
parent | 562d4d35878bb644cbe2b9f23ef407fd6e1e38e2 (diff) | |
download | openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.gz openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.bz2 openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.xz openembedded-core-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.zip |
Merge changes from mainline OE to try and keep us in sync.
git-svn-id: https://svn.o-hand.com/repos/poky@127 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/classes/kernel.bbclass')
-rw-r--r-- | openembedded/classes/kernel.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/openembedded/classes/kernel.bbclass b/openembedded/classes/kernel.bbclass index ff9aeeab7..df676c5a8 100644 --- a/openembedded/classes/kernel.bbclass +++ b/openembedded/classes/kernel.bbclass @@ -60,7 +60,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" kernel_do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}" - oe_runmake dep CC="${KERNEL_CC}" LD="${KERNEL_LD}" + if ${KERNEL_MAJOR_VERSION} != "2.6"; then + oe_runmake dep CC="${KERNEL_CC}" LD="${KERNEL_LD}" + fi oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}" if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then oe_runmake modules CC="${KERNEL_CC}" LD="${KERNEL_LD}" |