aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <clarson@mvista.com>2009-05-26 16:51:30 -0700
committerMartin Dietze <mdietze@gmail.com>2013-03-02 17:18:07 +0100
commitf10ba0f507d76fb1ae1e08b47243373d0ced5161 (patch)
treedd9120e05c8473f057ee843dd350a4e44e152af2
parentf6b2dfb51974b56740e90b03cf12c12faf400cb9 (diff)
downloadopenembedded-f10ba0f507d76fb1ae1e08b47243373d0ced5161.tar.gz
openembedded-f10ba0f507d76fb1ae1e08b47243373d0ced5161.tar.bz2
openembedded-f10ba0f507d76fb1ae1e08b47243373d0ced5161.zip
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>
-rw-r--r--recipes/kexecboot/linux-kexecboot.inc2
1 files changed, 1 insertions, 1 deletions
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"