From 9e0c38e98908f38970af326a4cf8098bd09f665d Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Wed, 10 Jun 2020 16:49:17 +0800
Subject: [PATCH] build_oran.sh: fix the output image info for ARM

Use ${BSP} instead of hard coded 'intel-x86-64' and ${IMAGE_TYPE}
instead of 'iso' to fix the output image info.

Issue-ID: INF-160
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: Icf8770345f551b113919c8c124cb32629d3becab
---
 scripts/build_oran.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/build_oran.sh b/scripts/build_oran.sh
index a94f94aa..a8ac7781 100755
--- a/scripts/build_oran.sh
+++ b/scripts/build_oran.sh
@@ -97,6 +97,7 @@ DRYRUN=""
 EXTRA_CONF=""
 RM_WORK="Yes"
 BSP="intel-x86-64"
+IMAGE_TYPE="iso"
 
 while getopts "w:b:e:r:nh" OPTION; do
     case ${OPTION} in
@@ -131,6 +132,11 @@ if [ -n "${BSP_VALID}" ]; then
     BSP="${BSP_VALID}"
 fi
 
+# iso image is not supported by nxp-lx2xxx yet
+if [ "${BSP}" == "nxp-lx2xxx" ]; then
+    IMAGE_TYPE="tar.bz2"
+fi
+
 SRC_WRL_DIR=${WORKSPACE}/src_wrlinux
 SRC_ORAN_DIR=${WORKSPACE}/src_oran
 PRJ_BUILD_DIR=${WORKSPACE}/prj_oran-inf
@@ -229,4 +235,4 @@ RUN_CMD="bitbake ${DRYRUN} wr-app-container"
 echo_cmd "Build the wr-app-container image"
 bitbake ${DRYRUN} wr-app-container 2>&1|tee logs/bitbake_wr-app-container_${TIMESTAMP}.log
 
-echo_info "Build succeeded, you can get the image in ${PRJ_BUILD_DIR}/tmp-glibc/deploy/images/intel-x86-64/oran-image-inf-host-intel-x86-64.iso"
+echo_info "Build succeeded, you can get the image in ${PRJ_BUILD_DIR}/tmp-glibc/deploy/images/${BSP}/oran-image-inf-host-${BSP}.${IMAGE_TYPE}"
-- 
2.16.6