From a264ab8cef020e1cb154426a75014b8062d738ea Mon Sep 17 00:00:00 2001
From: Jeffy Chen <jeffy.chen@rock-chips.com>
Date: Wed, 2 Jan 2019 14:29:35 +0800
Subject: [PATCH] mkfirmware.sh&mk-image.sh: Make sure using buildroot host
 tools

Change-Id: I3037ec2d5b91b34a9b31aa1a0887a4f47f7162b8
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
 common/build.sh      |  9 +--------
 common/mk-image.sh   | 10 +++++++---
 common/mkfirmware.sh |  6 ++++++
 rk3308/mkfirmware.sh |  5 +++++
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/common/build.sh b/common/build.sh
index 730566b..5a856f3 100755
--- a/common/build.sh
+++ b/common/build.sh
@@ -194,15 +194,8 @@ function clean_all(){
 }
 
 function build_firmware(){
-	HOST_DIR=$TOP_DIR/buildroot/output/host
-	if [ -d "$TARGET_OUTPUT_DIR" ];then
-		HOST_DIR=$TARGET_OUTPUT_DIR/host
-	fi
-
-	HOST_PATH=$HOST_DIR/usr/sbin:$HOST_DIR/usr/bin:$HOST_DIR/sbin:$HOST_DIR/bin
-
 	# mkfirmware.sh to genarate image
-	PATH=$HOST_PATH:$PATH ./mkfirmware.sh $BOARD_CONFIG
+	./mkfirmware.sh $BOARD_CONFIG
 	if [ $? -eq 0 ]; then
 	    echo "Make image ok!"
 	else
diff --git a/common/mk-image.sh b/common/mk-image.sh
index 302df30..e9b796e 100755
--- a/common/mk-image.sh
+++ b/common/mk-image.sh
@@ -1,10 +1,14 @@
 #!/bin/bash
 
-if [ -d "$TARGET_OUTPUT_DIR" ];then
-    HOST_DIR=$TARGET_OUTPUT_DIR/host
-    export PATH=$HOST_DIR/usr/sbin:$HOST_DIR/usr/bin:$HOST_DIR/sbin:$HOST_DIR/bin:$PATH
+if [ ! -d "$TARGET_OUTPUT_DIR" ]; then
+    echo "Source buildroot/build/envsetup.sh firstly!!!"
+    exit 1
 fi
 
+# Prefer using buildroot host tools for compatible.
+HOST_DIR=$TARGET_OUTPUT_DIR/host
+export PATH=$HOST_DIR/usr/sbin:$HOST_DIR/usr/bin:$HOST_DIR/sbin:$HOST_DIR/bin:$PATH
+
 fatal()
 {
     echo -e "FATAL: " $@
diff --git a/common/mkfirmware.sh b/common/mkfirmware.sh
index a6cb081..a882fca 100755
--- a/common/mkfirmware.sh
+++ b/common/mkfirmware.sh
@@ -30,6 +30,12 @@ LOADER=$TOP_DIR/u-boot/*_loader_v*.bin
 MKIMAGE=$TOP_DIR/device/rockchip/common/mk-image.sh
 mkdir -p $ROCKDEV
 
+# Require buildroot host tools to do image packing.
+if [ ! -d "$TARGET_OUTPUT_DIR" ]; then
+    echo "Source buildroot/build/envsetup.sh"
+    source $TOP_DIR/buildroot/build/envsetup.sh $RK_CFG_BUILDROOT
+fi
+
 if [ $RK_ROOTFS_IMG ]
 then
 	if [ -f $ROOTFS_IMG ]
diff --git a/rk3308/mkfirmware.sh b/rk3308/mkfirmware.sh
index 41a786b..520e6e8 100755
--- a/rk3308/mkfirmware.sh
+++ b/rk3308/mkfirmware.sh
@@ -35,6 +35,11 @@ MKIMAGE=$TOP_DIR/device/rockchip/common/mk-image.sh
 rm -rf $ROCKDEV
 mkdir -p $ROCKDEV
 
+# Require buildroot host tools to do image packing.
+if [ ! -d "$TARGET_OUTPUT_DIR" ]; then
+    echo "Source buildroot/build/envsetup.sh"
+    source $TOP_DIR/buildroot/build/envsetup.sh $RK_CFG_BUILDROOT
+fi
 
 if [ "${RK_OEM_DIR}" == "dueros"  ];then
 	if [ $RK_ARCH == arm ];then