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

s/PKGDIR/VA_PKGDIR/

This commit is contained in:
Albert Hopkins 2018-10-26 23:26:16 -07:00
parent cac3d36946
commit fe6a9b46fb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -1,7 +1,7 @@
APPLIANCE ?= base APPLIANCE ?= base
VABUILDER_OUTPUT := $(CURDIR) VABUILDER_OUTPUT := $(CURDIR)
CHROOT = $(VABUILDER_OUTPUT)/build/$(APPLIANCE) CHROOT = $(VABUILDER_OUTPUT)/build/$(APPLIANCE)
PKGDIR = $(VABUILDER_OUTPUT)/packages VA_PKGDIR = $(VABUILDER_OUTPUT)/packages
DISTDIR = $(CURDIR)/distfiles DISTDIR = $(CURDIR)/distfiles
PORTAGE_DIR = $(CURDIR)/portage PORTAGE_DIR = $(CURDIR)/portage
HOSTNAME = $(APPLIANCE) HOSTNAME = $(APPLIANCE)
@ -65,7 +65,7 @@ inroot := systemd-nspawn --quiet \
--directory=$(CHROOT) \ --directory=$(CHROOT) \
--machine=$(container) \ --machine=$(container) \
--bind=$(PORTAGE_DIR):/usr/portage \ --bind=$(PORTAGE_DIR):/usr/portage \
--bind=$(PKGDIR):/usr/portage/packages \ --bind=$(VA_PKGDIR):/usr/portage/packages \
--bind=$(DISTDIR):/usr/portage/distfiles --bind=$(DISTDIR):/usr/portage/distfiles
ifeq ($(VA_ARCH),x86) ifeq ($(VA_ARCH),x86)
@ -90,7 +90,7 @@ export APPLIANCE ACCEPT_KEYWORDS CHROOT EMERGE HEADLESS M4 M4C inroot
export HOSTNAME MAKEOPTS TIMEZONE USEPKG WORLD export HOSTNAME MAKEOPTS TIMEZONE USEPKG WORLD
export USEPKG RSYNC_MIRROR export USEPKG RSYNC_MIRROR
unexport PKGDIR VA_ARCH unexport VA_PKGDIR VA_ARCH
all: stage4 all: stage4
@ -106,7 +106,7 @@ $(PORTAGE_DIR):
git clone --depth=1 git://github.com/gentoo/gentoo.git $(PORTAGE_DIR) git clone --depth=1 git://github.com/gentoo/gentoo.git $(PORTAGE_DIR)
$(PREPROOT): $(STAGE3) $(PORTAGE_DIR) configs/fstab $(PREPROOT): $(STAGE3) $(PORTAGE_DIR) configs/fstab
mkdir -p $(PKGDIR) $(DISTDIR) mkdir -p $(VA_PKGDIR) $(DISTDIR)
cp configs/fstab $(CHROOT)/etc/fstab cp configs/fstab $(CHROOT)/etc/fstab
ifeq ($(VIRTIO),YES) ifeq ($(VIRTIO),YES)
sed -i 's/sda/vda/' $(CHROOT)/etc/fstab sed -i 's/sda/vda/' $(CHROOT)/etc/fstab