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

Makefile: use /var/tmp instead of /tmp 

systemd (by default) opens with a clean /tmp, so copying a file into it
will get cleared out (it's a tmpfs mount).
This commit is contained in:
Albert Hopkins 2015-12-17 21:25:03 +00:00
parent 098369b404
commit 45f3ee7a75
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -12,13 +12,13 @@ VMDK_IMAGE = $(IMAGES)/$(APPLIANCE).vmdk
XVA_IMAGE = $(IMAGES)/$(APPLIANCE).xva XVA_IMAGE = $(IMAGES)/$(APPLIANCE).xva
LST_FILE = $(IMAGES)/$(APPLIANCE)-packages.lst LST_FILE = $(IMAGES)/$(APPLIANCE)-packages.lst
CHECKSUMS = $(IMAGES)/SHA256SUMS CHECKSUMS = $(IMAGES)/SHA256SUMS
STAGE3 = $(CHROOT)/tmp/stage3 STAGE3 = $(CHROOT)/var/tmp/stage3
COMPILE_OPTIONS = $(CHROOT)/tmp/compile_options COMPILE_OPTIONS = $(CHROOT)/var/tmp/compile_options
SOFTWARE = $(CHROOT)/tmp/software SOFTWARE = $(CHROOT)/var/tmp/software
KERNEL = $(CHROOT)/tmp/kernel KERNEL = $(CHROOT)/var/tmp/kernel
GRUB = $(CHROOT)/tmp/grub GRUB = $(CHROOT)/var/tmp/grub
PREPROOT = $(CHROOT)/tmp/preproot PREPROOT = $(CHROOT)/var/tmp/preproot
SYSTOOLS = $(CHROOT)/tmp/systools SYSTOOLS = $(CHROOT)/var/tmp/systools
STAGE4_TARBALL = $(VABUILDER_OUTPUT)/images/$(APPLIANCE).tar.xz STAGE4_TARBALL = $(VABUILDER_OUTPUT)/images/$(APPLIANCE).tar.xz
VIRTIO = NO VIRTIO = NO
TIMEZONE = UTC TIMEZONE = UTC
@ -223,8 +223,8 @@ $(SOFTWARE): $(STAGE3) $(SYSTOOLS) configs/eth.network configs/issue $(WORLD)
@scripts/echo Building $(APPLIANCE)-specific software @scripts/echo Building $(APPLIANCE)-specific software
$(MAKE) -C appliances/$(APPLIANCE) preinstall $(MAKE) -C appliances/$(APPLIANCE) preinstall
cp $(WORLD) $(CHROOT)/tmp/world cp $(WORLD) $(CHROOT)/var/tmp/world
$(inroot) xargs -a/tmp/world -d'\n' -r $(EMERGE) $(USEPKG) --update --newuse --deep $(inroot) xargs -a/var/tmp/world -d'\n' -r $(EMERGE) $(USEPKG) --update --newuse --deep
-$(gcc_config) -$(gcc_config)
@scripts/echo Running @preserved-rebuild @scripts/echo Running @preserved-rebuild