Magellan Linux

  • Back to homepage
    • /[magellan-source]/branches/mage-next/src/smage2.sh

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

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

    revision 1593 by niro, Thu Dec 29 15:20:20 2011 UTC revision 1630 by niro, Fri Jan 13 13:17:21 2012 UTC
    # Line 177  download_sources() Line 177  download_sources()
    177   fi   fi
    178    
    179   echo -e "${COLBLUE}==>${COLGREEN} fetching ${uri}${COLDEFAULT}"   echo -e "${COLBLUE}==>${COLGREEN} fetching ${uri}${COLDEFAULT}"
    180   mdownload --uri "${uri}" --dir "${outputdir}" || die "Could not download '${uri}'"   # always use verbose mode for source downloads
    181     FVERBOSE=off msetfeature "verbose"
    182     # do not die here, mchecksum catches download errors
    183     mdownload --uri "${uri}" --dir "${outputdir}"
    184    
    185   # unset them to be sure   # unset them to be sure
    186   unset uri   unset uri
    # Line 236  mlibdir() Line 239  mlibdir()
    239    
    240  mconfigure()  mconfigure()
    241  {  {
    242     local myopts
    243     if [[ ! -z ${CTARGET} ]]
    244     then
    245     myopts="--target=${CTARGET}"
    246     fi
    247    
    248   if [ -x ./configure ]   if [ -x ./configure ]
    249   then   then
    250   ./configure \   ./configure \
    # Line 248  mconfigure() Line 257  mconfigure()
    257   --sysconfdir=/etc \   --sysconfdir=/etc \
    258   --localstatedir=/var/lib \   --localstatedir=/var/lib \
    259   --libdir=/usr/$(mlibdir) \   --libdir=/usr/$(mlibdir) \
    260     ${myopts} \
    261   "$@" || die "mconfigure failed"   "$@" || die "mconfigure failed"
    262   else   else
    263   echo "configure is not an executable ..."   echo "configure is not an executable ..."
    # Line 343  munpack() Line 353  munpack()
    353   rar)   rar)
    354   unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST}  || die ".rar unpack failed."   unrar x ${SOURCEDIR}/${PNAME}/${SRCFILE} ${DEST}  || die ".rar unpack failed."
    355   ;;   ;;
    356   zip|xpi)   zip|xpi|jar)
    357   unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed."   unzip ${SOURCEDIR}/${PNAME}/${SRCFILE} -d ${DEST} || die ".zip unpack failed."
    358   ;;   ;;
    359   rpm)   rpm)
    # Line 423  minstalldocs() Line 433  minstalldocs()
    433   then   then
    434   if mqueryfeature "compressdoc"   if mqueryfeature "compressdoc"
    435   then   then
    436   cat ${doc} | gzip -9c > ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/${doc}.gz || die "gzipping +installing ${doc}."   cat ${doc} | gzip -9c > ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "gzipping +installing ${doc}."
    437   chmod 0644 ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/${doc}.gz || die "fixing permissions of ${doc}."   chmod 0644 ${BINDIR}/usr/share/doc/${PNAME}-${PVER}/$(basename ${doc}).gz || die "fixing permissions of ${doc}."
    438   else   else
    439   install -m 0644 ${SRCDIR}/${i} ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "installing ${doc}."   install -m 0644 ${SRCDIR}/${i} ${BINDIR}/usr/share/doc/${PNAME}-${PVER} || die "installing ${doc}."
    440   fi   fi
    # Line 464  mstriplibtoolarchive() Line 474  mstriplibtoolarchive()
    474   local stripdir="$@"   local stripdir="$@"
    475    
    476   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"   [[ -z ${stripdir} ]] && stripdir="${BINDIR}"
    477   find ${stripdir} ! -type d -name \*.la | xargs file | grep "libtool library" | cut -f 1 -d : | xargs --no-run-if-empty rm -f -- 2> /dev/null   find ${stripdir} ! -type d -name \*.la | xargs | grep "libtool library" | cut -f 1 -d : | xargs --no-run-if-empty rm -f -- 2> /dev/null
    478  }  }
    479    
    480  mpurgetargets()  mpurgetargets()
    # Line 793  regen_mage_tree() Line 803  regen_mage_tree()
    803   unset STATE   unset STATE
    804   unset DESCRIPTION   unset DESCRIPTION
    805   unset HOMEPAGE   unset HOMEPAGE
    806   unset PKGTYPE   # unset PKGTYPE <-- don't do that either; smage needs this var
    807   unset INHERITS   unset INHERITS
    808   unset DEPEND   unset DEPEND
    809   unset SDEPEND   unset SDEPEND
    # Line 898  split_restore_variables() Line 908  split_restore_variables()
    908    
    909   # special handling needed for mage features   # special handling needed for mage features
    910   # pkgbuild   # pkgbuild
    911   msetfeature "${SAVED_FEATURE_PKGBUILD}"   FVERBOSE=off msetfeature "${SAVED_FEATURE_PKGBUILD}"
    912   # strip   # strip
    913   msetfeature "${SAVED_FEATURE_STRIP}"   FVERBOSE=off msetfeature "${SAVED_FEATURE_STRIP}"
    914   # libtool   # libtool
    915   msetfeature "${SAVED_FEATURE_LIBTOOL}"   FVERBOSE=off msetfeature "${SAVED_FEATURE_LIBTOOL}"
    916   # compressdoc   # compressdoc
    917   msetfeature "${SAVED_FEATURE_COMPRESSDOC}"   FVERBOSE=off msetfeature "${SAVED_FEATURE_COMPRESSDOC}"
    918    
    919   # bindir too   # bindir too
    920   export BINDIR="${SAVED_BINDIR}"   export BINDIR="${SAVED_BINDIR}"
    # Line 1135  step_by_step() Line 1145  step_by_step()
    1145   fi   fi
    1146  }  }
    1147    
    1148    resume_stamp()
    1149    {
    1150     local step="$1"
    1151     [[ ! -d ${BUILDDIR}/.stamps ]] && install -d ${BUILDDIR}/.stamps
    1152     touch ${BUILDDIR}/.stamps/smage-${PKGNAME}-${step}
    1153    }
    1154    
    1155    run_resume()
    1156    {
    1157     local step="$1"
    1158    
    1159     if mqueryfeature "resume" && [[ -f ${BUILDDIR}/.stamps/smage-${PKGNAME}-${step} ]]
    1160     then
    1161     echo -e "${COLMAGENTA}${step} already processed; doing nothing${COLDEFAULT}"
    1162     return 0
    1163     else
    1164     return 1
    1165     fi
    1166    }
    1167    
    1168  # print out our version  # print out our version
    1169  showversion  showversion
    # Line 1355  then Line 1384  then
    1384   [[ ! -f ${SMAGENAME} ]] && die "Included smage2 file in src-tarball not found: ${SMAGENAME}"   [[ ! -f ${SMAGENAME} ]] && die "Included smage2 file in src-tarball not found: ${SMAGENAME}"
    1385  fi  fi
    1386    
    1387    if [ "$1" == "--resume" -a -n "$2" ]
    1388    then
    1389     msetfeature "resume"
    1390     SMAGENAME="$2"
    1391    fi
    1392    
    1393  [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ] && die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."  [ ! -e ${MLIBDIR}/pkgbuild_dir.sh ] && die "Error: ${MLIBDIR}/pkgbuild_dir.sh not found. Aborting."
    1394  [ -z "$(basename ${SMAGENAME} | grep .${SMAGESUFFIX})" ] &&  [ -z "$(basename ${SMAGENAME} | grep .${SMAGESUFFIX})" ] &&
    # Line 1399  export -f src_install || die "src_instal Line 1433  export -f src_install || die "src_instal
    1433  # fixes some compile issues  # fixes some compile issues
    1434  export CHOST="${CHOST}" || die "CHOST export failed"  export CHOST="${CHOST}" || die "CHOST export failed"
    1435  export CFLAGS="${CFLAGS}" || die "CFLAGS export failed"  export CFLAGS="${CFLAGS}" || die "CFLAGS export failed"
    1436  export CXXFLAGS="${CFLAGS}" || die "CXXFLAGS export failed"  if [[ -z ${CXXFLAGS} ]]
    1437    then
    1438     export CXXFLAGS="${CFLAGS}" || die "CXXFLAGS export failed"
    1439    else
    1440     export CXXFLAGS="${CXXFLAGS}" || die "CXXFLAGS export failed"
    1441    fi
    1442    export LDFLAGS="${LDFLAGS}" || die "LDFLAGS export failed"
    1443  export BINDIR="${BINDIR}" || die "BINDIR export failed"  export BINDIR="${BINDIR}" || die "BINDIR export failed"
    1444  export MAKEOPTS="${MAKEOPTS}" || die "MAKEOPTS export failed"  export MAKEOPTS="${MAKEOPTS}" || die "MAKEOPTS export failed"
    1445    
    # Line 1410  mqueryfeature "distcc" && setup_distcc_e Line 1450  mqueryfeature "distcc" && setup_distcc_e
    1450  # setup ccache  # setup ccache
    1451  mqueryfeature "ccache" && setup_ccache_environment  mqueryfeature "ccache" && setup_ccache_environment
    1452    
    1453  # clean up builddir if a previously one exist  if mqueryfeature "resume"
     if [ -d ${BUILDDIR} ]  
    1454  then  then
    1455   rm -rf ${BUILDDIR}/* || die "couldn't cleanup \$BUILDDIR."   echo -e "${COLMAGENTA}Resume requested; continuing previous build${COLDEFAULT}"
     fi  
     install -d ${BUILDDIR} || die "couldn't create \$BUILDDIR."  
    1456    
    1457  # clean up srcdir if a previously unpacked one exist   # setup build logging
    1458  if [ -d ${SRCDIR} ]   [[ ! -d /var/log/smage ]] && install -d /var/log/smage
    1459  then   if [[ -f /var/log/smage/${PKGNAME}.log.bz2 ]]
    1460   rm -rf ${SRCDIR}   then
    1461  fi   bunzip2 -f /var/log/smage/${PKGNAME}.log.bz2
    1462     fi
    1463     echo -e "### Resume started on $(date) ###\n" >> /var/log/smage/${PKGNAME}.log
    1464    
    1465  # clean up bindir if a previous build exist or create a new one  else
    1466  if [ -d ${BINDIR} ]   # clean up builddir if a previously one exist
    1467  then   if [ -d ${BUILDDIR} ]
    1468   rm -rf ${BINDIR}   then
    1469  fi   rm -rf ${BUILDDIR}/* || die "couldn't cleanup \$BUILDDIR."
    1470  install -d ${BINDIR} || die "couldn't create \$BINDIR."   fi
    1471     install -d ${BUILDDIR} || die "couldn't create \$BUILDDIR."
    1472    
    1473  # clean up package temp dir if a previous build exist   # clean up srcdir if a previously unpacked one exist
    1474  if [ -d ${BUILDDIR}/${PKGNAME} ]   if [ -d ${SRCDIR} ]
    1475  then   then
    1476   rm -rf ${BUILDDIR}/${PKGNAME}   rm -rf ${SRCDIR}
    1477  fi   fi
    1478    
    1479     # clean up bindir if a previous build exist or create a new one
    1480     if [ -d ${BINDIR} ]
    1481     then
    1482     rm -rf ${BINDIR}
    1483     fi
    1484     install -d ${BINDIR} || die "couldn't create \$BINDIR."
    1485    
    1486     # clean up package temp dir if a previous build exist
    1487     if [ -d ${BUILDDIR}/${PKGNAME} ]
    1488     then
    1489     rm -rf ${BUILDDIR}/${PKGNAME}
    1490     fi
    1491    
    1492  # setup build logging   # clean up stamps dir
    1493  [[ ! -d /var/log/smage ]] && install -d /var/log/smage   if [ -d ${BUILDDIR}/.stamps ]
    1494  echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log   then
    1495     rm -rf ${BUILDDIR}/.stamps
    1496     fi
    1497    
    1498     # setup build logging
    1499     [[ ! -d /var/log/smage ]] && install -d /var/log/smage
    1500     echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log
    1501    fi
    1502    
    1503  if [[ ${PKGTYPE} = virtual ]]  if [[ ${PKGTYPE} = virtual ]]
    1504  then  then
    # Line 1446  then Line 1506  then
    1506   # automatically set !pkgbuild here too   # automatically set !pkgbuild here too
    1507   msetfeature "!pkgbuild"   msetfeature "!pkgbuild"
    1508  else  else
    1509   src_prepare | ${SMAGE_LOG_CMD}   ( run_resume src_prepare || src_prepare ) | ${SMAGE_LOG_CMD}
    1510   die_pipestatus 0 "src_prepare failed"   die_pipestatus 0 "src_prepare failed"
    1511   step_by_step $_   resume_stamp src_prepare
    1512     step_by_step src_prepare
    1513    
    1514   src_compile | ${SMAGE_LOG_CMD}   ( run_resume src_compile || src_compile ) | ${SMAGE_LOG_CMD}
    1515   die_pipestatus 0 "src_compile failed"   die_pipestatus 0 "src_compile failed"
    1516   step_by_step $_   resume_stamp src_compile
    1517     step_by_step src_compile
    1518    
    1519   # only run checks if requested   # only run checks if requested
    1520   if mqueryfeature "!check"   if mqueryfeature "!check"
    1521   then   then
    1522   echo "!check detected; src_check() will not be run!" | ${SMAGE_LOG_CMD}   echo "!check detected; src_check() will not be run!" | ${SMAGE_LOG_CMD}
      step_by_step src_check  
    1523   else   else
    1524   src_check | ${SMAGE_LOG_CMD}   ( run_resume src_check || src_check ) | ${SMAGE_LOG_CMD}
    1525   die_pipestatus 0 "src_check failed"   die_pipestatus 0 "src_check failed"
    1526   step_by_step $_   resume_stamp src_check
    1527   fi   fi
    1528     step_by_step src_check
    1529    
    1530   # build several subpackages   # build several subpackages
    1531   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
    # Line 1487  else Line 1549  else
    1549   echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"   echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}"
    1550   echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."   echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..."
    1551    
    1552   src_install_${subpackage} | ${SMAGE_LOG_CMD}   ( run_resume src_install_${subpackage} || src_install_${subpackage} ) | ${SMAGE_LOG_CMD}
    1553   die_pipestatus 0 "src_install_${subpackage} failed"   die_pipestatus 0 "src_install_${subpackage} failed"
    1554   step_by_step $_   resume_stamp src_install_${subpackage}
    1555     step_by_step src_install_${subpackage}
    1556   fi   fi
    1557   done   done
    1558   # restore bindir & pname   # restore bindir & pname
    # Line 1497  else Line 1560  else
    1560   # unset all saved smage variables   # unset all saved smage variables
    1561   split_unset_variables   split_unset_variables
    1562   else   else
    1563   src_install | ${SMAGE_LOG_CMD}   ( run_resume src_install || src_install ) | ${SMAGE_LOG_CMD}
    1564   die_pipestatus 0 "src_install failed"   die_pipestatus 0 "src_install failed"
    1565   step_by_step $_   resume_stamp src_install
    1566     step_by_step src_install
    1567   fi   fi
    1568  fi  fi
    1569    
    # Line 1509  echo Line 1573  echo
    1573  if mqueryfeature "!compressdoc"  if mqueryfeature "!compressdoc"
    1574  then  then
    1575   echo -e "!compressdoc detected; documentation will not be compressed ..."   echo -e "!compressdoc detected; documentation will not be compressed ..."
    1576    elif mqueryfeature "!pkgbuild"
    1577    then
    1578     echo "!pkgbuild detected; skipping documentation compression..."
    1579  else  else
    1580   # compressing doc, info & man files   # compressing doc, info & man files
    1581   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
    1582   then   then
    1583   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    1584   do   do
    1585   mcompressdocs ${BINDIR}_${subpackage}   run_resume mcompressdoc_${subpackage} || mcompressdocs ${BINDIR}_${subpackage}
    1586     resume_stamp mcompressdoc_${subpackage}
    1587   done   done
    1588   else   else
    1589   mcompressdocs ${BINDIR}   run_resume mcompressdoc || mcompressdocs ${BINDIR}
    1590     resume_stamp mcompressdoc
    1591   fi   fi
    1592  fi  fi
    1593    
    1594  if mqueryfeature "!libtool"  if mqueryfeature "!libtool"
    1595  then  then
    1596     if mqueryfeature "!pkgbuild"
    1597     then
    1598     echo "!pkgbuild detected; skipping libtool archive stripping ..."
    1599     else
    1600   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
    1601   then   then
    1602   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    1603   do   do
    1604   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives for '${subpackage}' ...${COLDEFAULT}"
    1605   mstriplibtoolarchive ${BINDIR}_${subpackage}   run_resume mstriplibtoolarchive_${subpackage} || mstriplibtoolarchive ${BINDIR}_${subpackage}
    1606     resume_stamp mstriplibtoolarchive_${subpackage}
    1607   done   done
    1608   else   else
    1609   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping libtool archives ...${COLDEFAULT}"
    1610   mstriplibtoolarchive ${BINDIR}   run_resume mstriplibtoolarchive || mstriplibtoolarchive ${BINDIR}
    1611     resume_stamp mstriplibtoolarchive
    1612   fi   fi
    1613     fi
    1614  fi  fi
    1615    
    1616  if mqueryfeature "purge"  if mqueryfeature "purge"
    1617  then  then
    1618     if mqueryfeature "!pkgbuild"
    1619     then
    1620     echo "!pkgbuild detected; skipping file purgation..."
    1621     else
    1622   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
    1623   then   then
    1624   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    1625   do   do
    1626   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets in '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets in '${subpackage}' ...${COLDEFAULT}"
    1627   mpurgetargets ${BINDIR}_${subpackage}   run_resume mpurgetargets_${subpackage} || mpurgetargets ${BINDIR}_${subpackage}
    1628     resume_stamp mpurgetargets_${subpackage}
    1629   done   done
    1630   else   else
    1631   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} purging all purge targets ...${COLDEFAULT}"
    1632   mpurgetargets ${BINDIR}   run_resume mpurgetargets || mpurgetargets ${BINDIR}
    1633     resume_stamp mpurgetargets
    1634   fi   fi
    1635     fi
    1636  fi  fi
    1637    
    1638  # stripping all bins and libs  # stripping all bins and libs
    1639  if mqueryfeature "!strip"  if mqueryfeature "!strip"
    1640  then  then
    1641   echo -e "!strip detected; Package will not be stripped ..."   echo -e "!strip detected; Package will not be stripped ..."
    1642    elif mqueryfeature "!pkgbuild"
    1643    then
    1644     echo "!pkgbuild detected; skipping stripping of the package ..."
    1645  else  else
    1646   if [[ -n ${SPLIT_PACKAGES} ]]   if [[ -n ${SPLIT_PACKAGES} ]]
    1647   then   then
    1648   for subpackage in ${SPLIT_PACKAGES}   for subpackage in ${SPLIT_PACKAGES}
    1649   do   do
    1650   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"   echo -e "${COLBLUE}===${COLGREEN} stripping binaries for '${subpackage}' ...${COLDEFAULT}"
    1651   mstripbins ${BINDIR}_${subpackage}   run_resume mstripbins_${subpackage} || mstripbins ${BINDIR}_${subpackage}
    1652   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"   resume_stamp mstripbins_${subpackage}
    1653   mstriplibs ${BINDIR}_${subpackage}   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries for '${subpackage}' ...${COLDEFAULT}"
    1654   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"   run_resume mstriplibs_${subpackage} || mstriplibs ${BINDIR}_${subpackage}
    1655   mstripstatic ${BINDIR}_${subpackage}   resume_stamp mstriplibs_${subpackage}
    1656   done   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries for '${subpackage}' ...${COLDEFAULT}"
    1657   else   run_resume mstripstatic_${subpackage} || mstripstatic ${BINDIR}_${subpackage}
    1658   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"   resume_stamp mstripstatic_${subpackage}
    1659   mstripbins ${BINDIR}   done
    1660   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}"   else
    1661   mstriplibs ${BINDIR}   echo -e "${COLBLUE}===${COLGREEN} stripping binaries ...${COLDEFAULT}"
    1662   echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}"   run_resume mstripbins || mstripbins ${BINDIR}
    1663   mstripstatic ${BINDIR}   resume_stamp mstripbins
    1664   fi   echo -e "${COLBLUE}===${COLGREEN} stripping dynamic libraries ...${COLDEFAULT}"
    1665     run_resume mstriplibs || mstriplibs ${BINDIR}
    1666     resume_stamp mstriplibs
    1667     echo -e "${COLBLUE}===${COLGREEN} stripping static libraries ...${COLDEFAULT}"
    1668     run_resume mstripstatic || mstripstatic ${BINDIR}
    1669     resume_stamp mstripstatic
    1670     fi
    1671  fi  fi
    1672    
    1673  if mqueryfeature "!buildpkg"  if mqueryfeature "!pkgbuild"
    1674  then  then
    1675   echo -e "!buildpkg detected; Package will not be build ..."   echo -e "!pkgbuild detected; Package will not be build ..."
    1676  else  else
    1677   # build several targets   # build several targets
    1678   if [[ -n ${MAGE_TARGETS} ]]   if [[ -n ${MAGE_TARGETS} ]]
    # Line 1591  else Line 1683  else
    1683   if typeset -f ${target}_pkgbuild > /dev/null   if typeset -f ${target}_pkgbuild > /dev/null
    1684   then   then
    1685   # run it   # run it
    1686   ${target}_pkgbuild   run_resume ${target}_pkgbuild || ${target}_pkgbuild
    1687     resume_stamp ${target}_pkgbuild
    1688   fi   fi
    1689   # now create the target package   # now create the target package
    1690   ${MLIBDIR}/pkgbuild_dir.sh \   run_resume pkg_builddir_${target} || ${MLIBDIR}/pkgbuild_dir.sh \
    1691   "${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD}" \   "${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD}" \
    1692   ${BINDIR} || die "target: ${target} package-build failed"   ${BINDIR} || die "target: ${target} package-build failed"
    1693     resume_stamp pkg_builddir_${target}
    1694    
    1695   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
    1696   generate_package_md5sum \   run_resume md5sum_${target} || generate_package_md5sum \
    1697   --pcat "${PCATEGORIE}" \   --pcat "${PCATEGORIE}" \
    1698   --pname "${PNAME}" \   --pname "${PNAME}" \
    1699   --pver "${PVER}" \   --pver "${PVER}" \
    1700   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    1701   --parch "${ARCH}" \   --parch "${ARCH}" \
    1702   --target "${target}"   --target "${target}"
    1703     resume_stamp md5sum_${target}
    1704    
    1705   echo -e "${COLGREEN}\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"   echo -e "${COLGREEN}\nPackage ${PNAME}-${target}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
    1706   done   done
    # Line 1620  else Line 1715  else
    1715   export PNAME="${subpackage}"   export PNAME="${subpackage}"
    1716   split_info_${PNAME}   split_info_${PNAME}
    1717    
    1718   # jump to next one if !buildpkg is set in split_info   # jump to next one if !pkgbuild is set in split_info
    1719   mqueryfeature "!buildpkg" && continue   mqueryfeature "!pkgbuild" && continue
    1720    
    1721   # check if an special subpackage_pkgbuild exists   # check if an special subpackage_pkgbuild exists
    1722   if typeset -f ${PNAME}_pkgbuild > /dev/null   if typeset -f ${PNAME}_pkgbuild > /dev/null
    1723   then   then
    1724   # run it   # run it
    1725   ${PNAME}_pkgbuild   run_resume ${PNAME}_pkgbuild || ${PNAME}_pkgbuild
    1726     resume_stamp ${PNAME}_pkgbuild
    1727   fi   fi
    1728   # now create the target package   # now create the target package
    1729   ${MLIBDIR}/pkgbuild_dir.sh \   run_resume pkg_builddir_${PNAME} || ${MLIBDIR}/pkgbuild_dir.sh \
    1730   "${PNAME}-${PVER}-${ARCH}-${PBUILD}" \   "${PNAME}-${PVER}-${ARCH}-${PBUILD}" \
    1731   "${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"   "${BINDIR}_${PNAME}" || die "split_package: ${PNAME} package-build failed"
    1732     resume_stamp pkg_builddir_${PNAME}
    1733    
    1734   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
    1735   generate_package_md5sum \   run_resume md5sum_${PNAME} || generate_package_md5sum \
    1736   --pcat "${PCATEGORIE}" \   --pcat "${PCATEGORIE}" \
    1737   --pname "${PNAME}" \   --pname "${PNAME}" \
    1738   --pver "${PVER}" \   --pver "${PVER}" \
    1739   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    1740   --parch "${ARCH}"   --parch "${ARCH}"
    1741     resume_stamp md5sum_${PNAME}
    1742    
    1743   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"   echo -e "${COLGREEN}\nPackage ${PNAME}-${PVER}-${ARCH}-${PBUILD} successfully builded.\n${COLDEFAULT}"
    1744    
    # Line 1651  else Line 1749  else
    1749   split_unset_variables   split_unset_variables
    1750    
    1751   else   else
    1752   ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"   run_resume pkg_builddir || ${MLIBDIR}/pkgbuild_dir.sh ${PKGNAME} ${BINDIR} || die "package-build failed"
    1753     resume_stamp pkg_builddir
    1754    
    1755   # build pkg-md5-sum if requested   # build pkg-md5-sum if requested
    1756   generate_package_md5sum \   run_resume md5sum || generate_package_md5sum \
    1757   --pcat "${PCATEGORIE}" \   --pcat "${PCATEGORIE}" \
    1758   --pname "${PNAME}" \   --pname "${PNAME}" \
    1759   --pver "${PVER}" \   --pver "${PVER}" \
    1760   --pbuild "${PBUILD}" \   --pbuild "${PBUILD}" \
    1761   --parch "${ARCH}"   --parch "${ARCH}"
    1762     resume_stamp md5sum
    1763    
    1764   echo -e "${COLGREEN}\nPackage ${PKGNAME} successfully builded.\n${COLDEFAULT}"   echo -e "${COLGREEN}\nPackage ${PKGNAME} successfully builded.\n${COLDEFAULT}"
    1765   fi   fi
    1766    
    1767   # build src-pkg-tarball if requested   # build src-pkg-tarball if requested
    1768   mqueryfeature "srcpkg" && source_pkg_build ${SMAGENAME}   if mqueryfeature "srcpkg"
    1769     then
    1770     run_resume srcpkgbuild || source_pkg_build ${SMAGENAME}
    1771     resume_stamp srcpkgbuild
    1772     fi
    1773  fi  fi
    1774    
    1775  if mqueryfeature "buildlog"  if mqueryfeature "buildlog"
    Legend:
    Removed from v.1593  
    changed lines
      Added in v.1630