Cleaned up Makefile and hopefully made it more modular. Added preinstall

and postinstall scripts for additional software

Makefile

@@ -1,5 +1,5 @@
 
-HOSTNAME=gstable
+HOSTNAME=gentoo
 RAW_IMAGE=$(HOSTNAME).img
 QCOW_IMAGE=$(HOSTNAME).qcow
 VMDK_IMAGE=$(HOSTNAME).vmdk
@@ -33,40 +33,60 @@ partitions: parted $(RAW_IMAGE)
 	$(PARTED) -s -a optimal $(RAW_IMAGE) mklabel msdos
 	$(PARTED) -s -a optimal $(RAW_IMAGE) mkpart primary ext4 0 $(DISK_SIZE)
 	$(PARTED) -s -a optimal $(RAW_IMAGE) set 1 boot on
+
+	qemu-nbd -c /dev/nbd1 $(RAW_IMAGE)
+	sleep 3
+	mkfs.ext4 /dev/nbd1p1
 	touch partitions
 
 parted:
 	emerge -n1 $(USEPKG) parted
 	touch parted
 
-preproot: stage3
-	cp -L /etc/resolv.conf $(CHROOT)/etc/ 
-	mkdir -p $(CHROOT)/usr/portage 
-	if [ ! -e preproot ] ; then \
+$(CHROOT):
+	mkdir -p $(CHROOT)
+
+mounts: $(CHROOT) stage3
+	if [ ! -e mounts ] ; then \
 		mount -t proc none $(CHROOT)/proc; \
 		mount -o bind /dev $(CHROOT)/dev; \
 		mount -o bind /var/tmp $(CHROOT)/var/tmp; \
+	fi
+	touch mounts
+
+portage: stage3
+	if [ ! -e portage ] ; then \
+		mkdir -p $(CHROOT)/usr/portage; \
 		mount -o bind $(PORTAGE) $(CHROOT)/usr/portage; \
 		mkdir -p $(CHROOT)/usr/portage/distfiles; \
-		mount -o bind $(DISTFILES) $(CHROOT)/usr/portage/distfiles; \
+		mount -o bind $(DISTFILES) $(CHROOT)/usr/portage/distfiles ; \
 	fi
-	chroot $(CHROOT) locale-gen 
+	touch portage
+
+preproot: stage3 mounts portage
+	cp -L /etc/resolv.conf $(CHROOT)/etc/
 	touch preproot
 
-stage3: make.conf package.use package.keywords locale.gen
-	mkdir -p $(CHROOT) 
+stage3: chroot
 	if [ ! -e stage3 ] ; then \
 		wget -c -q -nc $(STAGE3); \
-		tar xvjpf stage3-*.tar.bz2 -C $(CHROOT); \
+		tar xjpf stage3-*.tar.bz2 -C $(CHROOT); \
 	fi
+	touch stage3
+
+compile_options: make.conf package.use package.keywords locale.gen
 	cp make.conf $(CHROOT)/etc/make.conf
 	cp locale.gen $(CHROOT)/etc/locale.gen
+	chroot $(CHROOT) locale-gen
 	mkdir -p $(CHROOT)/etc/portage
 	cp package.use $(CHROOT)/etc/portage/package.use
 	cp package.keywords $(CHROOT)/etc/portage/package.keywords
-	touch stage3 
+	touch compile_options
 
-kernel: preproot kernel.config
+base_system: mounts compile_options
+	touch base_system
+
+kernel: base_system kernel.config
 	chroot $(CHROOT) cp /usr/share/zoneinfo/GMT /etc/localtime
 	chroot $(CHROOT) emerge -N sys-kernel/$(KERNEL)
 	cp kernel.config $(CHROOT)/usr/src/linux/.config
@@ -92,23 +112,17 @@ sysconfig: preproot fstab
 	echo 'config_eth0=( "dhcp" )' > $(CHROOT)/etc/conf.d/net
 	chroot $(CHROOT) rc-update add net.eth0 default
 	echo "127.0.0.1    $(HOSTNAME) localhost" > $(CHROOT)/etc/hosts
+	chroot $(CHROOT) passwd -d root
+	chroot $(CHROOT) passwd -e root
 	touch sysconfig
 
-systools: sysconfig world etc-update.conf
-	chroot $(CHROOT) emerge -n $(USEPKG) syslog-ng
+systools: sysconfig compile_options
+	chroot $(CHROOT) emerge -n $(USEPKG) app-admin/syslog-ng
 	chroot $(CHROOT) rc-update add syslog-ng default
-	chroot $(CHROOT) emerge -DN $(USEPKG) system
-	chroot $(CHROOT) emerge -Nn $(USEPKG) `cat world`
-	#chroot $(CHROOT) emerge -DuN $(USEPKG) world
-	chroot $(CHROOT) emerge --depclean --with-bdeps=n
-	chroot $(CHROOT) emerge -1n app-portage/gentoolkit
-	cp etc-update.conf $(CHROOT)/etc/
-	chroot $(CHROOT) revdep-rebuild -i
-	chroot $(CHROOT) etc-update
-	chroot $(CHROOT) emerge -C gentoolkit
+	chroot $(CHROOT) emerge -n $(USEPKG) net-misc/dhcpcd
 	touch systools
 
-grub: preproot grub.conf kernel
+grub: systools grub.conf kernel
 	chroot $(CHROOT) emerge -nN $(USEPKG) sys-boot/grub
 	cp grub.conf $(CHROOT)/boot/grub/grub.conf
 	if [ "$(VIRTIO)" == "YES" ] ; then \
@@ -116,27 +130,28 @@ grub: preproot grub.conf kernel
 	fi
 	touch grub
 
-software: systools issue critical
+software: systools issue etc-update.conf critical world preinstall postinstall
+	./preinstall "$(CHROOT)"
+	chroot $(CHROOT) emerge -DNn $(USEPKG) `cat world`
+	chroot $(CHROOT) emerge -DN $(USEPKG) system
+	chroot $(CHROOT) emerge -1n app-portage/gentoolkit
+	chroot $(CHROOT) revdep-rebuild -i
 	cp issue $(CHROOT)/etc/issue
+	cp etc-update.conf $(CHROOT)/etc/
+	chroot $(CHROOT) etc-update
 	chroot $(CHROOT) emerge --depclean --with-bdeps=n
 	chroot $(CHROOT) gcc-config 1
-	chroot $(CHROOT) passwd -d root
-	chroot $(CHROOT) passwd -e root
+	./postinstall "$(CHROOT)"
 	if [ "$(PRUNE_CRITICAL)" = "YES" ] ; then \
 		chroot $(CHROOT) emerge -C `cat critical` ; \
 	fi
 	touch software
 
-
 device-map: $(RAW_IMAGE)
 	echo '(hd0) ' $(RAW_IMAGE) > device-map
 
-
-image: $(RAW_IMAGE) partitions systools grub software device-map grub.shell
+image: $(RAW_IMAGE) grub partitions device-map grub.shell systools software
 	mkdir -p loop
-	qemu-nbd -c /dev/nbd1 $(RAW_IMAGE)
-	sleep 3
-	mkfs.ext4 /dev/nbd1p1
 	mount /dev/nbd1p1 loop/
 	mkdir -p gentoo
 	mount -o bind $(CHROOT) gentoo
@@ -170,11 +185,11 @@ $(VMDK_IMAGE): $(RAW_IMAGE) image
 
 vmdk: $(VMDK_IMAGE)
 
-
 .PHONY: qcow vmdk clean
 
 clean:
 	umount $(CHROOT)/usr/portage/distfiles $(CHROOT)/usr/portage $(CHROOT)/var/tmp $(CHROOT)/dev $(CHROOT)/proc || true
+	rm -f mounts compile_options base_system portage
 	rm -f parted grub stage3 software preproot sysconfig systools image kernel partitions device-map
 	rm -rf loop
 	rm -rf gentoo

postinstall

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+CHROOT="$1"

preinstall

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+CHROOT="$1"