From: Chris Larson <clarson@mvista.com>
Date: Tue, 26 May 2009 23:51:30 +0000 (-0700)
Subject: kexecboot: require ../linux/linux.inc, not recipes/linux/linux.inc.
X-Git-Tag: Release-2010-05/1~3393
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb5d379aa5a57c54e36b2452baac1135952fda8e;p=openembedded.git

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 fb3816b348..74767b0b12 100644
--- 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"