Allow images/packages to build in a different directory

By setting the VABUILDER_OUTPUT Makefile variable, one can have images
and packages saved to and retrieved from that directory instead of the
default (CURDIR).  This can be use to, e.g., have different profile's
builds in different directories (instead of having to give images
different filenames, etc.).
This commit is contained in:
Albert Hopkins 2015-09-14 10:00:37 +00:00
parent 2a241978ee
commit 24be5ce588
1 changed files with 4 additions and 3 deletions

View File

@ -1,10 +1,11 @@
APPLIANCE ?= base APPLIANCE ?= base
CHROOT = $(CURDIR)/build CHROOT = $(CURDIR)/build
PKGDIR = $(CURDIR)/packages VABUILDER_OUTPUT := $(CURDIR)
PKGDIR = $(VABUILDER_OUTPUT)/packages
DISTDIR = $(CURDIR)/distfiles DISTDIR = $(CURDIR)/distfiles
PORTAGE_DIR = $(CURDIR)/portage PORTAGE_DIR = $(CURDIR)/portage
HOSTNAME = $(APPLIANCE) HOSTNAME = $(APPLIANCE)
IMAGES = $(CURDIR)/images IMAGES = $(VABUILDER_OUTPUT)/images
RAW_IMAGE = $(IMAGES)/$(APPLIANCE).img RAW_IMAGE = $(IMAGES)/$(APPLIANCE).img
QCOW_IMAGE = $(IMAGES)/$(APPLIANCE).qcow QCOW_IMAGE = $(IMAGES)/$(APPLIANCE).qcow
VMDK_IMAGE = $(IMAGES)/$(APPLIANCE).vmdk VMDK_IMAGE = $(IMAGES)/$(APPLIANCE).vmdk
@ -18,7 +19,7 @@ KERNEL = $(CHROOT)/tmp/kernel
GRUB = $(CHROOT)/tmp/grub GRUB = $(CHROOT)/tmp/grub
PREPROOT = $(CHROOT)/tmp/preproot PREPROOT = $(CHROOT)/tmp/preproot
SYSTOOLS = $(CHROOT)/tmp/systools SYSTOOLS = $(CHROOT)/tmp/systools
STAGE4_TARBALL = $(CURDIR)/images/$(APPLIANCE).tar.xz STAGE4_TARBALL = $(VABUILDER_OUTPUT)/images/$(APPLIANCE).tar.xz
VIRTIO = NO VIRTIO = NO
TIMEZONE = UTC TIMEZONE = UTC
DISK_SIZE = 6.0G DISK_SIZE = 6.0G