Per bug #160801, Grub needs modification to support kernels larger than 3Mb. However, this may have negative consequences, so the actual value is configurable at compile-time via the GRUB_MAX_KERNEL_SIE environment variable.

Package-Manager: portage-2.1.4.4

3 files changed, 31 insertions, 14 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index dde40274222e..e2b10c25eef8 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.84 2008/03/29 01:28:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.85 2008/03/30 05:12:38 robbat2 Exp $
+
+  30 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> grub-0.97-r5.ebuild:
+  Per bug #160801, Grub needs modification to support kernels larger than
+  3Mb. However, this may have negative consequences, so the actual value is
+  configurable at compile-time via the GRUB_MAX_KERNEL_SIZE environment
+  variable.
 
   29 Mar 2008; Mike Frysinger <vapier@gentoo.org> grub-0.97-r5.ebuild:
   Pull in app-emulation/emul-linux-x86-baselibs for USE=ncurses on amd64 #128249.
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index a45cffd92666..4ce2c35ca354 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX grub-0.97-gpt.patch 10682 RMD160 53dd38d52f2b38fb28dfb670d6fd27e47a562bbb SHA1 6057a076110d469fb63e56e57711d281221f9b42 SHA256 5e38046cfb727420e5b4b19d71c7fb4ddff22cbcc356c9f888763b0c1963d389
 AUX grub-1.95-build.patch 522 RMD160 eec01af7250a0883604530f321b154c575b14c41 SHA1 6f93b47a212ed0b3fb807bcf96e04792fa196ba1 SHA256 26d45247376f1e42b4197088161146173ea5bee3800282a707b331c49aed6ccf
 DIST grub-0.92-gentoo-0.2.tar.bz2 21727 RMD160 f420e3352d46fdfb77a1121879382265805bc3ef SHA1 1bb1463067679aab909d1bd96996cfa72556de81 SHA256 f579b49b2d24702905c333ce2b6170a554ce26d0232c65478a21a1fd2eb8b8fe
@@ -26,15 +23,8 @@ EBUILD grub-0.96-r3.ebuild 4580 RMD160 f0c3d0697bf808afa9e24c9a0acb007b8473e53b
 EBUILD grub-0.97-r2.ebuild 4854 RMD160 e78aaa77647ba2d658b9a89e1926110997ce4b2b SHA1 a63f69d34080940651bd3cd928cd18a0ac9402ab SHA256 d15e83fdb06d5a9d4cce0a84352ca4a20bc3cc5dd7861a12f1a1a500dea25429
 EBUILD grub-0.97-r3.ebuild 4723 RMD160 0becf2078d55ca28738106765ea54742c2aa209b SHA1 c0ce849f7273c070fed44cc4acddb2fecce6c2e5 SHA256 5f96e99ae205c151ea672842b5fd1708541d4efe16f79c03baf70fac5b1301b9
 EBUILD grub-0.97-r4.ebuild 4967 RMD160 a24281663a2b5ca3452a044f18dcd1a231870812 SHA1 01cecc3f8505585fc28519ead7d524c3ace778b5 SHA256 1c40a3df3ba6b09ecce9f9d4bc934d342e23d19c5fc1c5eccda589e219bf6e8e
-EBUILD grub-0.97-r5.ebuild 5174 RMD160 3a657d8ad8e6115fecd4e56597adb53955239412 SHA1 8e26d3a7f92c8db853bb363e74dc58adc1599a1d SHA256 9c533d62d476dc9a04034ee0b93bbf1f045a2c63308c1742341b19dc4d53d741
+EBUILD grub-0.97-r5.ebuild 6014 RMD160 43b212169ea61c5ab186b82f8b5e960f7d5dcf83 SHA1 9a6a8bf3bd113815eadbc040049f58535093fb96 SHA256 1643130a9aadfc3528580e069d305e2b4a7cc971ee657833ad58652a9e83df3c
 EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a
 EBUILD grub-1.96.ebuild 956 RMD160 f462517b57bda30e9e4b64c43e691099d0beeb9a SHA1 55629e1cf96e29ff702c36d579c08c7487708698 SHA256 8bb370a35d006fa89133863c0393b6356be8e8f66ad3f34f63750624d9b46cb4
-MISC ChangeLog 20388 RMD160 0717c9c71571f08ef79d5658eccfab33ccda2596 SHA1 d606111543b00fe35316b71cf046e1c3e9ab6049 SHA256 eece61a41d8f36694b166c80c27eed0ba66ad6ba2a3c583e2a5d09570c88aace
+MISC ChangeLog 20698 RMD160 ea82a8e0bb3127253a1995c3073322e354d05e68 SHA1 1d31379462e5943b6a0cd9fc942952cf2de1cabf SHA256 9d211ad295f1eea02ec723c85e5f0a37dbc52a94ef957fad7e326b5843964611
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH7Zwdj9hvisErhMIRAjzaAKDnNR9ihLFtkK4pZTNE2uRrMGz9AQCginN6
-x+v033DEKU0HZuMDEp6qQ44=
-=bR6g
------END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-0.97-r5.ebuild b/sys-boot/grub/grub-0.97-r5.ebuild
index 62e26ab89760..9c7fa880b9bc 100644
--- a/sys-boot/grub/grub-0.97-r5.ebuild
+++ b/sys-boot/grub/grub-0.97-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild,v 1.3 2008/03/29 01:28:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild,v 1.4 2008/03/30 05:12:38 robbat2 Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs autotools
 
@@ -30,6 +30,27 @@ src_unpack() {
 	# patch breaks booting for some people #111885
 	rm "${WORKDIR}"/patch/400_*
 
+	# Grub will not handle a kernel larger than EXTENDED_MEMSIZE Mb as
+	# discovered in bug 160801. We can change this, however, using larger values
+	# for this variable means that Grub needs more memory to run and boot. For a
+	# kernel of size N, Grub needs (N+1)*2.  Advanced users should set a custom
+	# value in make.conf, it is possible to make kernels ~16Mb in size, but it
+	# needs the kitchen sink built-in.
+	local t="custom"
+	if [[ -z "$GRUB_MAX_KERNEL_SIZE" ]]; then
+		case $ARCH in
+			amd64*) GRUB_MAX_KERNEL_SIZE=7 ;;
+			x86*)	GRUB_MAX_KERNEL_SIZE=3 ;;
+		esac
+		t="default"
+	fi
+	einfo "Grub will support the ${t} maximum kernel size of ${GRUB_MAX_KERNEL_SIZE} Mb (GRUB_MAX_KERNEL_SIZE)"
+
+	sed -i \
+		-e "/^#define.*EXTENDED_MEMSIZE/s,3,${GRUB_MAX_KERNEL_SIZE},g" \
+		"${S}"/grub/asmstub.c \
+		|| die "Failed to hack memory size"
+
 	if [[ -n ${PATCHVER} ]] ; then
 		EPATCH_SUFFIX="patch"
 		epatch "${WORKDIR}"/patch