--- trunk/mage/usr/lib/mage/smage2.sh 2011/07/25 11:01:48 1435 +++ trunk/mage/usr/lib/mage/smage2.sh 2011/07/25 11:59:49 1436 @@ -834,7 +834,7 @@ regen_mage_tree() { - local i + local subpackage # build them only if requested if [[ ${REGEN_MAGE_TREE} = true ]] @@ -845,9 +845,9 @@ # build for each target a mage file # run it with several targets echo - for i in ${MAGE_TARGETS} + for subpackage in ${MAGE_TARGETS} do - build_mage_script --target "${i}" + build_mage_script --target "${subpackage}" done echo @@ -860,12 +860,16 @@ # build for each subpackage a mage file # run it with several targets echo - for i in ${SPLIT_PACKAGES} + for subpackage in ${SPLIT_PACKAGES} do # get the right variables for the split - export PNAME="${i}" - split_info_${i} + export PNAME="${subpackage}" + split_info_${subpackage} + # get the preinstall etc + split_export_inherits ${subpackage} build_mage_script --split-pkg-base "${split_pkg_base}" + # delete split preinstall etc + split_delete_inherits ${subpackage} # restore smage environment split_restore_variables done @@ -1051,6 +1055,37 @@ unset -f SAVED_postremove } +split_export_inherits() +{ + local subpackage="$1" + local func + local newfunc + + for func in preinstall postinstall preremove postremove + do + if [[ ! -z $(typeset -f ${func}_${subpackage}) ]] + then + newfunc=$(typeset -f ${func}_${subpackage}) + newfunc="${newfunc/_${subpackage} (/ (}" + eval "${newfunc}" + fi + done +} + +split_delete_inherits() +{ + local subpackage="$1" + local func + + for func in preinstall postinstall preremove postremove + do + if [[ ! -z $(typeset -f ${func}_${subpackage}) ]] + then + unset -f ${func} + fi + done + } + export_inherits() { local include="$1"