Diff for /elwix/build_rootfs.sh between versions 1.9.2.2 and 1.10.2.3

version 1.9.2.2, 2016/11/21 17:25:33 version 1.10.2.3, 2017/12/27 21:13:00
Line 82  _EOF Line 82  _EOF
         echo "+++ Prepared RootFS config ... $CFGDIR/$ROOTFS_CONF"          echo "+++ Prepared RootFS config ... $CFGDIR/$ROOTFS_CONF"
   
         install -d ${BSDOBJ}/elwix          install -d ${BSDOBJ}/elwix
        env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix crunchgen -f \        env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix ${CEXEC} crunchgen -f \
                 -h $ROOTFS_MKDIR/$MKH -m $MKF \                  -h $ROOTFS_MKDIR/$MKH -m $MKF \
                 -c elwix.c -e elwix $ROOTFS_CONF                  -c elwix.c -e elwix $ROOTFS_CONF
         if [ $? -ne 0 ]; then          if [ $? -ne 0 ]; then
Line 95  build_elwix() Line 95  build_elwix()
 {  {
         echo "+++ Build ELWIX RootFS firmware ... $ROOTFS_MKDIR"          echo "+++ Build ELWIX RootFS firmware ... $ROOTFS_MKDIR"
         cd $ROOTFS_MKDIR          cd $ROOTFS_MKDIR
        env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix make -f $MKF \        ${CBUILD} -f $MKF \
                 TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \                  TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
                 ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} clean                  ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} clean
        env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix make -f $MKF \        ${CBUILD} -f $MKF \
                 TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \                  TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
                   ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} objs
           ${CBUILD} -f $MKF \
                   TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
                 ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF}                  ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF}
         if [ $? -ne 0 ]; then          if [ $? -ne 0 ]; then
                 exit 1                  exit 1
Line 115  build_rootdir() Line 118  build_rootdir()
         install -d bin;          install -d bin;
         install -d dev;          install -d dev;
         install -d elwix;          install -d elwix;
        install -d elwix/etc;        install -d etc;
         install -d libexec;          install -d libexec;
         install -d mnt;          install -d mnt;
         install -d -m 0555 proc;          install -d -m 0555 proc;
Line 131  build_rootdir() Line 134  build_rootdir()
   
         ln -fs /usr/lib lib;          ln -fs /usr/lib lib;
   
        ln -fs /elwix/etc etc;        ln -fs /elwix/boot boot;
         ln -fs /elwix/exports exports;          ln -fs /elwix/exports exports;
         ln -fs /elwix/home home;          ln -fs /elwix/home home;
         ln -fs /elwix/root root;          ln -fs /elwix/root root;
Line 146  install_rootfs() Line 149  install_rootfs()
         SBIN="${ROOTFS}/sbin"          SBIN="${ROOTFS}/sbin"
         UBIN="${ROOTFS}/usr/bin"          UBIN="${ROOTFS}/usr/bin"
         LIBEXEC="${ROOTFS}/usr/libexec"          LIBEXEC="${ROOTFS}/usr/libexec"
        ETC="${ROOTFS}/elwix/etc"        ETC="${ROOTFS}/etc"
   
         PRG="/sbin/elwix"          PRG="/sbin/elwix"
         LNPRG="${SBIN}/elwix"          LNPRG="${SBIN}/elwix"
Line 379  install_rootfs() Line 382  install_rootfs()
   
         echo "+++ ELWIX clean CVS tags ..."          echo "+++ ELWIX clean CVS tags ..."
         CleanCVS $ETC          CleanCVS $ETC
         CleanCVS $ETC/etc  
         echo          echo
 }  }
   
Line 393  build_image() Line 395  build_image()
 install_image()  install_image()
 {  {
         echo "+++ Install ELWIX RootFS Image into kernel ... $REL/$ROOTFS_IMG"          echo "+++ Install ELWIX RootFS Image into kernel ... $REL/$ROOTFS_IMG"
           echo "exec> stat -f '%z' $REL/$ROOTFS_IMG"
         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 \""
         sec_info=`${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 "`
         [ -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} }"

Removed from v.1.9.2.2  
changed lines
  Added in v.1.10.2.3


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