Magellan Linux

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

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

revision 2613 by niro, Tue Mar 4 15:26:05 2014 UTC revision 2870 by niro, Fri Mar 20 08:34:04 2015 UTC
# Line 180  download_sources() Line 180  download_sources()
180  }  }
181    
182  # dummy function, used if that does not exist in smage file  # dummy function, used if that does not exist in smage file
183    pkg_setup()
184    {
185     echo "no pkg_setup defined; doing nothing ..."
186     return 0
187    }
188    
189    # dummy function, used if that does not exist in smage file
190  src_prepare()  src_prepare()
191  {  {
192   echo "no src_prepare defined; doing nothing ..."   echo "no src_prepare defined; doing nothing ..."
# Line 588  marchdepend() Line 595  marchdepend()
595    
596   if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]   if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
597   then   then
598   echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"   # evaluate with escape strings for the magefile if called by smage
599     # but do not escape if the smagefile was called by depwalker directly
600     if [[ ${SMAGE_DEPEND} = 1 ]]
601     then
602     eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
603     else
604     echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
605     fi
606   retval=0   retval=0
607   else   else
608   retval=1   retval=1
# Line 606  marchsdepend() Line 620  marchsdepend()
620    
621   if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]   if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
622   then   then
623   echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"   # evaluate with escape strings for the magefile if called by smage
624     # but do not escape if the smagefile was called by depwalker directly
625     if [[ ${SMAGE_DEPEND} = 1 ]]
626     then
627     eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
628     else
629     echo "\$(eval echo \\\$${var}_\${ARCH/i*86/x86} | tr ';' '\n')"
630     fi
631   retval=0   retval=0
632   else   else
633   retval=1   retval=1
# Line 1126  generate_package_md5sum() Line 1147  generate_package_md5sum()
1147    
1148  source_pkg_build()  source_pkg_build()
1149  {  {
  if [[ ${PKGTYPE} = virtual ]]  
  then  
  echo "Virtual package detected; src-pkg-tarball not necessary ..."  
  return 0  
  fi  
   
1150   if [[ ! -d ${SOURCEDIR}/${PNAME} ]]   if [[ ! -d ${SOURCEDIR}/${PNAME} ]]
1151   then   then
1152   echo "No SRC_URI defined; src-pkg-tarball not necessary ..."   install -d ${SOURCEDIR}/${PNAME}
  return 0  
1153   fi   fi
1154    
1155   [ -z "${SRCPKGDIR}" ] && die "\$SRCPKGDIR not found. Please setup your ${MAGERC} correctly."   [ -z "${SRCPKGDIR}" ] && die "\$SRCPKGDIR not found. Please setup your ${MAGERC} correctly."

Legend:
Removed from v.2613  
changed lines
  Added in v.2870