xbps-src: run 'bootstrap-update' on the real masterdir with -t.

The real masterdir will be cleaned up and always up-to-date before
creating the temporary masterdir.
This commit is contained in:
Juan RP 2015-03-02 15:51:51 +01:00
parent a31ed3f4be
commit 9441debf00
1 changed files with 11 additions and 6 deletions

View File

@ -287,6 +287,15 @@ install_bbootstrap() {
chroot_prepare $XBPS_TARGET_PKG || msg_error "Failed to initialize chroot!\n"
}
bootstrap_update() {
if [ -z "$CHROOT_READY" -o -z "$IN_CHROOT" ]; then
return
fi
remove_pkg_autodeps
${XBPS_INSTALL_CMD} -yu
return $?
}
masterdir_zap() {
for f in bin boot builddir destdir dev etc home lib lib32 lib64 mnt \
opt proc root run sbin sys tmp usr var host media xbps \
@ -565,12 +574,7 @@ case "$XBPS_TARGET" in
install_bbootstrap
;;
bootstrap-update)
if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then
chroot_handler ${XBPS_TARGET} dummy
else
remove_pkg_autodeps
${XBPS_INSTALL_CMD} -yu
fi
bootstrap_update
;;
chroot)
chroot_handler chroot dummy
@ -608,6 +612,7 @@ case "$XBPS_TARGET" in
fetch|extract|build|configure|install|pkg)
BEGIN_INSTALL=1
read_pkg
bootstrap_update
create_temporary_masterdir
if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then
chroot_handler $XBPS_TARGET $XBPS_TARGET_PKG