kexecboot: require ../linux/linux.inc, not recipes/linux/linux.inc.

linux-kexecboot.inc does a 'require recipes/linux/linux.inc', but it really
depends on how the upstream OpenEmbedded linux/linux.inc behaves, not whatever
the first one it finds in BBPATH does.  This broke builds for me combining
upstream OpenEmbedded with some local collections that do different things
with their kernels.

Signed-off-by: Chris Larson <clarson@mvista.com>

diff --git a/recipes/kexecboot/linux-kexecboot.inc b/recipes/kexecboot/linux-kexecboot.inc
index fb3816b3481beb577e1d39331eb79072830a3e41..74767b0b127aba86e7a83df414ac880b3b0434ff 100644 (file)
--- a/recipes/kexecboot/linux-kexecboot.inc
+++ b/recipes/kexecboot/linux-kexecboot.inc
@@ -6,7 +6,7 @@ SRC_URI = "file://defconfig"
 LOGO_SIZE = '${@base_conditional("GUI_MACHINE_CLASS", "bigscreen", "vga", "qvga", d)}'
 SRC_URI += "file://${LOGO_SIZE}/logo_linux_clut224.ppm.bz2"
 
-require recipes/linux/linux.inc
+require ../linux/linux.inc
 
 DONT_CHECK_KERNELSIZE = ""
 INITRAMFS_IMAGE = "initramfs-kexecboot-image"