grub: Replace patches to have grub-set-default again.

config/rootfiles/common/i586/grub

@@ -4,30 +4,29 @@ boot/grub/ipfire.xpm.gz
 boot/grub/stage1
 boot/grub/stage2
 #usr/bin/mbchk
+usr/lib/grub
+#usr/lib/grub/i386-pc
+#usr/lib/grub/i386-pc/e2fs_stage1_5
+#usr/lib/grub/i386-pc/fat_stage1_5
+#usr/lib/grub/i386-pc/ffs_stage1_5
+#usr/lib/grub/i386-pc/iso9660_stage1_5
+#usr/lib/grub/i386-pc/jfs_stage1_5
+#usr/lib/grub/i386-pc/minix_stage1_5
+#usr/lib/grub/i386-pc/reiserfs_stage1_5
+#usr/lib/grub/i386-pc/stage1
+#usr/lib/grub/i386-pc/stage2
+#usr/lib/grub/i386-pc/stage2_eltorito
+#usr/lib/grub/i386-pc/ufs2_stage1_5
+#usr/lib/grub/i386-pc/vstafs_stage1_5
+#usr/lib/grub/i386-pc/xfs_stage1_5
 usr/sbin/grub
-usr/sbin/grub-crypt
 usr/sbin/grub-install
 usr/sbin/grub-md5-crypt
+usr/sbin/grub-set-default
 usr/sbin/grub-terminfo
-usr/share/grub
-#usr/share/grub/i386-pc
-#usr/share/grub/i386-pc/e2fs_stage1_5
-#usr/share/grub/i386-pc/fat_stage1_5
-#usr/share/grub/i386-pc/ffs_stage1_5
-#usr/share/grub/i386-pc/iso9660_stage1_5
-#usr/share/grub/i386-pc/jfs_stage1_5
-#usr/share/grub/i386-pc/minix_stage1_5
-#usr/share/grub/i386-pc/reiserfs_stage1_5
-#usr/share/grub/i386-pc/stage1
-#usr/share/grub/i386-pc/stage2
-#usr/share/grub/i386-pc/stage2_eltorito
-#usr/share/grub/i386-pc/ufs2_stage1_5
-#usr/share/grub/i386-pc/vstafs_stage1_5
-#usr/share/grub/i386-pc/xfs_stage1_5
 #usr/share/info/grub.info
 #usr/share/info/multiboot.info
 #usr/share/man/man1/mbchk.1
-#usr/share/man/man8/grub-crypt.8
 #usr/share/man/man8/grub-install.8
 #usr/share/man/man8/grub-md5-crypt.8
 #usr/share/man/man8/grub-terminfo.8

lfs/grub

@@ -75,18 +75,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
 	# Applying patches.
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-fedora-18.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub-gentoo-14.patch
 	cd $(DIR_APP) && autoreconf
 	cd $(DIR_APP) && autoconf
 
 	# Build.
-	cd $(DIR_APP) && CFLAGS="$(CFLAGS)" ./configure --prefix=/usr
+	cd $(DIR_APP) && CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \
+		--disable-auto-linux-mem-opt
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
 	# grub files
 	mkdir -vp /boot/grub
-	cp -v /usr/share/grub/i386-pc/stage{1,2} /boot/grub
+	cp -v /usr/lib/grub/i386-pc/stage{1,2} /boot/grub
 	for i in $(DIR_SRC)/config/grub/*; do \
 	    [ -f $$i ] && cp -f $$i /boot/grub; \
 	done