Updates from OE

git-svn-id: https://svn.o-hand.com/repos/poky@170 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 2 insertions, 1 deletions

diff --git a/openembedded/classes/efl.bbclass b/openembedded/classes/efl.bbclass
index 964748e85c..b438ca61b4 100644
--- a/openembedded/classes/efl.bbclass
+++ b/openembedded/classes/efl.bbclass
@@ -40,6 +40,7 @@ export IMLIB2_CONFIG		= "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}"
 
 do_compile_prepend() {
         find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+        find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
 }
 
 do_stage_append () {
diff --git a/openembedded/classes/kernel.bbclass b/openembedded/classes/kernel.bbclass
index df676c5a8d..463ff5f6b5 100644
--- a/openembedded/classes/kernel.bbclass
+++ b/openembedded/classes/kernel.bbclass
@@ -60,7 +60,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 kernel_do_compile() {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
         oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}"
-        if ${KERNEL_MAJOR_VERSION} != "2.6"; then
+        if [ "${KERNEL_MAJOR_VERSION}" != "2.6" ]; then
                 oe_runmake dep CC="${KERNEL_CC}" LD="${KERNEL_LD}"
         fi
         oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}"