--- elwix/build_rootfs.sh 2021/03/25 18:17:05 1.11.2.2 +++ elwix/build_rootfs.sh 2021/03/25 19:04:57 1.11.2.3 @@ -5,7 +5,7 @@ # (C) AITNET ltd - Sofia/Bulgaria # by Michael Pounov # -# $Id: build_rootfs.sh,v 1.11.2.2 2021/03/25 18:17:05 misho Exp $ +# $Id: build_rootfs.sh,v 1.11.2.3 2021/03/25 19:04:57 misho Exp $ # [ -r ./config/rc.elwix ] && . ./config/rc.elwix @@ -30,6 +30,13 @@ if [ "${USER}" != "root" ]; then exit 1 fi +if [ ! -x "${OBJDUMP}" ]; then + echo + echo "ELWIX project is not configured - executable objdump not found !" + echo + exit 1 +fi + KRNNAME="kernel_rootfs" NEWKERN="${REL}/${KRNNAME}" MKF="Makefile.elwix" @@ -430,16 +437,13 @@ install_image() mfs_size=`stat -f '%z' $REL/$ROOTFS_IMG 2>/dev/null` [ -z ${mfs_size} ] && echo "Can't determine MFS image size" && exit 1 - echo "exec> /usr/bin/llvm-objdump -h $KERNEL_ROOTFS 2> /dev/null | grep \" oldmfs \"" -## echo "exec> ${CROSSTOOLDIR}/usr/bin/objdump -h $KERNEL_ROOTFS 2> /dev/null | grep \" oldmfs \"" -## sec_info=`${CROSSTOOLDIR}/usr/bin/objdump -h $KERNEL_ROOTFS 2> /dev/null | grep " oldmfs "` - sec_info=`/usr/bin/llvm-objdump -h $KERNEL_ROOTFS 2> /dev/null | grep " oldmfs "` + echo "exec> ${OBJDUMP} -h $KERNEL_ROOTFS 2> /dev/null | grep \" oldmfs \"" + sec_info=`${OBJDUMP} -h $KERNEL_ROOTFS 2> /dev/null | grep " oldmfs "` [ -z "${sec_info}" ] && echo "Can't locate mfs section within kernel" && exit 1 echo "'-> Object dump { ${sec_info} }" sec_size=`echo ${sec_info} | awk '{printf("%d", "0x" $3)}' 2> /dev/null` -## sec_start=`echo ${sec_info} | awk '{printf("%d", "0x" $6)}' 2> /dev/null` - sec_start=`echo ${sec_info} | awk '{printf("%d", "0x" $4)}' 2> /dev/null` + sec_start=`echo ${sec_info} | awk '{printf("%d", "0x" $6)}' 2> /dev/null` echo "'-> Start offset from $sec_start and rootfs size $sec_size byte" [ ${sec_size} -lt ${mfs_size} ] && echo "MFS image too large" && exit 1