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

Merge

This commit is contained in:
Albert Hopkins 2011-02-05 00:10:40 -05:00
parent 08e6aaf37d db1cc15a3b
commit 74ad01a19d
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -17,6 +17,7 @@ REMOVE_PORTAGE_TREE = YES
ENABLE_SSHD = NO ENABLE_SSHD = NO
CHANGE_PASSWORD = YES CHANGE_PASSWORD = YES
HEADLESS = NO HEADLESS = NO
EXTERNAL_KERNEL = NO
ACCEPT_KEYWORDS = amd64 ACCEPT_KEYWORDS = amd64
M4 = m4 M4 = m4
@ -142,8 +143,9 @@ compile_options: portage make.conf locale.gen $(PACKAGE_FILES)
base_system: mounts compile_options base_system: mounts compile_options
touch base_system touch base_system
$(CHROOT)/boot/vmlinuz: base_system $(KERNEL_CONFIG) kernel: base_system $(KERNEL_CONFIG)
chroot $(CHROOT) cp /usr/share/zoneinfo/$(TIMEZONE) /etc/localtime chroot $(CHROOT) cp /usr/share/zoneinfo/$(TIMEZONE) /etc/localtime
ifneq ($(EXTERNAL_KERNEL),YES)
chroot $(CHROOT) $(EMERGE) -n $(USEPKG) sys-kernel/$(KERNEL) chroot $(CHROOT) $(EMERGE) -n $(USEPKG) sys-kernel/$(KERNEL)
cp $(KERNEL_CONFIG) $(CHROOT)/usr/src/linux/.config cp $(KERNEL_CONFIG) $(CHROOT)/usr/src/linux/.config
$(gcc_config) $(gcc_config)
@ -154,6 +156,8 @@ $(CHROOT)/boot/vmlinuz: base_system $(KERNEL_CONFIG)
cd $(CHROOT)/boot ; \ cd $(CHROOT)/boot ; \
k=`/bin/ls -1 --sort=time vmlinuz-*|head -n 1` ; \ k=`/bin/ls -1 --sort=time vmlinuz-*|head -n 1` ; \
ln -nsf $$k vmlinuz ln -nsf $$k vmlinuz
endif
touch kernel
$(SWAP_FILE): preproot $(SWAP_FILE): preproot
dd if=/dev/zero of=$(SWAP_FILE) bs=1M count=$(SWAP_SIZE) dd if=/dev/zero of=$(SWAP_FILE) bs=1M count=$(SWAP_SIZE)
@ -188,11 +192,13 @@ systools: sysconfig compile_options
chroot $(CHROOT) $(EMERGE) -n $(USEPKG) net-misc/dhcpcd chroot $(CHROOT) $(EMERGE) -n $(USEPKG) net-misc/dhcpcd
touch systools touch systools
grub: systools grub.conf $(CHROOT)/boot/vmlinuz grub: systools grub.conf kernel
ifneq ($(EXTERNAL_KERNEL),YES)
chroot $(CHROOT) $(EMERGE) -nN $(USEPKG) sys-boot/grub chroot $(CHROOT) $(EMERGE) -nN $(USEPKG) sys-boot/grub
cp grub.conf $(CHROOT)/boot/grub/grub.conf cp grub.conf $(CHROOT)/boot/grub/grub.conf
$(VIRTIO_GRUB) $(VIRTIO_GRUB)
$(HEADLESS_GRUB) $(HEADLESS_GRUB)
endif
touch grub touch grub
software: systools issue etc-update.conf $(CRITICAL) $(WORLD) software: systools issue etc-update.conf $(CRITICAL) $(WORLD)
@ -231,7 +237,9 @@ image: $(RAW_IMAGE) grub partitions device-map grub.shell systools software
mkdir -p gentoo mkdir -p gentoo
mount -o bind $(CHROOT) gentoo mount -o bind $(CHROOT) gentoo
$(COPY_LOOP) $(COPY_LOOP)
ifneq ($(EXTERNAL_KERNEL),YES)
loop/sbin/grub --device-map=device-map --no-floppy --batch < grub.shell loop/sbin/grub --device-map=device-map --no-floppy --batch < grub.shell
endif
umount gentoo umount gentoo
rmdir gentoo rmdir gentoo
umount loop umount loop
@ -260,7 +268,7 @@ umount:
remove_checkpoints: remove_checkpoints:
rm -f mounts compile_options base_system portage sync_portage rm -f mounts compile_options base_system portage sync_portage
rm -f parted grub stage3 software preproot sysconfig systools image partitions device-map rm -f parted kernel grub stage3 software preproot sysconfig systools image partitions device-map
clean: umount remove_checkpoints clean: umount remove_checkpoints
rm -f umount rm -f umount