Diff for /elwix/build_rootfs.sh between versions 1.8.2.1 and 1.8.2.4

version 1.8.2.1, 2014/01/14 23:38:26 version 1.8.2.4, 2014/01/17 11:23:12
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}/elwix  
 _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
         cd -          cd -
 }  }
Line 87  build_elwix() Line 90  build_elwix()
 {  {
         echo "+++ Build ELWIX RootFS firmware ..."          echo "+++ Build ELWIX RootFS firmware ..."
         cd $ROOTFS_MKDIR          cd $ROOTFS_MKDIR
        . ${CENV}        env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix ${CBUILD} -f $MKF \
        env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix make -f $MKF \                TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
                MAKEOBJDIRPREFIX=${BSDOBJ}/elwix clean                ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} clean
        env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix make -f $MKF \        env MAKEOBJDIRPREFIX=${BSDOBJ}/elwix ${CBUILD} -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 396  if SnitVer ${WORLD}/elwix.ver; then Line 400  if SnitVer ${WORLD}/elwix.ver; then
         clean_elwix          clean_elwix
         prepare_elwix          prepare_elwix
         build_elwix          build_elwix
           exit 1
   
         build_rootdir          build_rootdir
         install_rootfs          install_rootfs

Removed from v.1.8.2.1  
changed lines
  Added in v.1.8.2.4


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