merge data into portage tree

This commit is contained in:
belliash 2012-01-13 15:23:07 +01:00
parent 7436e901be
commit 00d91a986f

15
ezsync
View File

@ -139,3 +139,18 @@ if isSet MERGED_OVERLAY && isSet OVERLAY_BUILD; then
[ ${?} -ne 0 ] && die "Ezbuild was unable to record changes to the remote overlay repository!" 8
fi
fi
# Merge data into build portage
printInfo "Merging ebuilds into building Portage..."
pullRsync ${PORTAGESDIR}/${PORTAGE_BUILD[0]} ${PORTAGESDIR}/${PORTAGE_MAINLINE[0]}
[ ${?} -ne 0 ] && die "EzBuild was unable to merge ebuilds into Portage tree!" 16
for OVERLAY in ${MERGED_PORTAGE[*]}; do
TEMP="\${$OVERLAY[*]}"
CURRENT_OVERLAY=(`eval echo ${TEMP}`)
mergeOverlay ${OVERLAYSDIR}/${CURRENT_OVERLAY[0]} ${PORTAGESDIR}/${PORTAGE_BUILD[0]} ${CURRENT_OVERLAY[4]} ${CURRENT_OVERLAY[5]} ${CURRENT_OVERLAY[6]}
[ ${?} -ne 0 ] && die "EzBuild was unable to merge ebuilds into Portage tree!" 16
if [ -f ${OVERLAYSDIR}/${CURRENT_OVERLAY[0]}/profiles/package.mask ]; then
run "cp -apf ${OVERLAYSDIR}/${CURRENT_OVERLAY[0]}/profiles/package.mask ${PORTAGESDIR}/${PORTAGE_BUILD[0]}/profiles/package.mask/${OVERLAY_BUILD[0]%-*}"
[ ${?} -ne 0 ] && die "EzBuild was unable to merge package.mask file into Portage tree!" 16
fi
done