[BACK]Return to build_rootfs.sh CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / elwix

Diff for /elwix/build_rootfs.sh between versions 1.11.2.1 and 1.11.2.2

version 1.11.2.1, 2021/03/24 08:26:16 version 1.11.2.2, 2021/03/25 18:17:05
Line 430  install_image() Line 430  install_image()
         mfs_size=`stat -f '%z' $REL/$ROOTFS_IMG 2>/dev/null`          mfs_size=`stat -f '%z' $REL/$ROOTFS_IMG 2>/dev/null`
         [ -z ${mfs_size} ] && echo "Can't determine MFS image size" && exit 1          [ -z ${mfs_size} ] && echo "Can't determine MFS image size" && exit 1
   
        echo "exec> ${CROSSTOOLDIR}/usr/bin/objdump -h $KERNEL_ROOTFS 2> /dev/null | grep \" oldmfs \""        echo "exec> /usr/bin/llvm-objdump -h $KERNEL_ROOTFS 2> /dev/null | grep \" oldmfs \""
        sec_info=`${CROSSTOOLDIR}/usr/bin/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 "`
         [ -z "${sec_info}" ] && echo "Can't locate mfs section within kernel" && exit 1          [ -z "${sec_info}" ] && echo "Can't locate mfs section within kernel" && exit 1
         echo "'-> Object dump { ${sec_info} }"          echo "'-> Object dump { ${sec_info} }"
   
         sec_size=`echo ${sec_info} | awk '{printf("%d", "0x" $3)}' 2> /dev/null`          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" $6)}' 2> /dev/null`
         sec_start=`echo ${sec_info} | awk '{printf("%d", "0x" $4)}' 2> /dev/null`
         echo "'-> Start offset from $sec_start and rootfs size $sec_size byte"          echo "'-> Start offset from $sec_start and rootfs size $sec_size byte"
         [ ${sec_size} -lt ${mfs_size} ] && echo "MFS image too large" && exit 1          [ ${sec_size} -lt ${mfs_size} ] && echo "MFS image too large" && exit 1
   
Line 444  install_image() Line 447  install_image()
         dd if=$REL/$ROOTFS_IMG ibs=8192 of=$NEWKERN obs=${sec_start} oseek=1 conv=notrunc \          dd if=$REL/$ROOTFS_IMG ibs=8192 of=$NEWKERN obs=${sec_start} oseek=1 conv=notrunc \
                 2>/dev/null && echo "'-> Completed MFS image embedded into kernel"                  2>/dev/null && echo "'-> Completed MFS image embedded into kernel"
   
#       START=`strings -td $KERNEL_ROOTFS | grep "MFS Filesystem" | cut -d ' ' -f 1 | head -1`###       START=`strings -td $KERNEL_ROOTFS | grep "MFS Filesystem" | cut -d ' ' -f 1 | head -1`
#       STOP=`strings -td $KERNEL_ROOTFS | grep "MFS Filesystem" | cut -d ' ' -f 1 | tail -1`###        STOP=`strings -td $KERNEL_ROOTFS | grep "MFS Filesystem" | cut -d ' ' -f 1 | tail -1`
#       STOP=$(($STOP + 1))###        STOP=$(($STOP + 1))
#       echo "'-> Start offset from $START to $STOP byte"###       echo "'-> Start offset from $START to $STOP byte"
   
#       head -c $START $KERNEL_ROOTFS >$NEWKERN###       head -c $START $KERNEL_ROOTFS >$NEWKERN
#       cat $REL/$ROOTFS_IMG >>$NEWKERN###        cat $REL/$ROOTFS_IMG >>$NEWKERN
#       tail -c +$STOP $KERNEL_ROOTFS >>$NEWKERN###       tail -c +$STOP $KERNEL_ROOTFS >>$NEWKERN
   
         echo "'-> Compress kernel"          echo "'-> Compress kernel"
         cd $REL          cd $REL
Removed from v.1.11.2.1  
changed lines
  Added in v.1.11.2.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>