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

Merge with 32bit work.

This commit is contained in:
Albert Hopkins 2012-12-23 07:36:15 +00:00
parent dbc12919e5 efb798385f
commit 0a5d4f7fc7
5 changed files with 843 additions and 348 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -7,13 +7,13 @@ VMDK_IMAGE = $(HOSTNAME).vmdk
XVA_IMAGE = $(HOSTNAME).xva XVA_IMAGE = $(HOSTNAME).xva
LST_FILE = $(HOSTNAME)-packages.lst LST_FILE = $(HOSTNAME)-packages.lst
STAGE4_TARBALL = stage4/$(HOSTNAME)-stage4.tar.xz STAGE4_TARBALL = stage4/$(HOSTNAME)-stage4.tar.xz
KERNEL_CONFIG = kernel.config
VIRTIO = NO VIRTIO = NO
TIMEZONE = UTC TIMEZONE = UTC
DISK_SIZE = 6.0G DISK_SIZE = 6.0G
SWAP_SIZE = 30 SWAP_SIZE = 30
SWAP_FILE = $(CHROOT)/.swap SWAP_FILE = $(CHROOT)/.swap
ARCH = amd64 ARCH = amd64
KERNEL_CONFIG = kernel.config.$(ARCH)
MAKEOPTS = -j10 -l10 MAKEOPTS = -j10 -l10
PRUNE_CRITICAL = NO PRUNE_CRITICAL = NO
REMOVE_PORTAGE_TREE = YES REMOVE_PORTAGE_TREE = YES
@ -49,6 +49,10 @@ DOWNLOAD_DIR = .downloads
-include $(profile).cfg -include $(profile).cfg
inroot := chroot $(CHROOT) inroot := chroot $(CHROOT)
ifeq ($(ARCH),x86)
inroot := linux32 $(inroot)
endif
stage4-exists := $(wildcard $(STAGE4_TARBALL)) stage4-exists := $(wildcard $(STAGE4_TARBALL))
software-deps := stage3 software-deps := stage3
@ -148,13 +152,13 @@ else
endif endif
touch stage3 touch stage3
compile_options: portage make.conf locale.gen $(PACKAGE_FILES) compile_options: portage make.conf.$(ARCH) locale.gen $(PACKAGE_FILES)
cp make.conf $(CHROOT)/etc/portage/make.conf cp make.conf.$(ARCH) $(CHROOT)/etc/portage/make.conf
ifdef PKGDIR ifdef PKGDIR
echo PKGDIR="/var/portage/packages" >> $(CHROOT)/etc/portage/make.conf echo PKGDIR="/var/portage/packages" >> $(CHROOT)/etc/portage/make.conf
endif endif
echo ACCEPT_KEYWORDS=$(ACCEPT_KEYWORDS) >> $(CHROOT)/etc/portage/make.conf echo ACCEPT_KEYWORDS=$(ACCEPT_KEYWORDS) >> $(CHROOT)/etc/portage/make.conf
[ -f "$(APPLIANCE)/make.conf" ] && cat "$(APPLIANCE)/make.conf" >> $(CHROOT)/etc/portage/make.conf -[ -f "$(APPLIANCE)/make.conf" ] && cat "$(APPLIANCE)/make.conf" >> $(CHROOT)/etc/portage/make.conf
cp locale.gen $(CHROOT)/etc/locale.gen cp locale.gen $(CHROOT)/etc/locale.gen
$(inroot) locale-gen $(inroot) locale-gen
mkdir -p $(CHROOT)/etc/portage mkdir -p $(CHROOT)/etc/portage

0
kernel.config → kernel.config.amd64
View File

1165
kernel.config.testing → kernel.config.x86
View File

File diff suppressed because it is too large Load Diff

0
make.conf → make.conf.amd64
View File

14
make.conf.x86 Normal file
View File

@ -0,0 +1,14 @@
CFLAGS="-Os"
CXXFLAGS="-Os"
CHOST="i686-pc-linux-gnu"
MAKEOPTS="-j2"
USE="-* nptl pam unicode"
ALSA_PCM_PLUGINS="*"
CLEAN_DELAY="0"
EMERGE_WARNING_DELAY="0"
AUTO_CLEAN="yes"
EPAUSE_IGNORE="1"
EMERGE_DEFAULT_OPTS="--jobs=2 --autounmask=n"
FEATURES="noinfo -test nodoc noman unmerge-orphans buildpkg notitles parallel-fetch"
CURL_SSL="openssl"
PYTHON_TARGETS="python2_7"