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

Various update to Makefile and make.conf.

This commit is contained in:
Albert Hopkins 2012-12-10 18:13:55 +00:00
parent 9ae6f0a243
commit 4eeb3c6028
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@ -40,6 +40,7 @@ PACKAGE_FILES = $(wildcard $(APPLIANCE)/package.*)
WORLD = $(APPLIANCE)/world WORLD = $(APPLIANCE)/world
EXTRA_WORLD = EXTRA_WORLD =
CRITICAL = $(APPLIANCE)/critical CRITICAL = $(APPLIANCE)/critical
DOWNLOAD_DIR = .downloads
# Allow appliance to override variables # Allow appliance to override variables
-include $(APPLIANCE)/$(APPLIANCE).cfg -include $(APPLIANCE)/$(APPLIANCE).cfg
@ -110,13 +111,14 @@ mounts: stage3
sync_portage: sync_portage:
@./echo Grabbing latest portage snapshot @./echo Grabbing latest portage snapshot
rsync --no-motd -L $(RSYNC_MIRROR)/snapshots/portage-latest.tar.bz2 portage-latest.tar.bz2 mkdir -p $(DOWNLOAD_DIR)
rsync --no-motd -L $(RSYNC_MIRROR)/snapshots/portage-latest.tar.bz2 $(DOWNLOAD_DIR)/portage-latest.tar.bz2
touch sync_portage touch sync_portage
portage: sync_portage stage3 portage: sync_portage stage3
@./echo Unpacking portage snapshot @./echo Unpacking portage snapshot
rm -rf $(CHROOT)/usr/portage rm -rf $(CHROOT)/usr/portage
tar xjf portage-latest.tar.bz2 -C $(CHROOT)/usr tar xjf $(DOWNLOAD_DIR)/portage-latest.tar.bz2 -C $(CHROOT)/usr
ifeq ($(EMERGE_RSYNC),YES) ifeq ($(EMERGE_RSYNC),YES)
@./echo Syncing portage tree @./echo Syncing portage tree
$(inroot) emerge --sync --quiet $(inroot) emerge --sync --quiet
@ -138,19 +140,20 @@ ifdef stage4-exists
@./echo Using stage4 tarball: $(STAGE4_TARBALL) @./echo Using stage4 tarball: $(STAGE4_TARBALL)
tar xapf "$(STAGE4_TARBALL)" -C $(CHROOT) tar xapf "$(STAGE4_TARBALL)" -C $(CHROOT)
else else
rsync --no-motd $(RSYNC_MIRROR)/releases/`echo $(ARCH)|sed 's/i.86/x86/'`/autobuilds/latest-stage3.txt . mkdir -p $(DOWNLOAD_DIR)
rsync --no-motd $(RSYNC_MIRROR)/releases/`echo $(ARCH)|sed 's/i.86/x86/'`/autobuilds/`tail -n 1 latest-stage3.txt` stage3-$(ARCH)-latest.tar.bz2 rsync --no-motd $(RSYNC_MIRROR)/releases/`echo $(ARCH)|sed 's/i.86/x86/'`/autobuilds/latest-stage3.txt $(DOWNLOAD_DIR)
rsync --no-motd $(RSYNC_MIRROR)/releases/`echo $(ARCH)|sed 's/i.86/x86/'`/autobuilds/`tail -n 1 $(DOWNLOAD_DIR)/latest-stage3.txt` $(DOWNLOAD_DIR)/stage3-$(ARCH)-latest.tar.bz2
@./echo Using stage3 tarball @./echo Using stage3 tarball
tar xjpf stage3-$(ARCH)-latest.tar.bz2 -C $(CHROOT) tar xjpf $(DOWNLOAD_DIR)/stage3-$(ARCH)-latest.tar.bz2 -C $(CHROOT)
endif endif
touch stage3 touch stage3
compile_options: portage make.conf locale.gen $(PACKAGE_FILES) compile_options: portage make.conf locale.gen $(PACKAGE_FILES)
cp make.conf $(CHROOT)/etc/make.conf cp make.conf $(CHROOT)/etc/portage/make.conf
ifdef PKGDIR ifdef PKGDIR
echo PKGDIR="/var/portage/packages" >> $(CHROOT)/etc/make.conf echo PKGDIR="/var/portage/packages" >> $(CHROOT)/etc/portage/make.conf
endif endif
echo ACCEPT_KEYWORDS=$(ACCEPT_KEYWORDS) >> $(CHROOT)/etc/make.conf echo ACCEPT_KEYWORDS=$(ACCEPT_KEYWORDS) >> $(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
@ -228,7 +231,7 @@ endif
grub: stage3 grub.conf kernel partitions grub: stage3 grub.conf kernel partitions
ifneq ($(EXTERNAL_KERNEL),YES) ifneq ($(EXTERNAL_KERNEL),YES)
@./echo Installing Grub @./echo Installing Grub
$(inroot) $(EMERGE) -nN $(USEPKG) sys-boot/grub $(inroot) $(EMERGE) -nN $(USEPKG) sys-boot/grub-static
cp grub.conf $(CHROOT)/boot/grub/grub.conf cp grub.conf $(CHROOT)/boot/grub/grub.conf
ifeq ($(VIRTIO),YES) ifeq ($(VIRTIO),YES)
sed -i 's/sda/vda/' $(CHROOT)/boot/grub/grub.conf sed -i 's/sda/vda/' $(CHROOT)/boot/grub/grub.conf
@ -246,7 +249,7 @@ build-software: systools issue etc-update.conf $(CRITICAL) $(WORLD)
# some packages, like, tar need xz-utils to unpack, but it not part of # some packages, like, tar need xz-utils to unpack, but it not part of
# the stage3 so may not be installed yet # the stage3 so may not be installed yet
$(inroot) $(EMERGE) -1n $(USEPKG) app-arch/xz-utils #$(inroot) $(EMERGE) -1n $(USEPKG) app-arch/xz-utils
$(inroot) $(EMERGE) $(USEPKG) --update --newuse --deep `cat $(WORLD)` $(EXTRA_WORLD) $(inroot) $(EMERGE) $(USEPKG) --update --newuse --deep `cat $(WORLD)` $(EXTRA_WORLD)
$(gcc_config) $(gcc_config)
@ -261,7 +264,7 @@ build-software: systools issue etc-update.conf $(CRITICAL) $(WORLD)
$(inroot) $(EMERGE) $(USEPKG) --update --newuse --deep world $(inroot) $(EMERGE) $(USEPKG) --update --newuse --deep world
$(inroot) $(EMERGE) --depclean --with-bdeps=n $(inroot) $(EMERGE) --depclean --with-bdeps=n
$(gcc_config) $(gcc_config)
$(inroot) etc-update EDITOR=/usr/bin/nano $(inroot) etc-update
$(MAKE) -C $(APPLIANCE) postinstall $(MAKE) -C $(APPLIANCE) postinstall
ifeq ($(ENABLE_SSHD),YES) ifeq ($(ENABLE_SSHD),YES)
$(inroot) /sbin/rc-update add sshd default $(inroot) /sbin/rc-update add sshd default

4
make.conf
View File

@ -1,5 +1,5 @@
CFLAGS="-Os -pipe" CFLAGS="-Os"
CXXFLAGS="-Os -pipe" CXXFLAGS="-Os"
CHOST="x86_64-pc-linux-gnu" CHOST="x86_64-pc-linux-gnu"
MAKEOPTS="-j2" MAKEOPTS="-j2"
USE="-* nptl pam unicode" USE="-* nptl pam unicode"