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

Makefile: remove "latest" from stage3 tarball name. 

Because it's not always the latest :P
This commit is contained in:
Albert Hopkins 2016-08-07 10:53:09 +00:00
parent cecf3d0582
commit 7a54cf9e1c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -122,22 +122,22 @@ endif
cp -L /etc/resolv.conf $(CHROOT)/etc/resolv.conf cp -L /etc/resolv.conf $(CHROOT)/etc/resolv.conf
touch $(PREPROOT) touch $(PREPROOT)
stage3-$(ARCH)-latest.tar.bz2: stage3-$(ARCH).tar.bz2:
@scripts/echo You do not have a stage3 tarball. Consider \"make sync_stage3\" @scripts/echo You do not have a stage3 tarball. Consider \"make sync_stage3\"
@exit 1 @exit 1
sync_stage3: sync_stage3:
./scripts/fetch-stage3 --specialty=systemd --outfile=stage3-$(ARCH)-latest.tar.bz2 $(ARCH) ./scripts/fetch-stage3 --specialty=systemd --outfile=stage3-$(ARCH).tar.bz2 $(ARCH)
$(STAGE3): stage3-$(ARCH)-latest.tar.bz2 $(STAGE3): stage3-$(ARCH).tar.bz2
mkdir -p $(CHROOT) mkdir -p $(CHROOT)
ifdef stage4-exists ifdef stage4-exists
@scripts/echo Using stage4 tarball: `basename $(STAGE4_TARBALL)` @scripts/echo Using stage4 tarball: `basename $(STAGE4_TARBALL)`
tar xpf "$(STAGE4_TARBALL)" -C $(CHROOT) tar xpf "$(STAGE4_TARBALL)" -C $(CHROOT)
else else
@scripts/echo Using stage3 tarball @scripts/echo Using stage3 tarball
tar xpf stage3-$(ARCH)-latest.tar.bz2 -C $(CHROOT) tar xpf stage3-$(ARCH).tar.bz2 -C $(CHROOT)
endif endif
rm -f $(CHROOT)/etc/localtime rm -f $(CHROOT)/etc/localtime
touch $(STAGE3) touch $(STAGE3)
@ -289,7 +289,7 @@ $(VMDK_IMAGE): $(RAW_IMAGE)
vmdk: $(VMDK_IMAGE) vmdk: $(VMDK_IMAGE)
$(STAGE4_TARBALL): $(PORTAGE_DIR) stage3-$(ARCH)-latest.tar.bz2 appliances/$(APPLIANCE) configs/rsync-excludes $(STAGE4_TARBALL): $(PORTAGE_DIR) stage3-$(ARCH).tar.bz2 appliances/$(APPLIANCE) configs/rsync-excludes
$(MAKE) $(STAGE3) $(MAKE) $(STAGE3)
$(MAKE) $(PREPROOT) $(MAKE) $(PREPROOT)
$(MAKE) $(SOFTWARE) $(MAKE) $(SOFTWARE)
@ -321,7 +321,7 @@ realclean: clean
distclean: distclean:
rm -f -- *.qcow *.img *.vmdk rm -f -- *.qcow *.img *.vmdk
rm -f latest-stage3.txt stage3-*-latest.tar.bz2 rm -f stage3-*.tar.bz2
rm -f portage-snapshot.tar.bz2 rm -f portage-snapshot.tar.bz2
appliance-list: appliance-list: