Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=56c4a3e63e80df0e3c246b2d65af47098790c125
commit 56c4a3e63e80df0e3c246b2d65af47098790c125 Author: Michel Hermier <[email protected]> Date: Thu Nov 22 22:58:24 2012 +0100 scripts/makepkg * We can simply add create_pkg to the hook list now. * Create new chroot function. diff --git a/scripts/makepkg b/scripts/makepkg index dc39ec0..e9e6ad2 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -426,6 +426,13 @@ chroot_umount() { msg "Successfully umounted chroot directories." } +chroot_size() { + exclude="--exclude=/proc --exclude=/sys --exclude=/dev" + exclude="$exclude --exclude=/var/cache/pacman-g2 --exclude=/var/cache/ccache/$pkgname" + sudo du -sh $exclude / |sed "s/\t.*//" +} + + chroot_clean() { if [ "$CHROOT" = "1" ]; then @@ -2003,18 +2010,14 @@ else fi _P_subpkgsfixes+=(_pkg_check_links) - + _P_subpkgsfixes+=(create_pkg) pkg_foreach "${_P_subpkgsfixes[@]}" fi -pkg_foreach create_pkg - cd $startdir if [ "$CLEANUP" = "1" ]; then if [ "$INCHROOT" == "1" ]; then - exclude="--exclude=/proc --exclude=/sys --exclude=/dev" - exclude="$exclude --exclude=/var/cache/pacman-g2 --exclude=/var/cache/ccache/$pkgname" - msg "Chroot size before cleaning: $(sudo du -sh $exclude / |sed "s/\t.*//")" + msg "Chroot size before cleaning: $(chroot_size)" fi msg "Cleaning up..." pkg_rmdirs _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
