Magellan Linux

Diff of /branches/mage-next/src/smage2.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 199 by niro, Sun Aug 21 21:23:48 2005 UTC revision 204 by niro, Mon Aug 22 00:07:32 2005 UTC
# Line 4  Line 4 
4  # needs pkgbuild_dir (mage)  # needs pkgbuild_dir (mage)
5    
6  # SMAGE2  # SMAGE2
7  # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.30 2005-08-21 21:23:48 niro Exp $  # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.34 2005-08-22 00:07:32 niro Exp $
8    
9  #01.10.2004  #01.10.2004
10  # added ccache support  # added ccache support
# Line 426  fix_mage_deps() { Line 426  fix_mage_deps() {
426   do   do
427   cat="$(dirname ${dep})"   cat="$(dirname ${dep})"
428   # change if not virtual   # change if not virtual
429   if [[ ${cat} != virtual ]]   if [[ ${cat} = virtual ]]
430   then   then
431     pname="$(basename ${dep})"
432     else
433   # fix pver to target-pver   # fix pver to target-pver
434   # to get pname-target-pver   # to get pname-target-pver
435    
436   # doing it backwards !   # doing it backwards !
437   pver="${dep##*-}"   pver="${dep##*-}"
438   pname=$(basename ${dep/-${pver}/})   # full pver
439     pname="$(basename ${dep/-${pver}/})${target}-${pver}"
440   fi   fi
441    
442   # do not add empty lines   # do not add empty lines
443   if [ -z "${NDEPEND}" ]   if [ -z "${NDEPEND}" ]
444   then   then
445   NDEPEND="${sym} ${cat}/${pname}${target}-${pver}"   NDEPEND="${sym} ${cat}/${pname}"
446   else   else
447   NDEPEND="${NDEPEND}   NDEPEND="${NDEPEND}
448   ${sym} ${cat}/${pname}${target}-${pver}"   ${sym} ${cat}/${pname}"
449   fi   fi
450    
451   unset cat pname pver   unset cat pname pver
# Line 509  build_mage_script() Line 512  build_mage_script()
512   > ${dest}   > ${dest}
513    
514   # header   # header
515   echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.30 2005-08-21 21:23:48 niro Exp $' >> ${dest}   echo '# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/smage2.sh,v 1.34 2005-08-22 00:07:32 niro Exp $' >> ${dest}
516   echo  >> ${dest}   echo  >> ${dest}
517    
518   # pgkname and state   # pgkname and state
# Line 579  build_mage_script() Line 582  build_mage_script()
582   echo  >> ${dest}   echo  >> ${dest}
583   typeset -f postremove >> ${dest}   typeset -f postremove >> ${dest}
584   echo  >> ${dest}   echo  >> ${dest}
585    
586     # echo MAGE_TARGETS ## note -target is needed !
587     echo "MAGE_TARGETS=\"${targets}\"" >> ${dest}
588  }  }
589    
590  regen_mage_tree()  regen_mage_tree()
# Line 743  then Line 749  then
749   exit 0   exit 0
750  fi  fi
751    
752    # regen-mage-tree
753    if [ "$1" == "only-regen-tree" -a -n "$2" ]
754    then
755     # set correct SMAGENAME
756     SMAGENAME="$2"
757     MD5DIR="$(dirname ${SMAGENAME})/md5"
758     source ${SMAGENAME} || die "regen: smage2 not found"
759    
760     regen_mage_tree
761     exit 0
762    fi
763    
764  if [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ]  if [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ]
765  then  then
766   die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."   die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."

Legend:
Removed from v.199  
changed lines
  Added in v.204