diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2015-01-15 11:54:13 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-16 23:08:17 +0000 |
commit | 1a0343aa565f3c734be56380a5a7ed35f23a9052 (patch) | |
tree | b878a3fbc98987901678e526be5e01f3961d7530 /meta | |
parent | 397f27cdceaa4874d8d06aad10cd37a5817d90b8 (diff) | |
download | poky-1a0343aa565f3c734be56380a5a7ed35f23a9052.tar.gz |
module.bbclass: Add KERNEL_SRC in EXTRA_OEMAKE
When the sstate hash changes for do_configure task, the do_configure
default implementation triggers the 'clean' to be run. For it to
succeed we need to have KERNEL_SRC defined in EXTRA_OEMAKE. Fixes
following error:
,----
| DEBUG: Executing shell function do_configure
| NOTE: make -e MAKEFLAGS= clean
| make -C M=.../tmp/work/... clean
| make[1]: *** M=.../tmp/work/...: No such file or directory. Stop.
| Makefile:20: recipe for target 'clean' failed
| make: *** [clean] Error 2
| ERROR: oe_runmake failed
`----
(From OE-Core rev: bc0f58f0713ea7db3c4c24a7d321435934d745d7)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/module.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass index ad6f7af1bb..5cb8623a66 100644 --- a/meta/classes/module.bbclass +++ b/meta/classes/module.bbclass | |||
@@ -6,10 +6,11 @@ addtask make_scripts after do_patch before do_compile | |||
6 | do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock" | 6 | do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock" |
7 | do_make_scripts[deptask] = "do_populate_sysroot" | 7 | do_make_scripts[deptask] = "do_populate_sysroot" |
8 | 8 | ||
9 | EXTRA_OEMAKE += "KERNEL_SRC=${STAGING_KERNEL_DIR}" | ||
10 | |||
9 | module_do_compile() { | 11 | module_do_compile() { |
10 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS | 12 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS |
11 | oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ | 13 | oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \ |
12 | KERNEL_SRC=${STAGING_KERNEL_DIR} \ | ||
13 | KERNEL_VERSION=${KERNEL_VERSION} \ | 14 | KERNEL_VERSION=${KERNEL_VERSION} \ |
14 | CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ | 15 | CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ |
15 | AR="${KERNEL_AR}" \ | 16 | AR="${KERNEL_AR}" \ |
@@ -19,7 +20,6 @@ module_do_compile() { | |||
19 | module_do_install() { | 20 | module_do_install() { |
20 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS | 21 | unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS |
21 | oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" \ | 22 | oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" \ |
22 | KERNEL_SRC=${STAGING_KERNEL_DIR} \ | ||
23 | CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ | 23 | CC="${KERNEL_CC}" LD="${KERNEL_LD}" \ |
24 | modules_install | 24 | modules_install |
25 | } | 25 | } |