Diff for /elwix/build_rootfs.sh between versions 1.8 and 1.9

version 1.8, 2014/01/05 23:14:22 version 1.9, 2014/09/15 19:06:42
Line 35  NEWKERN="${REL}/${KRNNAME}" Line 35  NEWKERN="${REL}/${KRNNAME}"
 MKF="Makefile.elwix"  MKF="Makefile.elwix"
 MKH="Makefile.inc"  MKH="Makefile.inc"
   
   # Set TARGET_CPUTYPE only for world compiling. Don't use this in kernel build!
   X_TARGET_CPUTYPE="TARGET_CPUTYPE=${TARGET_CPUTYPE}"
   
 clean_elwix()  clean_elwix()
 {  {
         echo "+++ Clean elwix binary from ELWIX World ..."          echo "+++ Clean elwix binary from ELWIX World ..."
Line 71  srcdirs ${BSDSRC}/bin ${BSDSRC}/sbin ${BSDSRC}/libexec Line 74  srcdirs ${BSDSRC}/bin ${BSDSRC}/sbin ${BSDSRC}/libexec
 srcdirs ${BSDSRC}/usr.bin ${BSDSRC}/usr.sbin ${BSDSRC}/usr.sbin/wpa  srcdirs ${BSDSRC}/usr.bin ${BSDSRC}/usr.sbin ${BSDSRC}/usr.sbin/wpa
 srcdirs ${BSDSRC}/secure/usr.bin ${BSDSRC}/secure/usr.sbin ${BSDSRC}/secure/libexec  srcdirs ${BSDSRC}/secure/usr.bin ${BSDSRC}/secure/usr.sbin ${BSDSRC}/secure/libexec
   
   buildopts TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF}
 buildopts -DNO_PAM -DNO_KERBEROS WITHOUT_PAM_SUPPORT=yes WITHOUT_KERBEROS_SUPPORT=yes WITHOUT_KERBEROS=yes  buildopts -DNO_PAM -DNO_KERBEROS WITHOUT_PAM_SUPPORT=yes WITHOUT_KERBEROS_SUPPORT=yes WITHOUT_KERBEROS=yes
buildopts TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} MAKEOBJDIRPREFIX=${BSDOBJ}/elwixbuildopts -DMK_CASPER=no WITHOUT_CASPER=yes
 _EOF  _EOF
         cat $CFGDIR/$ROOTFS_CONF >>$ROOTFS_CONF          cat $CFGDIR/$ROOTFS_CONF >>$ROOTFS_CONF
   
         . ${CENV}  
         install -d ${BSDOBJ}/elwix          install -d ${BSDOBJ}/elwix
        crunchgen -f -o -p ${BSDOBJ}/elwix -h $ROOTFS_MKDIR/$MKH -m $MKF \        env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix crunchgen -f \
                 -h $ROOTFS_MKDIR/$MKH -m $MKF \
                 -c elwix.c -e elwix $ROOTFS_CONF                  -c elwix.c -e elwix $ROOTFS_CONF
           if [ $? -ne 0 ]; then
                   exit 1
           fi
         cd -          cd -
 }  }
   
Line 87  build_elwix() Line 94  build_elwix()
 {  {
         echo "+++ Build ELWIX RootFS firmware ..."          echo "+++ Build ELWIX RootFS firmware ..."
         cd $ROOTFS_MKDIR          cd $ROOTFS_MKDIR
         . ${CENV}  
         env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix make -f $MKF \          env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix make -f $MKF \
                MAKEOBJDIRPREFIX=${BSDOBJ}/elwix clean                TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
                 ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} clean
         env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix make -f $MKF \          env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix make -f $MKF \
                MAKEOBJDIRPREFIX=${BSDOBJ}/elwix                TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
                 ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF}
         if [ $? -ne 0 ]; then          if [ $? -ne 0 ]; then
                 exit 1                  exit 1
         fi          fi
Line 158  install_rootfs() Line 166  install_rootfs()
         ln -s $PRG $BIN/chio          ln -s $PRG $BIN/chio
         ln -s $PRG $BIN/chmod          ln -s $PRG $BIN/chmod
         ln -s $PRG $BIN/cp          ln -s $PRG $BIN/cp
           ln -s $PRG $BIN/csh
           ln -s $PRG $BIN/-csh
           ln -s $PRG $BIN/tcsh
           ln -s $PRG $BIN/-tcsh
         ln -s $PRG $BIN/date          ln -s $PRG $BIN/date
         ln -s $PRG $BIN/dd          ln -s $PRG $BIN/dd
         ln -s $PRG $BIN/df          ln -s $PRG $BIN/df
Line 367  install_rootfs() Line 379  install_rootfs()
         echo "+++ ELWIX clean CVS tags ..."          echo "+++ ELWIX clean CVS tags ..."
         CleanCVS $ETC          CleanCVS $ETC
         CleanCVS $ETC/etc          CleanCVS $ETC/etc
           echo
 }  }
   
 build_image()  build_image()
Line 394  install_image() Line 407  install_image()
 ### main()  ### main()
 if SnitVer ${WORLD}/elwix.ver; then  if SnitVer ${WORLD}/elwix.ver; then
         clean_elwix          clean_elwix
        prepare_elwix        prepare_elwix || exit 1
        build_elwix        build_elwix || exit 1
   
        build_rootdir        build_rootdir || exit 1
        install_rootfs        install_rootfs || exit 1
   
        build_image        build_image || exit 1
        install_image        install_image || exit 1
 else  else
        echo "Skipped ELWIX RootFS build ..."        echo "$? Skipped ELWIX RootFS build ..."
 fi  fi
   
 echo "+++ Complete build ELWIX RootFS"  echo "+++ Complete build ELWIX RootFS"

Removed from v.1.8  
changed lines
  Added in v.1.9


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