From 682d0e14aac18558b4caf059ff2cd908c01b858e Mon Sep 17 00:00:00 2001
From: Albert Hopkins <marduk@python.net>
Date: Sun, 17 Jul 2011 22:10:57 +0000
Subject: [PATCH] Fix problem where kernel.sh wasn't actually building a new
 kernel.

---
 Makefile  | 9 +++++++--
 kernel.sh | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 kernel.sh

diff --git a/Makefile b/Makefile
index 4ee82dd..b614ad3 100644
--- a/Makefile
+++ b/Makefile
@@ -154,8 +154,10 @@ kernel: base_system $(KERNEL_CONFIG) kernel.sh
 	echo $(TIMEZONE) > "$(CHROOT)"/etc/timezone
 ifneq ($(EXTERNAL_KERNEL),YES)
 	cp $(KERNEL_CONFIG) $(CHROOT)/root/kernel.config
+	cp kernel.sh $(CHROOT)/tmp/kernel.sh
 	KERNEL=$(KERNEL) EMERGE="$(EMERGE)" USEPKG="$(USEPKG)" MAKEOPTS="$(MAKEOPTS)" \
-	   $(inroot) /bin/sh < kernel.sh
+	   $(inroot) /bin/sh /tmp/kernel.sh
+	rm -f $(CHROOT)/tmp/kernel.sh
 endif
 	touch kernel
 
@@ -248,6 +250,9 @@ endif
 	$(change_password)
 ifeq ($(PRUNE_CRITICAL),YES)
 	$(inroot) $(EMERGE) -C `cat $(CRITICAL)`
+ifeq ($(DASH),YES)
+	$(inroot) $(EMERGE) -C app-shells/bash
+endif
 endif
 
 software: $(software-deps)
@@ -263,7 +268,7 @@ endif
 device-map: $(RAW_IMAGE)
 	echo '(hd0) ' $(RAW_IMAGE) > device-map
 
-image: software device-map grub.shell grub dev.tar.bz2 motd.sh
+image: kernel software device-map grub.shell grub dev.tar.bz2 motd.sh
 	mkdir -p loop
 	mount -o noatime $(NBD_DEV)p1 loop
 	mkdir -p gentoo
diff --git a/kernel.sh b/kernel.sh
old mode 100644
new mode 100755
index 9e1fb34..1f25af1
--- a/kernel.sh
+++ b/kernel.sh
@@ -9,6 +9,7 @@ then
     exit
 fi
 
+${EMERGE} ${USEPKG} --oneshot --noreplace dev-lang/perl
 ${EMERGE} ${USEPKG} sys-kernel/${KERNEL}
 cp /root/kernel.config /usr/src/linux/.config
 gcc-config 1
@@ -22,3 +23,4 @@ make ${MAKEOPTS} install
 cd /boot
 k=`/bin/ls -1 vmlinuz-*`
 ln -nsf $k vmlinuz
+${EMERGE} --depclean dev-lang/perl