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

Makefile: use the git repo for the PORTAGE_DIR 

Now more rsync'ing snapshots.  We can just clone/pull the repo on github.
This commit is contained in:
Albert Hopkins 2015-12-17 21:25:59 +00:00
parent 45f3ee7a75
commit e867f3cf2e
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Makefile
View File

@ -43,7 +43,6 @@ M4_DEFS = -D HOSTNAME=$(HOSTNAME)
M4C = $(M4) $(M4_DEFS) M4C = $(M4) $(M4_DEFS)
USEPKG = --usepkg --binpkg-respect-use=y USEPKG = --usepkg --binpkg-respect-use=y
RSYNC_MIRROR = rsync://rsync.gtlib.gatech.edu/gentoo/ RSYNC_MIRROR = rsync://rsync.gtlib.gatech.edu/gentoo/
EMERGE_RSYNC = NO
KERNEL_PKG = gentoo-sources KERNEL_PKG = gentoo-sources
PACKAGE_FILES = $(wildcard appliances/$(APPLIANCE)/package.*) PACKAGE_FILES = $(wildcard appliances/$(APPLIANCE)/package.*)
WORLD = appliances/$(APPLIANCE)/world WORLD = appliances/$(APPLIANCE)/world
@ -65,7 +64,7 @@ endif
inroot := systemd-nspawn --quiet \ inroot := systemd-nspawn --quiet \
--directory=$(CHROOT) \ --directory=$(CHROOT) \
--machine=$(container) \ --machine=$(container) \
--bind=$(PORTAGE_DIR)/portage:/usr/portage \ --bind=$(PORTAGE_DIR):/usr/portage \
--bind=$(PKGDIR):/usr/portage/packages \ --bind=$(PKGDIR):/usr/portage/packages \
--bind=$(DISTDIR):/usr/portage/distfiles --bind=$(DISTDIR):/usr/portage/distfiles
@ -97,26 +96,14 @@ all: stage4
image: $(RAW_IMAGE) image: $(RAW_IMAGE)
portage-snapshot.tar.bz2: sync_portage: $(PORTAGE_DIR)
@scripts/echo You do not have a portage snapshot. Consider \"make sync_portage\" @scripts/echo Grabbing latest portage
@exit 1 git -C $(PORTAGE_DIR) pull
touch $(PORTAGE_DIR)
$(PORTAGE_DIR):
sync_portage: @scripts/echo Grabbing the portage tree
@scripts/echo Grabbing latest portage snapshot git clone --depth=1 git://github.com/gentoo/gentoo.git $(PORTAGE_DIR)
rsync --no-motd -L $(RSYNC_MIRROR)/snapshots/portage-latest.tar.bz2 portage-snapshot.tar.bz2
touch portage-snapshot.tar.bz2
$(PORTAGE_DIR): portage-snapshot.tar.bz2
@scripts/echo Unpacking portage snapshot
rm -rf $(PORTAGE_DIR)
mkdir $(PORTAGE_DIR)
tar xf portage-snapshot.tar.bz2 -C $(PORTAGE_DIR)
ifeq ($(EMERGE_RSYNC),YES)
@scripts/echo Syncing portage tree
$(inroot) emerge --sync --quiet
endif
$(PREPROOT): $(STAGE3) $(PORTAGE_DIR) configs/fstab $(PREPROOT): $(STAGE3) $(PORTAGE_DIR) configs/fstab
mkdir -p $(PKGDIR) $(DISTDIR) mkdir -p $(PKGDIR) $(DISTDIR)