Diff for /elwix/build_rootfs.sh between versions 1.8.2.2 and 1.8.2.5

version 1.8.2.2, 2014/01/17 00:48:28 version 1.8.2.5, 2014/06/26 01:02:42
Line 74  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} ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} 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 90  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 \
                 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
Line 399  install_image() Line 402  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

Removed from v.1.8.2.2  
changed lines
  Added in v.1.8.2.5


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