diff --git a/scripts/make_image.sh b/scripts/make_image.sh index 378b125e6560b3fcaa9ffeb48293cb8bfd99cd8c..d5d785e2d20891d1649edac96a21c31560e7a1e7 100755 --- a/scripts/make_image.sh +++ b/scripts/make_image.sh @@ -62,7 +62,7 @@ function make_image() --exclude="/sys/*" \ --info=progress0,stats1 ${ROOTFS}/ $MOUNT/ > /dev/null - config_310b_components + config_310b_components # fix wrong / permissions chmod 755 $MOUNT diff --git a/scripts/make_image_310b.sh b/scripts/make_image_310b.sh index fbc050c1c316104161cbd2661c043926f040f9a1..3ffb85f2d6cfe2726cfd4122cacf9bdc8413d713 100755 --- a/scripts/make_image_310b.sh +++ b/scripts/make_image_310b.sh @@ -14,10 +14,16 @@ function config_310b_components() BOOTCRL_OFFSET=4352 uuid1=`blkid ${LOOP}p1 -s PARTUUID | awk -F ' ' '{print $2}' | sed 's/\"//g'` - if [[ ! -f /lib/64/ld-linux-aarch64.so.1 ]]; then - cp ${DOWNLOAD_DIR}/${DRIVER_DIR}/library/ld-linux-aarch64.so.1 /lib64/ + if [[ ${HOST_ARCH} == "x86_64" ]];then + if [[ ! -f /lib64/ld-linux-aarch64.so.1 ]]; then + cp ${DOWNLOAD_DIR}/${DRIVER_DIR}/library/ld-linux-aarch64.so.1 /lib64/ + fi + export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/${DOWNLOAD_DIR}/${DRIVER_DIR}/library + else + if [[ ! -f /lib64/ld-linux-aarch64.so.1 ]]; then + cp /lib/ld-linux-aarch64.so.1 /lib64/ + fi fi - export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/${DOWNLOAD_DIR}/${DRIVER_DIR}/library ${DOWNLOAD_DIR}/${DRIVER_DIR}/overlay/usr/bin/emmc-head $Install_Cache_Path_Param/firmware/ ${uuid1} ${uuid1} > /dev/null 2>&1 if [[ $? -ne 0 ]];then exit