From 94fe5725ecc47c69a0836db9a17ad4644bf433ac Mon Sep 17 00:00:00 2001
From: Vishal Bhoj <vishal.bhoj@linaro.org>
Date: Thu, 7 Sep 2017 10:06:17 +0100
Subject: FIXME: Use fixed version of oe-core for ilp32 build

Build fails on oe-core master branch. Lets change
to the version that works for us for now until the
issues are fixed on master branch

Change-Id: I0d1940a3a038a5ffabd38f98a560c8ba57727e79
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
---
 functions.sh      | 14 ++++++++++++++
 init-and-build.sh |  4 ++++
 2 files changed, 18 insertions(+)

diff --git a/functions.sh b/functions.sh
index 6be1e40..41fea44 100755
--- a/functions.sh
+++ b/functions.sh
@@ -62,6 +62,20 @@ git_clone_update()
     fi
 }
 
+fix_oe_core_git()
+{
+    cd openembedded-core;
+    git reset --hard 62f1122ef166eba56441d669c6b3b3fe5f367418
+    git revert --no-edit 1a7b843d575b290917d1e379c2ba106460988230
+    git revert --no-edit a2b278a6eaa9e9b48d858e3be6712267c0122598
+    git revert --no-edit 4097694b13cd5f0d68987551c3f9af80c87dc6ae
+    wget https://patchwork.openembedded.org/patch/143520/raw/ -O patch
+    patch -p1 < patch
+    sed -i "s/sysrootcache/aclocalcache/g" meta/classes/autotools.bbclass
+    rm -rf patch
+    cd -
+}
+
 conf_bblayers()
 {
 # add required layers
diff --git a/init-and-build.sh b/init-and-build.sh
index 219e153..c66d724 100755
--- a/init-and-build.sh
+++ b/init-and-build.sh
@@ -81,6 +81,10 @@ show_setup
 
 git_clone_update
 
+if [ ${MACHINE} == hikey-ilp32 ] || [ ${MACHINE} == genericarmv8-ilp32 ]; then
+   fix_oe_core_git
+fi
+
 # the purpose of the 'init' function is to prepare the <build> folder
 # the default init function suitable for Linaro Platform builds, but
 # the user can specify a custom function if needed. In any case, the
-- 
cgit v1.2.3