[oe-commits] Chris Larson : kexecboot: require ../linux/linux.inc, not recipes/linux/ linux.inc.

[git version control]

Module: openembedded.git
Branch: stable/2009
Commit: 29428be0b6a22f89992c5f41c2d256b9afd8bd5f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=29428be0b6a22f89992c5f41c2d256b9afd8bd5f

Author: Chris Larson <clarson at mvista.com>
Date:   Wed Jul  1 17:54:59 2009 +0000

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 at mvista.com>
Signed-off-by: Marcin Juszkiewicz <marcin at juszkiewicz.com.pl>
Acked-by: Koen Kooi <koen at openembedded.org>
Acked-by: Denys Dmytriyenko <denis at denix.org>

---

 recipes/kexecboot/linux-kexecboot.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/recipes/kexecboot/linux-kexecboot.inc b/recipes/kexecboot/linux-kexecboot.inc
index 31b6377..eba5d66 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"