Re: [IPCop-cvs] ipcop make.sh,1.279,1.280

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Le jeudi 31 ao=FBt 2006 07:50, Gilles Espinasse a =E9crit=A0:
> Update of /cvsroot/ipcop/ipcop
> In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv23585
>
> Modified Files:
> =09make.sh
> Log Message:
> Move code of prefetch in a sub to be reused by a new option
> There is no change of code moved.
>
> Create a TOOLCHAINVERSION on top of script look cleaner.
>
>
>
>
> Index: make.sh
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D
> RCS file: /cvsroot/ipcop/ipcop/make.sh,v
> retrieving revision 1.279
> retrieving revision 1.280
> diff -C2 -d -r1.279 -r1.280
> *** make.sh=0929 Aug 2006 20:02:12 -0000=091.279
> --- make.sh=0931 Aug 2006 05:50:23 -0000=091.280
> ***************
> *** 39,43 ****
>   SNAME=3D"ipcop"=09=09=09=09=09# Short name
>   VERSION=3D1.5.0a1=09=09=09=09=09# Version number
> ! #PREVIOUSTAG=3DIPCOP_v1_4_4_FINAL
>   SLOGAN=3D"The Bad Packets Stop Here"=09=09# Software slogan
>   CONFIG_ROOT=3D/var/ipcop=09=09=09=09# Configuration rootdir
> --- 39,44 ----
>   SNAME=3D"ipcop"=09=09=09=09=09# Short name
>   VERSION=3D1.5.0a1=09=09=09=09=09# Version number
> ! #PREVIOUSTAG=3DIPCOP_v1_4_4_FINAL=09=09=09# CVS tag on previous r=
elease
> ! TOOLCHAINVERSION=3D"1.5.0a1.2"=09=09=09# Arbitrary name that need=
 to be updated
> if previous toolchain fail SLOGAN=3D"The Bad Packets Stop Here"=
=09=09# Software
> slogan
>   CONFIG_ROOT=3D/var/ipcop=09=09=09=09# Configuration rootdir
> ***************
> *** 682,687 ****
>   =09OPT_DIR=3D/opt
>
> ! =09# update subversion in case of new toolchain package upload
> ! =09TOOLCHAINNAME=3D$SNAME-$VERSION.2-toolchain-${MACHINE}_${USE_L=
IBC}
>   } # End of set_toolchain_variables()
>
> --- 683,688 ----
>   =09OPT_DIR=3D/opt
>
> ! =09# include machine and libc in TOOLCHAINNAME
> ! =09TOOLCHAINNAME=3D$SNAME-$TOOLCHAINVERSION-toolchain-${MACHINE}_=
${USE_LIBC}
>   } # End of set_toolchain_variables()
>
> ***************
> *** 1331,1334 ****
> --- 1332,1405 ----
>   } # End of buildpackages()
>
> + loadsrc()
> + {
> + =09LOGFILE=3D$BASEDIR/log_${MACHINE}_${USE_LIBC}/_build.preparati=
on.log
> +
> + =09mkdir -p $BASEDIR/log_${MACHINE}_${USE_LIBC}
> + =09mkdir -p $BASEDIR/cache
> + =09echo "Preload all source files" | tee -a $LOGFILE
> + =09FINISHED=3D0
> + =09cd $BASEDIR/lfs
> + =09for c in `seq $MAX_RETRIES`
> + =09do
> + =09=09if (( FINISHED=3D=3D1 )); then
> + =09=09=09break
> + =09=09fi
> +
> + =09=09FINISHED=3D1
> + =09=09cd $BASEDIR/lfs
> + =09=09for i in `grep -l "^HOST_ARCH" *`
> + =09=09do
> + =09=09=09HOST_ARCH=3D`grep ^HOST_ARCH $i | awk '{print $3}'`
> + =09=09=09if [ "$HOST_ARCH" =3D=3D "$MACHINE" -o "$HOST_ARCH" =
=3D=3D "all" ]; then
> + =09=09=09=09make -s -f $i LFS_BASEDIR=3D$BASEDIR MESSAGE=3D"$i\t =
($c/$MAX_RETRIES)"
> download >> $LOGFILE 2>&1 + =09=09=09=09if [ $? -ne 0 ]; then
> + =09=09=09=09=09echo -ne "${BOLD}Prefetch : wget error in $i${NORM=
AL}"
> + =09=09=09=09=09beautify message FAIL
> + =09=09=09=09=09echo "Prefetch : wget error in $i" >> $LOGFILE 2>&=
1
> + =09=09=09=09=09FINISHED=3D0
> + =09=09=09=09else
> + =09=09=09=09=09if [ $c -eq 1 ]; then
> + =09=09=09=09=09=09echo -ne "Prefetch : $i files "
> + =09=09=09=09=09=09beautify message DONE
> + =09=09=09=09=09fi
> + =09=09=09=09fi
> + =09=09=09else
> + =09=09=09=09echo -ne "Prefetch : $i"
> + =09=09=09=09beautify message SKIP
> + =09=09=09=09echo "Prefetch : skipping $i on $MACHINE" >> $LOGFILE=
 2>&1
> + =09=09=09fi
> + =09=09done
> + =09done
> +
> + =09echo -e "Prefetch : ${BOLD}verifying all md5sum${NORMAL}"
> + =09ERROR=3D0
> + =09for i in `grep -l "^HOST_ARCH" *`
> + =09do
> + =09=09HOST_ARCH=3D`grep ^HOST_ARCH $i | awk '{print $3}'`
> + =09=09if [ "$HOST_ARCH" =3D=3D "$MACHINE" -o "$HOST_ARCH" =3D=
=3D "all" ]; then
> + =09=09=09make -s -f $i LFS_BASEDIR=3D$BASEDIR MESSAGE=3D"$i\t " m=
d5 >> $LOGFILE
> 2>&1 + =09=09=09if [ $? -ne 0 ]; then
> + =09=09=09=09echo -ne "Calculating md5sum for $i"
> + =09=09=09=09beautify message FAIL
> + =09=09=09=09ERROR=3D1
> + =09=09=09fi
> + =09=09else
> + =09=09=09echo -ne "Calculating md5sum for $i"
> + =09=09=09beautify message SKIP
> + =09=09=09echo "Calculating md5sum for $i skipped" >> $LOGFILE 2>&=
1
> + =09=09fi
> + =09done
> +
> + =09if [ $ERROR -eq 0 ]; then
> + =09=09echo -ne "MD5SUM Calculation"
> + =09=09beautify message DONE
> + =09else
> + =09=09echo -ne "${BOLD}MD5SUM Calculation${NORMAL}"
> + =09=09beautify message FAIL
> + =09fi
> + =09cd -
> + } End of loadsrc
> +
>   # First, check we have configuration data and read them or evalua=
te them
>   if [ "$1" =3D=3D "configure" ]; then
> ***************
> *** 1573,1642 ****
>   =09;;
>   prefetch)
> ! =09LOGFILE=3D$BASEDIR/log_${MACHINE}_${USE_LIBC}/_build.preparati=
on.log
> !
> ! =09mkdir -p $BASEDIR/log_${MACHINE}_${USE_LIBC}
> ! =09mkdir -p $BASEDIR/cache
> ! =09echo "Preload all source files" | tee -a $LOGFILE
> ! =09FINISHED=3D0
> ! =09cd $BASEDIR/lfs
> ! =09for c in `seq $MAX_RETRIES`
> ! =09do
> ! =09=09if (( FINISHED=3D=3D1 )); then
> ! =09=09=09break
> ! =09=09fi
> !
> ! =09=09FINISHED=3D1
> ! =09=09cd $BASEDIR/lfs
> ! =09=09for i in `grep -l "^HOST_ARCH" *`
> ! =09=09do
> ! =09=09=09HOST_ARCH=3D`grep ^HOST_ARCH $i | awk '{print $3}'`
> ! =09=09=09if [ "$HOST_ARCH" =3D=3D "$MACHINE" -o "$HOST_ARCH" =
=3D=3D "all" ]; then
> ! =09=09=09=09make -s -f $i LFS_BASEDIR=3D$BASEDIR MESSAGE=3D"$i\t =
($c/$MAX_RETRIES)"
> download >> $LOGFILE 2>&1 ! =09=09=09=09if [ $? -ne 0 ]; then
> ! =09=09=09=09=09echo -ne "${BOLD}Prefetch : wget error in $i${NORM=
AL}"
> ! =09=09=09=09=09beautify message FAIL
> ! =09=09=09=09=09echo "Prefetch : wget error in $i" >> $LOGFILE 2>&=
1
> ! =09=09=09=09=09FINISHED=3D0
> ! =09=09=09=09else
> ! =09=09=09=09=09if [ $c -eq 1 ]; then
> ! =09=09=09=09=09=09echo -ne "Prefetch : $i files "
> ! =09=09=09=09=09=09beautify message DONE
> ! =09=09=09=09=09fi
> ! =09=09=09=09fi
> ! =09=09=09else
> ! =09=09=09=09echo -ne "Prefetch : $i"
> ! =09=09=09=09beautify message SKIP
> ! =09=09=09=09echo "Prefetch : skipping $i on $MACHINE" >> $LOGFILE=
 2>&1
> ! =09=09=09fi
> ! =09=09done
> ! =09done
> !
> ! =09echo -e "Prefetch : ${BOLD}verifying all md5sum${NORMAL}"
> ! =09ERROR=3D0
> ! =09for i in `grep -l "^HOST_ARCH" *`
> ! =09do
> ! =09=09HOST_ARCH=3D`grep ^HOST_ARCH $i | awk '{print $3}'`
> ! =09=09if [ "$HOST_ARCH" =3D=3D "$MACHINE" -o "$HOST_ARCH" =3D=
=3D "all" ]; then
> ! =09=09=09make -s -f $i LFS_BASEDIR=3D$BASEDIR MESSAGE=3D"$i\t " m=
d5 >> $LOGFILE
> 2>&1 ! =09=09=09if [ $? -ne 0 ]; then
> ! =09=09=09=09echo -ne "Calculating md5sum for $i"
> ! =09=09=09=09beautify message FAIL
> ! =09=09=09=09ERROR=3D1
> ! =09=09=09fi
> ! =09=09else
> ! =09=09=09echo -ne "Calculating md5sum for $i"
> ! =09=09=09beautify message SKIP
> ! =09=09=09echo "Calculating md5sum for $i skipped" >> $LOGFILE 2>&=
1
> ! =09=09fi
> ! =09done
> !
> ! =09if [ $ERROR -eq 0 ]; then
> ! =09=09echo -ne "MD5SUM Calculation"
> ! =09=09beautify message DONE
> ! =09else
> ! =09=09echo -ne "${BOLD}MD5SUM Calculation${NORMAL}"
> ! =09=09beautify message FAIL
> ! =09fi
> ! =09cd -
>   =09;;
>   toolchain)
> --- 1644,1648 ----
>   =09;;
>   prefetch)
> ! =09loadsrc
>   =09;;
>   toolchain)
>
>
> -------------------------------------------------------------------=
------
> Using Tomcat but need to do more? Need to support web services, sec=
urity?
> Get stuff done quickly with pre-integrated technology to make your =
job
> easier Download IBM WebSphere Application Server v.1.0.1 based on A=
pache
> Geronimo
> http://sel.as-us.falkag.net/sel?cmd=3Dlnk&kid=3D120709&bid=3D263057=
&dat=3D121642
> _______________________________________________
> IPCop-cvs mailing list
> IPC...@li...
> https://lists.sourceforge.net/lists/listinfo/ipcop-cvs

Re: [IPCop-cvs] ipcop make.sh,1.279,1.280

Linux firewall distribution geared towards home and SOHO users.

Re: [IPCop-cvs] ipcop make.sh,1.279,1.280