--- trunk/mage/usr/lib/mage/smage2.sh 2005/06/01 16:10:19 85 +++ trunk/mage/usr/lib/mage/smage2.sh 2005/08/09 14:17:15 183 @@ -4,14 +4,14 @@ # needs pkgbuild_dir (mage) # SMAGE2 -# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.11 2005-06-01 16:10:19 niro Exp $ +# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.20 2005-08-09 14:17:15 niro Exp $ #01.10.2004 # added ccache support # added distcc support ## setup ## -SMAGEVERSION=0.3.6-r16 +SMAGEVERSION=0.3.7-r1 PKGSUFFIX="mpk" SMAGENAME="$1" SMAGESUFFIX="smage2" @@ -20,6 +20,9 @@ #SMAGE2RSYNC="rsync://192.168.0.2/smage2-scripts" MLIBDIR=/usr/lib/mage +# export default C locale +export LC_ALL=C + source /etc/mage.rc showversion() { @@ -179,12 +182,13 @@ --progress bar \ --directory-prefix="${my_SOURCEDIR}" \ "${my_SRC_URI}" - if [ "$?" == "0" ] - then - break - else - continue - fi +# only needed to run through a list of mirrors +# if [ "$?" == "0" ] +# then +# break +# else +# continue +# fi fi fi @@ -353,6 +357,20 @@ find ${stripdir} | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null } +sminclude() { + local i + + if [[ -n "$@" ]] + then + for i in $@ + do + echo "--- Including ${SMAGESCRIPTSDIR}/include/${i}.sminc" + source ${SMAGESCRIPTSDIR}/include/${i}.sminc + done + echo + fi +} + setup_distcc_environment(){ if [ -x /usr/bin/distcc ] then @@ -488,7 +506,6 @@ #download sources if [ "$1" == "download" -a -n "$2" ] then - showversion if [ ! -d ${SMAGESCRIPTSDIR} ] then install -d ${SMAGESCRIPTSDIR}