Diff for /elwix/build_base.sh between versions 1.1.2.1 and 1.1.2.2

version 1.1.2.1, 2013/07/31 14:44:48 version 1.1.2.2, 2013/07/31 14:57:01
Line 30  if [ "${USER}" != "root" ]; then Line 30  if [ "${USER}" != "root" ]; then
         exit 1          exit 1
 fi  fi
   
clean_romfs()clean_basefs()
 {  {
         echo "+++ Clean ELWIX base firmware ..."          echo "+++ Clean ELWIX base firmware ..."
        chflags -Rf noschg $ROMFS        chflags -Rf noschg $BASEFS
        rm -rf $ROMFS        rm -rf $BASEFS
 
        echo "+++ Clean ELWIX base image ..." 
        rm -f $REL/$ROMFS_IMG 
 }  }
   
build_romfs()build_basefs()
 {  {
         echo "+++ Build ELWIX base directory ..."          echo "+++ Build ELWIX base directory ..."
        mkdir -p $ROMFS        mkdir -p $BASEFS
   
        cd $ROMFS        cd $BASEFS
   
         install -d bin;          install -d bin;
         install -d boot;          install -d boot;
Line 110  build_romfs() Line 107  build_romfs()
         cd -          cd -
 }  }
   
install_romfs()install_basefs()
 {  {
        LIBS="${ROMFS}/usr/lib"        LIBS="${BASEFS}/usr/lib"
        LIBEXEC="${ROMFS}/usr/libexec"        LIBEXEC="${BASEFS}/usr/libexec"
        LIBDATA="${ROMFS}/usr/libdata"        LIBDATA="${BASEFS}/usr/libdata"
        BIN="${ROMFS}/bin"        BIN="${BASEFS}/bin"
        UBIN="${ROMFS}/usr/bin"        UBIN="${BASEFS}/usr/bin"
        SBIN="${ROMFS}/sbin"        SBIN="${BASEFS}/sbin"
        USBIN="${ROMFS}/usr/sbin"        USBIN="${BASEFS}/usr/sbin"
        SHARE="${ROMFS}/usr/share"        SHARE="${BASEFS}/usr/share"
         SKEL="${SHARE}/skel"          SKEL="${SHARE}/skel"
         MISC="${SHARE}/misc"          MISC="${SHARE}/misc"
   
Line 146  install_romfs() Line 143  install_romfs()
         find ${WORLD}/usr/lib -type f -name \*.so.\* -exec install {} $LIBS \;          find ${WORLD}/usr/lib -type f -name \*.so.\* -exec install {} $LIBS \;
         find ${WORLD}/usr/lib/engines -type f -name \*.so -exec install {} $LIBS/engines \;          find ${WORLD}/usr/lib/engines -type f -name \*.so -exec install {} $LIBS/engines \;
   
        InstallList ${ELWIX_ROMFS} ${WORLD} ${ROMFS}        InstallList ${ELWIX_BASEFS} ${WORLD} ${BASEFS}
   
         ln ${BIN}/tcsh ${UBIN}/tcsh          ln ${BIN}/tcsh ${UBIN}/tcsh
   
Line 162  build_image2() Line 159  build_image2()
 {  {
         echo "+++ Build ELWIX Firmware secondary image ..."          echo "+++ Build ELWIX Firmware secondary image ..."
   
        cd ${ROMFS_USR2}        cd ${BASEFS_USR2}
        pax -w -z -v -f${REL}/${ROMFS_IMG2} .        pax -w -z -v -f${REL}/${BASEFS_IMG2} .
         cd -          cd -
   
 # Stop using uzip fs  # Stop using uzip fs
#       makefs -ominfree=0,bsize=8192,fsize=1024,optimization=space -s${ROMFS_SIZE2} \#       makefs -ominfree=0,bsize=8192,fsize=1024,optimization=space -s${BASEFS_SIZE2} \
#               ${REL}/${ROMFS_IMG2} ${ROMFS_USR2}#               ${REL}/${BASEFS_IMG2} ${BASEFS_USR2}
   
#       MDDEV=$(mdconfig -a -t vnode -f ${REL}/${ROMFS_IMG2});#       MDDEV=$(mdconfig -a -t vnode -f ${REL}/${BASEFS_IMG2});
 #       tunefs -L elwixFirmware2 /dev/$MDDEV;  #       tunefs -L elwixFirmware2 /dev/$MDDEV;
 #       mdconfig -d -u $MDDEV;  #       mdconfig -d -u $MDDEV;
   
#       mkuzip -s 8192 -o ${REL}/${ROMFS_IMG2}.uzip ${REL}/${ROMFS_IMG2};#       mkuzip -s 8192 -o ${REL}/${BASEFS_IMG2}.uzip ${REL}/${BASEFS_IMG2};
#       mv ${REL}/${ROMFS_IMG2}.uzip ${REL}/${ROMFS_IMG2}#       mv ${REL}/${BASEFS_IMG2}.uzip ${REL}/${BASEFS_IMG2}
 }  }
   
 install_romfs2()  install_romfs2()
 {  {
        LIBS="${ROMFS_USR2}/lib"        LIBS="${BASEFS_USR2}/lib"
        LIBEXEC="${ROMFS_USR2}/libexec"        LIBEXEC="${BASEFS_USR2}/libexec"
        LIBDATA="${ROMFS_USR2}/libdata"        LIBDATA="${BASEFS_USR2}/libdata"
        BIN="${ROMFS_USR2}/bin"        BIN="${BASEFS_USR2}/bin"
        SBIN="${ROMFS_USR2}/sbin"        SBIN="${BASEFS_USR2}/sbin"
   
         echo "+++ Install ELWIX base secondary software ..."          echo "+++ Install ELWIX base secondary software ..."
   
Line 208  install_romfs2() Line 205  install_romfs2()
 }  }
   
 ### main()  ### main()
clean_romfsclean_basefs
build_romfsbuild_basefs
   
install_romfsinstall_basefs
   
 #install_romfs2  #install_romfs2
 #build_image2  #build_image2

Removed from v.1.1.2.1  
changed lines
  Added in v.1.1.2.2


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