Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mage/usr/lib/mage/smage2.functions.sh

    Diff of /trunk/mage/usr/lib/mage/smage2.functions.sh

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

    revision 1680 by niro, Mon Feb 6 10:07:01 2012 UTC revision 3180 by niro, Mon Jul 31 09:19:58 2023 UTC
    # Line 7  Line 7 
    7  smagesource()  smagesource()
    8  {  {
    9   local file="$1"   local file="$1"
    10   local mystate   local localstate
    11     local distfilestate
    12   local mytag   local mytag
    13    
    14   source ${file}   source ${file}
    # Line 29  smagesource() Line 30  smagesource()
    30   fi   fi
    31   fi   fi
    32    
    33   [[ -n ${STATE} ]] && mystate="${STATE}"   [[ -n ${STATE} ]] && localstate="${STATE}"
    34   [[ -n ${DISTROTAG} ]] && mytag="${DISTROTAG}"   [[ -n ${DISTROTAG} ]] && mytag="${DISTROTAG}"
    35    
      # do not overide if local state was broken or disabled!  
      case ${STATE} in  
      broken) return ;;  
      disabled) return ;;  
      esac  
       
    36   if [ -f ${SMAGESCRIPTSDIR}/distribution ]   if [ -f ${SMAGESCRIPTSDIR}/distribution ]
    37   then   then
    38   source ${SMAGESCRIPTSDIR}/distribution   source ${SMAGESCRIPTSDIR}/distribution
    39   [[ -n ${STATE} ]] && mystate="${STATE}"   [[ -n ${STATE} ]] && distfilestate="${STATE}"
    40   [[ -n ${DISTROTAG} ]] && mytag="${DISTROTAG}"   [[ -n ${DISTROTAG} ]] && mytag="${DISTROTAG}"
    41   fi   fi
    42   # now switch state and export it   # now switch state and export it but do not overide any local states
    43   STATE="${mystate}"   if [[ ! -z ${localstate} ]]
    44     then
    45     STATE="${localstate}"
    46     else
    47     STATE="${distfilestate}"
    48     fi
    49    
    50   if mqueryfeature "pkgdistrotag"   if mqueryfeature "pkgdistrotag"
    51   then   then
    # Line 59  smagesource() Line 59  smagesource()
    59   echo -e "${COLRED}Requested 'pkgdistrotag' but no \$DISTROTAG found!${COLDEFAULT}"   echo -e "${COLRED}Requested 'pkgdistrotag' but no \$DISTROTAG found!${COLDEFAULT}"
    60   echo -e "${COLRED}Disabled the feature for pkgbuild sanity!${COLDEFAULT}"   echo -e "${COLRED}Disabled the feature for pkgbuild sanity!${COLDEFAULT}"
    61   else   else
    62   # now switch state and export it   # now switch state and export it but do not overide any local states
    63   export DISTROTAG="${mytag}"   export DISTROTAG="${mytag}"
    64   fi   fi
    65   else   else
    # Line 225  download_sources() Line 225  download_sources()
    225  }  }
    226    
    227  # dummy function, used if that does not exist in smage file  # dummy function, used if that does not exist in smage file
    228    pkg_setup()
    229    {
    230     echo "no pkg_setup defined; doing nothing ..."
    231     return 0
    232    }
    233    
    234    # dummy function, used if that does not exist in smage file
    235  src_prepare()  src_prepare()
    236  {  {
    237   echo "no src_prepare defined; doing nothing ..."   echo "no src_prepare defined; doing nothing ..."
    # Line 254  src_install() Line 261  src_install()
    261    
    262  mlibdir()  mlibdir()
    263  {  {
    264   local libdir=lib   local libdir="${ABI_DEFAULT_LIBDIR}"
    265   [[ ${ARCH} = x86_64 ]] && libdir=lib64   [[ ${ARCH} = i686 ]] && libdir="${ABI_X86_LIBDIR}"
    266     [[ ${ARCH} = x86_64 ]] && libdir="${ABI_X86_64_LIBDIR}"
    267     [[ -n ${ABI_LIBDIR} ]] && libdir="${ABI_LIBDIR}"
    268    
    269   echo "${libdir}"   echo "${libdir}"
    270  }  }
    # Line 318  minstall() Line 327  minstall()
    327   sysconfdir=${BINDIR}/etc \   sysconfdir=${BINDIR}/etc \
    328   libdir=${BINDIR}/usr/$(mlibdir) \   libdir=${BINDIR}/usr/$(mlibdir) \
    329   "$@" install || die "minstall failed"   "$@" install || die "minstall failed"
    330          else   else
    331                  die "no Makefile found"   die "no Makefile found"
    332          fi   fi
    333  }  }
    334    
    335  mmake()  mmake()
    # Line 343  munpack() Line 352  munpack()
    352   DEST=$2   DEST=$2
    353   fi   fi
    354    
    355     echo -e "${COLBLUE}>>>${COLGREEN} Unpacking ${SOURCEDIR}/${PNAME}/${SRCFILE}${COLDEFAULT}"
    356    
    357   [[ ! -d ${DEST} ]] && install -d ${DEST}   [[ ! -d ${DEST} ]] && install -d ${DEST}
    358    
    359   case "${SRCFILE##*.}" in   case "${SRCFILE##*.}" in
    # Line 382  munpack() Line 393  munpack()
    393   popd > /dev/null   popd > /dev/null
    394   fi   fi
    395   ;;   ;;
    396     lz)
    397     IFTAR="$(basename $SRCFILE .lz)"
    398     IFTAR="${IFTAR##*.}"
    399     if [[ ${IFTAR} = tar ]]
    400     then
    401     tar --no-same-owner -xvf --lzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tar.lz unpack failed."
    402     else
    403     pushd ${DEST} > /dev/null
    404     lzip -dc ${SOURCEDIR}/${PNAME}/${SRCFILE} > ${DEST}/$(basename ${SRCFILE} .xz) || die ".lz unpack failed."
    405     popd > /dev/null
    406     fi
    407     ;;
    408   tbz2|mpks|mpk)   tbz2|mpks|mpk)
    409   tar --no-same-owner -xvjf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tbz2 unpack failed."   tar --no-same-owner -xvjf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".tbz2 unpack failed."
    410   ;;   ;;
    # Line 392  munpack() Line 415  munpack()
    415   tar --no-same-owner -xvJf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".txz unpack failed."   tar --no-same-owner -xvJf ${SOURCEDIR}/${PNAME}/${SRCFILE} -C ${DEST} || die ".txz unpack failed."
    416   ;;   ;;
    417   rar)   rar)
    418   unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST}  || die ".rar unpack failed."   unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST} || die ".rar unpack failed."
    419   ;;   ;;
    420   zip|xpi|jar)   zip|xpi|jar)
    421   unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed."   unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed."
    # Line 489  mstriplibs() Line 512  mstriplibs()
    512    
    513   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"
    514   [[ -z ${STRIP_DYN_LIB} ]] && STRIP_DYN_LIB="--strip-debug"   [[ -z ${STRIP_DYN_LIB} ]] && STRIP_DYN_LIB="--strip-debug"
    515   find ${stripdir} ! -type d | xargs --no-run-if-empty file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip ${STRIP_DYN_LIB} 2> /dev/null   find ${stripdir} ! -type d | xargs --no-run-if-empty file | grep "[shared object|pie executable]" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip ${STRIP_DYN_LIB} 2> /dev/null
    516  }  }
    517    
    518  mstripbins()  mstripbins()
    # Line 498  mstripbins() Line 521  mstripbins()
    521    
    522   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"
    523   [[ -z ${STRIP_DYN_BIN} ]] && STRIP_DYN_BIN="--strip-debug"   [[ -z ${STRIP_DYN_BIN} ]] && STRIP_DYN_BIN="--strip-debug"
    524   find ${stripdir} ! -type d | xargs --no-run-if-empty file | grep "executable" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip ${STRIP_DYN_BIN} 2> /dev/null   find ${stripdir} ! -type d | xargs --no-run-if-empty file | grep -v "pie executable" | grep "executable" | grep ELF | cut -f 1 -d : | xargs --no-run-if-empty strip ${STRIP_DYN_BIN} 2> /dev/null
    525  }  }
    526    
    527  mstripstatic()  mstripstatic()
    # Line 564  sminclude() Line 587  sminclude()
    587   then   then
    588   for i in $@   for i in $@
    589   do   do
    590   echo "--- Including ${SMAGESCRIPTSDIR}/include/${i}.sminc"   [[ ${SILENT} = 1 ]] || echo "--- Including ${SMAGESCRIPTSDIR}/include/${i}.sminc"
    591   source ${SMAGESCRIPTSDIR}/include/${i}.sminc   source ${SMAGESCRIPTSDIR}/include/${i}.sminc
    592   done   done
    593   echo   [[ ${SILENT} = 1 ]] || echo
    594     fi
    595    }
    596    
    597    march()
    598    {
    599     local retval
    600    
    601     if [[ ! -z ${ARCH} ]]
    602     then
    603     echo "${ARCH}"
    604     retval=0
    605     else
    606     retval=1
    607     fi
    608    
    609     return "${retval}"
    610    }
    611    
    612    marchvariable()
    613    {
    614     local retval
    615     local var="$1"
    616    
    617     [[ -n ${var} ]] || die "marchvariable(): missing variable"
    618    
    619     if [[ ! -z $(eval echo \$${var}_${ARCH/i*86/x86}) ]]
    620     then
    621     eval echo \$${var}_${ARCH/i*86/x86} | tr ';' '\n'
    622     retval=0
    623     else
    624     retval=1
    625     fi
    626    
    627     return "${retval}"
    628    }
    629    
    630    marchsrcfile()
    631    {
    632     local retval
    633     local var="$1"
    634    
    635     [[ -z ${var} ]] && var="SRCFILE"
    636    
    637     marchvariable "${var}" || die
    638    }
    639    
    640    marchsrcdir()
    641    {
    642     local retval
    643     local var="$1"
    644    
    645     [[ -z ${var} ]] && var="SRCDIR"
    646    
    647     marchvariable "${var}" || die
    648    }
    649    
    650    marchdepend()
    651    {
    652     local retval
    653     local var="$1"
    654    
    655     [[ -z ${var} ]] && var="DEPEND"
    656    
    657     if [[ ! -z $(eval echo \"\$${var}_${ARCH/i*86/x86}\") ]]
    658     then
    659     # evaluate with escape strings for the magefile if called by smage
    660     # but do not escape if the smagefile was called by depwalker directly
    661     if [[ ${SMAGE_DEPEND} = 1 ]]
    662     then
    663     eval echo \"\$${var}_${ARCH/i*86/x86}\" | tr ';' '\n'
    664     else
    665     echo "\$(eval echo \\\"\\\$${var}_\${ARCH/i*86/x86}\\\" | tr ';' '\n')"
    666     fi
    667     retval=0
    668     else
    669     retval=1
    670   fi   fi
    671    
    672     return "${retval}"
    673    }
    674    
    675    marchsdepend()
    676    {
    677     local retval
    678     local var="$1"
    679    
    680     [[ -z ${var} ]] && var="SDEPEND"
    681    
    682     if [[ ! -z $(eval echo \"\$${var}_${ARCH/i*86/x86}\") ]]
    683     then
    684     # evaluate with escape strings for the magefile if called by smage
    685     # but do not escape if the smagefile was called by depwalker directly
    686     if [[ ${SMAGE_DEPEND} = 1 ]]
    687     then
    688     eval echo \"\$${var}_${ARCH/i*86/x86}\" | tr ';' '\n'
    689     else
    690     echo "\$(eval echo \\\"\\\$${var}_\${ARCH/i*86/x86}\\\" | tr ';' '\n')"
    691     fi
    692     retval=0
    693     else
    694     retval=1
    695     fi
    696    
    697     return "${retval}"
    698  }  }
    699    
    700  setup_distcc_environment()  setup_distcc_environment()
    # Line 586  setup_distcc_environment() Line 712  setup_distcc_environment()
    712   fi   fi
    713  }  }
    714    
    715  setup_ccache_environment()  setup_icecc_environment()
    716  {  {
    717   if [ -x /usr/bin/ccache ]   if [ -x /usr/bin/icecc ]
    718   then   then
    719   echo -e "${COLBLUE}---${COLGREEN} Using CCache for compilation ...${COLDEFAULT}"   echo -e "${COLBLUE}---${COLGREEN} Using IceCC for compilation ...${COLDEFAULT}"
    720   export PATH=/usr/$(mlibdir)/ccache/bin:${PATH} || die "ccache: could not export new $PATH"   export PATH=/usr/$(mlibdir)/icecc/bin:${PATH} || die "icecc: could not export new $PATH"
    721   fi   fi
    722  }  }
    723    
    724  # fixes given dependencies to match a MAGE_TARGET  setup_ccache_environment()
    725  # fix_mage_deps -target s/depend # <-- note -target !  {
    726  fix_mage_deps()   if [ -x /usr/bin/ccache ]
     {  
      local target="$1"  
      local depend="$2"  
      local NDEPEND  
      local sym dep cat pver pname  
       
      # deps and provides are special  
      # they must be fixed to match the target  
       
      # run this only if target and depend is not empty  
      if [ -n "${target}" ] && [ -n "${depend}" ]  
    727   then   then
    728   # fix DEPEND   mqueryfeature "icecc" && export CCACHE_PREFIX=icecc
      while read sym dep  
      do  
      # ignore empty lines  
      [[ -z ${dep} ]] && continue  
       
      cat="$(dirname ${dep})"  
      # change if not virtual  
      if [[ ${cat} = virtual ]]  
      then  
      pname="$(basename ${dep})"  
      else  
      # fix pver to target-pver  
      # to get pname-target-pver  
    729    
    730   # doing it backwards !   echo -e "${COLBLUE}---${COLGREEN} Using CCache for compilation ...${COLDEFAULT}"
    731   pver="${dep##*-}"   export PATH=/usr/$(mlibdir)/ccache/bin:${PATH} || die "ccache: could not export new $PATH"
      # full pver  
      pname="$(basename ${dep/-${pver}/})${target}-${pver}"  
      fi  
       
      # do not add empty lines  
      if [ -z "${NDEPEND}" ]  
      then  
      NDEPEND="${sym} ${cat}/${pname}"  
      else  
      NDEPEND="${NDEPEND}  
      ${sym} ${cat}/${pname}"  
      fi  
       
      unset cat pname pver  
      done << EOF  
     ${depend}  
     EOF  
      # set NDEPEND to DEPEND  
      depend="${NDEPEND}"  
    732   fi   fi
       
      echo "${depend}"  
    733  }  }
    734    
    735  # build_mage_script(): helper functions for regen_mage_tree()  # build_mage_script(): helper functions for regen_mage_tree()
    # Line 684  build_mage_script() Line 765  build_mage_script()
    765  {  {
    766   local magefile   local magefile
    767   local dest   local dest
      local target  
    768   local split_pkg_base   local split_pkg_base
    769   local sym   local sym
    770   local depname   local depname
    # Line 692  build_mage_script() Line 772  build_mage_script()
    772   # if MAGE_TREE_DEST not set use BUILDDIR   # if MAGE_TREE_DEST not set use BUILDDIR
    773   : ${MAGE_TREE_DEST=${BUILDDIR}/mage-tree}   : ${MAGE_TREE_DEST=${BUILDDIR}/mage-tree}
    774    
      # determinate which suffix this mage file should get, if any  
      [[ $1 = --target ]] && shift && target="-$1"  
       
    775   # mark package as splitpackage   # mark package as splitpackage
    776   [[ $1 = --split-pkg-base ]] && shift && split_pkg_base="$1"   [[ $1 = --split-pkg-base ]] && shift && split_pkg_base="$1"
    777    
    778   # name of magefile   # name of magefile
    779   magefile="${PNAME}${target}-${PVER}-${PBUILD}.mage"   magefile="${PNAME}-${PVER}-${PBUILD}.mage"
    780    
    781   # destination to magefile   # destination to magefile
    782   dest="${MAGE_TREE_DEST}/${PCAT}/${PNAME}${target}/${magefile}"   dest="${MAGE_TREE_DEST}/${PCAT}/${PNAME}/${magefile}"
    783    
    784   # show what we are doing   # show what we are doing
    785   echo -e "${COLBLUE}===${COLGREEN} generating mage file:${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} generating mage file:${COLDEFAULT}"
    # Line 713  build_mage_script() Line 790  build_mage_script()
    790   > ${dest}   > ${dest}
    791    
    792   # pgkname and state   # pgkname and state
    793   echo "PKGNAME=\"${PNAME}${target}-${PVER}-\${ARCH}$(print_distrotag)-${PBUILD}\"" >> ${dest}   echo "PKGNAME=\"${PNAME}-${PVER}-\${ARCH}$(print_distrotag)-${PBUILD}\"" >> ${dest}
    794   echo "STATE=\"${STATE}\"" >> ${dest}   echo "STATE=\"${STATE}\"" >> ${dest}
    795    
    796   # description and homepage   # description and homepage
    # Line 726  build_mage_script() Line 803  build_mage_script()
    803   # special tags and vars   # special tags and vars
    804   echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}   echo "PKGTYPE=\"${PKGTYPE}\""  >> ${dest}
    805    
      # echo MAGE_TARGETS ## note -target is needed !  
      echo "MAGE_TARGETS=\"${target}\"" >> ${dest}  
       
    806   # split package base   # split package base
    807   echo "SPLIT_PACKAGE_BASE=\"${split_pkg_base}\"" >> ${dest}   echo "SPLIT_PACKAGE_BASE=\"${split_pkg_base}\"" >> ${dest}
    808    
    # Line 739  build_mage_script() Line 813  build_mage_script()
    813   for i in ${SPECIAL_VARS}   for i in ${SPECIAL_VARS}
    814   do   do
    815   # being tricky here :)   # being tricky here :)
    816   echo "${i}=\"$(eval echo \$${i})\"" >> ${dest}   echo "${i}=\"$(eval echo \"\$${i}\")\"" >> ${dest}
    817   done   done
    818   fi   fi
    819    
    # Line 757  build_mage_script() Line 831  build_mage_script()
    831   fi   fi
    832    
    833   # deps and provides   # deps and provides
    834   echo "DEPEND=\"$(fix_mage_deps "${target}" "${DEPEND}")\"" >> ${dest}   echo "DEPEND=\"${DEPEND}\"" >> ${dest}
    835   echo "SDEPEND=\"$(fix_mage_deps "${target}" "${SDEPEND}")\"" >> ${dest}   echo "SDEPEND=\"${SDEPEND}\"" >> ${dest}
    836   echo "PROVIDE=\"${PROVIDE}\"" >> ${dest}   echo "PROVIDE=\"${PROVIDE}\"" >> ${dest}
    837    
    838   # add special functions   # add special functions
    # Line 769  build_mage_script() Line 843  build_mage_script()
    843   do   do
    844   # add to mage (quotes needed !)   # add to mage (quotes needed !)
    845   typeset -f "${i}" >> ${dest}   typeset -f "${i}" >> ${dest}
      # unset to be safe (quotes needed !)  
      #unset "${i}" <-- later to get every target built  
    846   done   done
    847   fi   fi
    848    
    # Line 788  regen_mage_tree() Line 860  regen_mage_tree()
    860   # build them only if requested   # build them only if requested
    861   if mqueryfeature regentree   if mqueryfeature regentree
    862   then   then
      # run it without targets  
      if [[ -n ${MAGE_TARGETS} ]]  
      then  
      # build for each target a mage file  
      # run it with several targets  
      echo  
      for subpackage in ${MAGE_TARGETS}  
      do  
      build_mage_script --target "${subpackage}"  
      done  
      echo  
       
    863   # run it for splitpackages   # run it for splitpackages
    864   elif [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
    865   then   then
    866   local split_pkg_base="${PNAME}"   local split_pkg_base="${PNAME}"
    867   # save smage environment   # save smage environment
    # Line 841  regen_mage_tree() Line 901  regen_mage_tree()
    901    
    902   # now unset all uneeded vars to be safe   # now unset all uneeded vars to be safe
    903   # unset PKGNAME <-- don't do that; smage needs this var   # unset PKGNAME <-- don't do that; smage needs this var
      # unset to be safe (quotes needed !)  
     # for i in ${SPECIAL_FUNCTIONS}  
     # do  
     # unset "${i}"  
     # done  
    904   unset SPECIAL_FUNCTIONS   unset SPECIAL_FUNCTIONS
     # for i in ${SPECIAL_VARS}  
     # do  
     # unset "${i}"  
     # done  
    905   unset SPECIAL_VARS   unset SPECIAL_VARS
    906   unset STATE   unset STATE
    907   unset DESCRIPTION   unset DESCRIPTION
    # Line 875  split_save_variables() Line 926  split_save_variables()
    926   export SAVED_DESCRIPTION="${DESCRIPTION}"   export SAVED_DESCRIPTION="${DESCRIPTION}"
    927   export SAVED_HOMEPAGE="${HOMEPAGE}"   export SAVED_HOMEPAGE="${HOMEPAGE}"
    928   export SAVED_SPECIAL_VARS="${SPECIAL_VARS}"   export SAVED_SPECIAL_VARS="${SPECIAL_VARS}"
    929     export SAVED_SPECIAL_FUNCTIONS="${SPECIAL_FUNCTIONS}"
    930   export SAVED_STATE="${STATE}"   export SAVED_STATE="${STATE}"
      export SAVED_PKGTYPE="${PKGTYPE}"  
    931   export SAVED_INHERITS="${INHERITS}"   export SAVED_INHERITS="${INHERITS}"
    932   export SAVED_DEPEND="${DEPEND}"   export SAVED_DEPEND="${DEPEND}"
    933   export SAVED_SDEPEND="${SDEPEND}"   export SAVED_SDEPEND="${SDEPEND}"
    # Line 950  split_restore_variables() Line 1001  split_restore_variables()
    1001   export DESCRIPTION="${SAVED_DESCRIPTION}"   export DESCRIPTION="${SAVED_DESCRIPTION}"
    1002   export HOMEPAGE="${SAVED_HOMEPAGE}"   export HOMEPAGE="${SAVED_HOMEPAGE}"
    1003   export SPECIAL_VARS="${SAVED_SPECIAL_VARS}"   export SPECIAL_VARS="${SAVED_SPECIAL_VARS}"
    1004     export SPECIAL_FUNCTIONS="${SAVED_SPECIAL_FUNCTIONS}"
    1005   export STATE="${SAVED_STATE}"   export STATE="${SAVED_STATE}"
      export PKGTYPE="${SAVED_PKGTYPE}"  
    1006   export INHERITS="${SAVED_INHERITS}"   export INHERITS="${SAVED_INHERITS}"
    1007   export DEPEND="${SAVED_DEPEND}"   export DEPEND="${SAVED_DEPEND}"
    1008   export SDEPEND="${SAVED_SDEPEND}"   export SDEPEND="${SAVED_SDEPEND}"
    # Line 1019  split_unset_variables() Line 1070  split_unset_variables()
    1070   unset SAVED_DESCRIPTION   unset SAVED_DESCRIPTION
    1071   unset SAVED_HOMEPAGE   unset SAVED_HOMEPAGE
    1072   unset SAVED_SPECIAL_VARS   unset SAVED_SPECIAL_VARS
    1073     unset SAVED_SPECIAL_FUNCTIONS
    1074   unset SAVED_STATE   unset SAVED_STATE
    1075   unset SAVED_PKGTYPE   unset SAVED_PKGTYPE
    1076   unset SAVED_INHERITS   unset SAVED_INHERITS
    # Line 1099  generate_package_md5sum() Line 1151  generate_package_md5sum()
    1151   local pver   local pver
    1152   local pbuild   local pbuild
    1153   local parch   local parch
      local target  
    1154   local pkgname   local pkgname
    1155    
    1156   # very basic getops   # very basic getops
    # Line 1111  generate_package_md5sum() Line 1162  generate_package_md5sum()
    1162   --pver|-v) shift; pver="$1" ;;   --pver|-v) shift; pver="$1" ;;
    1163   --pbuild|-b) shift; pbuild="$1" ;;   --pbuild|-b) shift; pbuild="$1" ;;
    1164   --parch|a) shift; parch="$1" ;;   --parch|a) shift; parch="$1" ;;
      --target|t) shift; target="$1" ;;  
    1165   esac   esac
    1166   shift   shift
    1167   done   done
    # Line 1127  generate_package_md5sum() Line 1177  generate_package_md5sum()
    1177   [ -z "${PKGDIR}" ] && die "generate_package_md5sum() \$PKGDIR not set."   [ -z "${PKGDIR}" ] && die "generate_package_md5sum() \$PKGDIR not set."
    1178   [ -z "${PKGSUFFIX}" ] && die "generate_package_md5sum() \$PKGSUFFIX not set."   [ -z "${PKGSUFFIX}" ] && die "generate_package_md5sum() \$PKGSUFFIX not set."
    1179    
      # fix target as it may be empty !  
      [ -n "${target}" ] && target="-${target}"  
       
    1180   # build pkgname   # build pkgname
    1181   pkgname="${pname}${target}-${pver}-${parch}$(print_distrotag)-${pbuild}"   pkgname="${pname}-${pver}-${parch}$(print_distrotag)-${pbuild}"
    1182    
    1183   # build pkg-md5-sum only if requested   # build pkg-md5-sum only if requested
    1184   if mqueryfeature regentree   if mqueryfeature regentree
    # Line 1149  generate_package_md5sum() Line 1196  generate_package_md5sum()
    1196   : ${MAGE_TREE_DEST=${BUILDDIR}/mage-tree}   : ${MAGE_TREE_DEST=${BUILDDIR}/mage-tree}
    1197    
    1198   # setup md5 dir   # setup md5 dir
    1199   dest="${MAGE_TREE_DEST}/${pcat}/${pname}${target}/md5"   dest="${MAGE_TREE_DEST}/${pcat}/${pname}/md5"
    1200   install -d ${dest}   install -d ${dest}
    1201    
    1202   # gen md5sum   # gen md5sum
    # Line 1161  generate_package_md5sum() Line 1208  generate_package_md5sum()
    1208    
    1209  source_pkg_build()  source_pkg_build()
    1210  {  {
      if [[ ${PKGTYPE} = virtual ]]  
      then  
      echo "Virtual package detected; src-pkg-tarball not necessary ..."  
      return 0  
      fi  
       
    1211   if [[ ! -d ${SOURCEDIR}/${PNAME} ]]   if [[ ! -d ${SOURCEDIR}/${PNAME} ]]
    1212   then   then
    1213   echo "No SRC_URI defined; src-pkg-tarball not necessary ..."   install -d ${SOURCEDIR}/${PNAME}
      return 0  
    1214   fi   fi
    1215    
    1216   [ -z "${SRCPKGDIR}" ] && die "\$SRCPKGDIR not found. Please setup your ${MAGERC} correctly."   [ -z "${SRCPKGDIR}" ] && die "\$SRCPKGDIR not found. Please setup your ${MAGERC} correctly."
    # Line 1216  run_resume() Line 1256  run_resume()
    1256   return 1   return 1
    1257   fi   fi
    1258  }  }
    1259    
    1260    mqalint()
    1261    {
    1262     return 0
    1263    }
    Legend:
    Removed from v.1680  
    changed lines
      Added in v.3180