summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-07-08 15:16:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-16 15:09:21 +0100
commitc713a22368194b7f4d4c4b3cbb4a0af8369e6003 (patch)
treed162ae6007801ccd62aa144d85890f163626365b
parenta08f8db7a486740e909733d861a50769cedd08c0 (diff)
downloadpoky-c713a22368194b7f4d4c4b3cbb4a0af8369e6003.tar.gz
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. (From OE-Core rev: d596286bc4cf19774447b136a27acf3c61aad2ff) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel.bbclass8
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() {
211 211
212do_compile_kernelmodules() { 212do_compile_kernelmodules() {
213 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE 213 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
214 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then 214 if (grep -q -i -e '^CONFIG_MODULES=y$' ${B}/.config); then
215 oe_runmake ${PARALLEL_MAKE} modules CC="${KERNEL_CC}" LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} 215 oe_runmake -C ${B} ${PARALLEL_MAKE} modules CC="${KERNEL_CC}" LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}
216 else 216 else
217 bbnote "no modules to compile" 217 bbnote "no modules to compile"
218 fi 218 fi
@@ -260,7 +260,7 @@ emit_depmod_pkgdata() {
260 # Stash data for depmod 260 # Stash data for depmod
261 install -d ${PKGDESTWORK}/kernel-depmod/ 261 install -d ${PKGDESTWORK}/kernel-depmod/
262 echo "${KERNEL_VERSION}" > ${PKGDESTWORK}/kernel-depmod/kernel-abiversion 262 echo "${KERNEL_VERSION}" > ${PKGDESTWORK}/kernel-depmod/kernel-abiversion
263 cp System.map ${PKGDESTWORK}/kernel-depmod/System.map-${KERNEL_VERSION} 263 cp ${B}/System.map ${PKGDESTWORK}/kernel-depmod/System.map-${KERNEL_VERSION}
264} 264}
265 265
266PACKAGEFUNCS += "emit_depmod_pkgdata" 266PACKAGEFUNCS += "emit_depmod_pkgdata"
@@ -336,7 +336,7 @@ kernel_do_configure() {
336} 336}
337 337
338do_savedefconfig() { 338do_savedefconfig() {
339 oe_runmake savedefconfig 339 oe_runmake -C ${B} savedefconfig
340} 340}
341do_savedefconfig[nostamp] = "1" 341do_savedefconfig[nostamp] = "1"
342addtask savedefconfig after do_configure 342addtask savedefconfig after do_configure