diff options
| author | Ross Burton <ross.burton@intel.com> | 2015-07-08 15:16:51 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-16 15:08:44 +0100 |
| commit | d596286bc4cf19774447b136a27acf3c61aad2ff (patch) | |
| tree | 49d326e6bcd04b2f466109c9531106b7f541c41c | |
| parent | c4a1989f3550e81f188b5789af2c4c18560c3656 (diff) | |
| download | openembedded-core-d596286bc4cf19774447b136a27acf3c61aad2ff.tar.gz openembedded-core-d596286bc4cf19774447b136a27acf3c61aad2ff.tar.bz2 openembedded-core-d596286bc4cf19774447b136a27acf3c61aad2ff.zip | |
kernel: fix path assumptions in tasks
Several of the kernel class tasks were making assumptions about what directory
they were executed in. Clarify the code by making paths absolute or passing -C
to oe_runmake.
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/kernel.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 76d03dc4a7..d06f6cfe2a 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -211,8 +211,8 @@ kernel_do_compile() { do_compile_kernelmodules() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE - if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then - oe_runmake ${PARALLEL_MAKE} modules CC="${KERNEL_CC}" LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} + if (grep -q -i -e '^CONFIG_MODULES=y$' ${B}/.config); then + oe_runmake -C ${B} ${PARALLEL_MAKE} modules CC="${KERNEL_CC}" LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} else bbnote "no modules to compile" fi @@ -260,7 +260,7 @@ emit_depmod_pkgdata() { # Stash data for depmod install -d ${PKGDESTWORK}/kernel-depmod/ echo "${KERNEL_VERSION}" > ${PKGDESTWORK}/kernel-depmod/kernel-abiversion - cp System.map ${PKGDESTWORK}/kernel-depmod/System.map-${KERNEL_VERSION} + cp ${B}/System.map ${PKGDESTWORK}/kernel-depmod/System.map-${KERNEL_VERSION} } PACKAGEFUNCS += "emit_depmod_pkgdata" @@ -336,7 +336,7 @@ kernel_do_configure() { } do_savedefconfig() { - oe_runmake savedefconfig + oe_runmake -C ${B} savedefconfig } do_savedefconfig[nostamp] = "1" addtask savedefconfig after do_configure |