kernel.bbclass: kernel_do_install fails with kernel <2.6.30

 * kernels <2.6.30 don't have $kerneldir/tools directory
 * so we got this error:
 * sed: can't read ...SNIP...linux/2.6.30-r0/image/usr/src/kernel/tools/perf/Makefile: No such file or directory
 * ERROR: Function failed: do_install

(From OE-Core rev: 4dd39a23dfe069ad34a925e00407b4dde978cb01)

Signed-off-by: Marco Cavallini <m.cavallini@koansoftware.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 96b23bc..aff8842 100644 (file)
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -204,8 +204,11 @@ kernel_do_install() {
                rm -f $kerneldir/$entry
        done
 
-       # Fix SLANG_INC for slang.h
-       sed -i 's#-I/usr/include/slang#-I=/usr/include/slang#g' $kerneldir/tools/perf/Makefile
+       # kernels <2.6.30 don't have $kerneldir/tools directory so we check if it exists before calling sed
+       if [ -f $kerneldir/tools/perf/Makefile ]; then
+               # Fix SLANG_INC for slang.h
+               sed -i 's#-I/usr/include/slang#-I=/usr/include/slang#g' $kerneldir/tools/perf/Makefile
+       fi
 }
 
 sysroot_stage_all_append() {