From 0e2fb5bda67c539fba2b6730e937bdc9940fa73c Mon Sep 17 00:00:00 2001 From: Albert Hopkins Date: Fri, 9 Jul 2010 20:22:55 -0400 Subject: [PATCH] Made Makefile a little bit smarter. --- Makefile | 16 +++++++++------- make.conf | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index b69762d..3aeefc7 100644 --- a/Makefile +++ b/Makefile @@ -42,19 +42,21 @@ parted: preproot: stage3 cp -L /etc/resolv.conf $(CHROOT)/etc/ mkdir -p $(CHROOT)/usr/portage - mount -t proc none $(CHROOT)/proc - mount -o bind /dev/ $(CHROOT)/dev - mount -o bind /var/tmp $(CHROOT)/var/tmp - mount -o bind $(PORTAGE) $(CHROOT)/usr/portage - mkdir -p $(CHROOT)/usr/portage/distfiles - mount -o bind $(DISTFILES) $(CHROOT)/usr/portage/distfiles + if [ ! -e preproot ] ; then \ + mount -t proc none $(CHROOT)/proc; \ + mount -o bind /dev $(CHROOT)/dev; \ + mount -o bind /var/tmp $(CHROOT)/var/tmp; \ + mount -o bind $(PORTAGE) $(CHROOT)/usr/portage; \ + mkdir -p $(CHROOT)/usr/portage/distfiles; \ + mount -o bind $(DISTFILES) $(CHROOT)/usr/portage/distfiles; \ + fi chroot $(CHROOT) locale-gen touch preproot stage3: make.conf package.use package.keywords locale.gen mkdir -p $(CHROOT) wget -c -q -nc $(STAGE3) - tar xvjpf stage3-*.tar.bz2 -C $(CHROOT) + test -e stage3 || tar xvjpf stage3-*.tar.bz2 -C $(CHROOT) cp make.conf $(CHROOT)/etc/make.conf cp locale.gen $(CHROOT)/etc/locale.gen mkdir -p $(CHROOT)/etc/portage diff --git a/make.conf b/make.conf index 77d4363..4c8592a 100644 --- a/make.conf +++ b/make.conf @@ -6,5 +6,5 @@ USE="-* nptl pam unicode" CLEAN_DELAY="0" AUTO_CLEAN="yes" EPAUSE_IGNORE="1" -EMERGE_DEFAULT_OPTS="--jobs=4" +EMERGE_DEFAULT_OPTS="--jobs --load-average=9.0" FEATURES="noinfo -test nodoc noman unmerge-orphans buildpkg"