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 | poky-cbf3ef91305558fb8a59e19c5987a9e9ca22013a.tar.gz | |
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 ff9aeeab78..df676c5a8d 100644 --- a/openembedded/classes/kernel.bbclass +++ b/openembedded/classes/kernel.bbclass | |||
| @@ -60,7 +60,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
| 60 | kernel_do_compile() { | 60 | kernel_do_compile() { |
| 61 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS | 61 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS |
| 62 | oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}" | 62 | oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}" |
| 63 | oe_runmake dep CC="${KERNEL_CC}" LD="${KERNEL_LD}" | 63 | if ${KERNEL_MAJOR_VERSION} != "2.6"; then |
| 64 | oe_runmake dep CC="${KERNEL_CC}" LD="${KERNEL_LD}" | ||
| 65 | fi | ||
| 64 | oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}" | 66 | oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}" |
| 65 | if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then | 67 | if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then |
| 66 | oe_runmake modules CC="${KERNEL_CC}" LD="${KERNEL_LD}" | 68 | oe_runmake modules CC="${KERNEL_CC}" LD="${KERNEL_LD}" |