VA
/
virtual-appliance
1
0
Fork 0
Code Issues Pull Requests Releases 6 Wiki Activity

Makefile performance tweaks. Remove previous $(CHROOT)/usr/portage prior to unpacking.

This commit is contained in:
Albert Hopkins 2012-02-02 14:11:59 +00:00
parent 91ce20d98f
commit 9beba9e7be
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -14,7 +14,7 @@ DISK_SIZE = 6.0G
SWAP_SIZE = 30 SWAP_SIZE = 30
SWAP_FILE = $(CHROOT)/.swap SWAP_FILE = $(CHROOT)/.swap
ARCH = amd64 ARCH = amd64
MAKEOPTS = -j4 MAKEOPTS = -j10 -l10
PRUNE_CRITICAL = NO PRUNE_CRITICAL = NO
REMOVE_PORTAGE_TREE = YES REMOVE_PORTAGE_TREE = YES
ENABLE_SSHD = NO ENABLE_SSHD = NO
@ -28,7 +28,7 @@ ACCEPT_KEYWORDS = amd64
DASH = NO DASH = NO
M4 = m4 M4 = m4
EMERGE = /usr/bin/emerge EMERGE = /usr/bin/emerge --jobs
M4_DEFS = -D HOSTNAME=$(HOSTNAME) M4_DEFS = -D HOSTNAME=$(HOSTNAME)
M4C = $(M4) $(M4_DEFS) M4C = $(M4) $(M4_DEFS)
NBD_DEV = /dev/nbd0 NBD_DEV = /dev/nbd0
@ -89,12 +89,12 @@ $(RAW_IMAGE):
partitions: $(RAW_IMAGE) partitions: $(RAW_IMAGE)
parted -s $(RAW_IMAGE) mklabel gpt parted -s $(RAW_IMAGE) mklabel gpt
parted -s $(RAW_IMAGE) mkpart primary 0 $(DISK_SIZE) parted -s $(RAW_IMAGE) mkpart primary 1 $(DISK_SIZE)
parted -s $(RAW_IMAGE) set 1 boot on parted -s $(RAW_IMAGE) set 1 boot on
qemu-nbd -c $(NBD_DEV) $(RAW_IMAGE) qemu-nbd -c $(NBD_DEV) $(RAW_IMAGE)
sleep 3 sleep 3
mkfs.ext4 -O sparse_super,^has_journal -L "$(APPLIANCE)"_root $(NBD_DEV)p1 mkfs.ext4 -C 21504 -O sparse_super,^has_journal -L "$(APPLIANCE)"_root $(NBD_DEV)p1
touch partitions touch partitions
mounts: stage3 mounts: stage3
@ -111,6 +111,7 @@ sync_portage:
touch sync_portage touch sync_portage
portage: sync_portage stage3 portage: sync_portage stage3
rm -rf $(CHROOT)/usr/portage
tar xjf portage-latest.tar.bz2 -C $(CHROOT)/usr tar xjf portage-latest.tar.bz2 -C $(CHROOT)/usr
ifeq ($(EMERGE_RSYNC),YES) ifeq ($(EMERGE_RSYNC),YES)
$(inroot) emerge --sync --quiet $(inroot) emerge --sync --quiet