Bug #239224, version bump to match current non-static build. See bug for full list of fixes. Beware /boot/grub/splash.xpm.gz sometimes vanishing due to a Portage bug. Make SURE you follow the upgrade instructions or you might end up with a non-booting box.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64

3 files changed, 149 insertions, 12 deletions

diff --git a/sys-boot/grub-static/ChangeLog b/sys-boot/grub-static/ChangeLog
index f04de2f8f714..2c85bca248df 100644
--- a/sys-boot/grub-static/ChangeLog
+++ b/sys-boot/grub-static/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-boot/grub-static
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.14 2008/02/25 22:13:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.15 2008/10/27 10:50:08 robbat2 Exp $
+
+*grub-static-0.97-r6 (27 Oct 2008)
+
+  27 Oct 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +grub-static-0.97-r6.ebuild:
+  Bug #239224, version bump to match current non-static build. See bug for
+  full list of fixes. Beware /boot/grub/splash.xpm.gz sometimes vanishing
+  due to a Portage bug. Make SURE you follow the upgrade instructions or you
+  might end up with a non-booting box.
 
   25 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   grub-static-0.97.ebuild:
diff --git a/sys-boot/grub-static/Manifest b/sys-boot/grub-static/Manifest
index 8c6ce0aaceb1..fe8c0cc50bac 100644
--- a/sys-boot/grub-static/Manifest
+++ b/sys-boot/grub-static/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST grub-static-0.96.tar.bz2 859179 RMD160 799759e6e4771527e5daf6dfbe7de647482229d4 SHA1 e334fe0429b215ce726b0c42c5ca12e13c858157 SHA256 3ece8910e7954ca2c2cbebc4d05cfb22e73455f826508661a5b1a60481dcbd76
+DIST grub-static-0.97-r6.tar.bz2 1005650 RMD160 ed651f766ba1adfd98a5cd4cd1e7e3fd886fd785 SHA1 67b004a4411a02963a90b8e40755d3987421675e SHA256 1a17a8df6839401f7d1829aebea45c1654c3fcdd6a6f068100126d2fcbe75698
 DIST grub-static-0.97.tar.bz2 954051 RMD160 3b4d3951df5ab0255321631dd383803bb2302977 SHA1 aaddbe5f31788cd6e46a0e76219b76ae14ac062a SHA256 468ac48823880bd7cb2dd6bf60673adef1313c44a5e3131a0a4a37d2cc1145bc
 EBUILD grub-static-0.96-r1.ebuild 525 RMD160 1db51afc5990529daec430447c1a0f0a1d8bf9b7 SHA1 621aca72148f7a701bea3ced135961c2c29ce5bd SHA256 f7a3c6a239fed5b54b1ea246700576731b016f525e2204c5c2b196bc312780ef
+EBUILD grub-static-0.97-r6.ebuild 4446 RMD160 0a672990835585860b6f934bf916ef44c4638235 SHA1 441fbea3cd3a573b78dba2357f0b75f279a8967d SHA256 7f7fa0b1f2c0e3fcb9524790d1d8069f1831d6dd6f2f0f107657f4f92b6381ac
 EBUILD grub-static-0.97.ebuild 2039 RMD160 4619b70df076072f36622476e35d47988bf884b3 SHA1 6dee6599dde71c33b2c1142b120e966f86e68fc9 SHA256 41704a8a311c69182ff2eabd23ab281324af5b6ad879906c9b2e3332273aaddf
-MISC ChangeLog 2032 RMD160 f5cfeac069c8aa9510c075472ecb73c9a72f7ced SHA1 1bdfefec4ca7e79e3942f4b2128f7a1791b4dc3d SHA256 6cbf58a202161eead5769b214f2d24bcb19880d50e4d3472f54f0bc91c606184
+MISC ChangeLog 2417 RMD160 06ef0429d8f675da247b62dda734b67de4d3fdc0 SHA1 7ad349e88a6b040fe7542ce12d8f3e8961af14ac SHA256 6182c855fb0cf20d867c7a4c0dfb18bb48280b72de8acf3fd7c31cdc3002223b
 MISC metadata.xml 158 RMD160 d823c6f24034325d607a095ce2851034d70fd2f2 SHA1 7e7b3c2aedeb5fa2761c27cf8f56b5240ae9678e SHA256 0df9eb61f6a4e4a3f8fc16386b0204e22e85940533d769d4a0418a4ecec50d90
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHwz2CkT4lNIS36YERAsS8AKCj3qGPxo6JiN9aS6xWkoGEZT1oQgCfSYjv
-8QGAgmMKXy6c9V90r9EBAQs=
-=ZcWh
------END PGP SIGNATURE-----
diff --git a/sys-boot/grub-static/grub-static-0.97-r6.ebuild b/sys-boot/grub-static/grub-static-0.97-r6.ebuild
new file mode 100644
index 000000000000..b4a63d65abab
--- /dev/null
+++ b/sys-boot/grub-static/grub-static-0.97-r6.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r6.ebuild,v 1.1 2008/10/27 10:50:08 robbat2 Exp $
+
+# XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
+#      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
+#      we never updated any of the source code (it still all wants menu.lst),
+#      and there is no indication that upstream is making the transition.
+
+inherit mount-boot
+
+PATCHVER="1.7" # Not used, just for tracking with main grub
+
+DESCRIPTION="GNU GRUB Legacy boot loader (static build)"
+
+HOMEPAGE="http://www.gnu.org/software/grub/"
+SRC_URI="mirror://gentoo/${PF}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+DEPEND="!sys-boot/grub"
+PROVIDE="virtual/bootloader"
+
+src_install() {
+	cp -a "${WORKDIR}"/* "${D}"/
+}
+
+#
+# Below this point, everything is also used in grub-static!
+# Please keep in sync!
+# 
+
+setup_boot_dir() {
+	local boot_dir=$1
+	local dir=${boot_dir}
+
+	[[ ! -e ${dir} ]] && die "${dir} does not exist!"
+	[[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot"
+	dir="${dir}/grub"
+	if [[ ! -e ${dir} ]] ; then
+		mkdir "${dir}" || die "${dir} does not exist!"
+	fi
+
+	# change menu.lst to grub.conf
+	if [[ ! -e ${dir}/grub.conf ]] && [[ -e ${dir}/menu.lst ]] ; then
+		mv -f "${dir}"/menu.lst "${dir}"/grub.conf
+		ewarn
+		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
+		ewarn
+	fi
+
+	if [[ ! -e ${dir}/menu.lst ]]; then
+		einfo "Linking from new grub.conf name to menu.lst"
+		ln -snf grub.conf "${dir}"/menu.lst
+	fi
+
+	if [[ -e ${dir}/stage2 ]] ; then
+		mv "${dir}"/stage2{,.old}
+		ewarn "*** IMPORTANT NOTE: you must run grub and install"
+		ewarn "the new version's stage1 to your MBR.  Until you do,"
+		ewarn "stage1 and stage2 will still be the old version, but"
+		ewarn "later stages will be the new version, which could"
+		ewarn "cause problems such as an unbootable system."
+		ewarn "This means you must use either grub-install or perform"
+		ewarn "root/setup manually! For more help, see the handbook:"
+		ewarn "http://www.gentoo.org/doc/en/handbook/handbook-${ARCH}.xml?part=1&chap=10#grub-install-auto"
+		ebeep
+	fi
+
+	einfo "Copying files from /lib/grub, /usr/lib/grub and /usr/share/grub to ${dir}"
+	for x in \
+		"${ROOT}"/lib*/grub/*/* \
+		"${ROOT}"/usr/lib*/grub/*/* \
+		"${ROOT}"/usr/share/grub/* ; do
+		[[ -f ${x} ]] && cp -p "${x}" "${dir}"/
+	done
+
+	if [[ ! -e ${dir}/grub.conf ]] ; then
+		s="${ROOT}/usr/share/doc/${PF}/grub.conf.gentoo"
+		[[ -e "${s}" ]] && cat "${s}" >${dir}/grub.conf
+		[[ -e "${s}.gz" ]] && zcat "${s}.gz" >${dir}/grub.conf
+		[[ -e "${s}.bz2" ]] && bzcat "${s}.bz2" >${dir}/grub.conf
+	fi
+
+	# Per bug 218599, we support grub.conf.install for users that want to run a
+	# specific set of Grub setup commands rather than the default ones.
+	grub_config=${dir}/grub.conf.install
+	[[ -e ${grub_config} ]] || grub_config=${dir}/grub.conf
+	if [[ -e ${grub_config} ]] ; then
+		egrep \
+			-v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
+			"${grub_config}" | \
+		/sbin/grub --batch \
+			--device-map="${dir}"/device.map \
+			> /dev/null
+	fi
+
+	# the grub default commands silently piss themselves if
+	# the default file does not exist ahead of time
+	if [[ ! -e ${dir}/default ]] ; then
+		grub-set-default --root-directory="${boot_dir}" default
+	fi
+	einfo "Grub has been installed to ${boot_dir} successfully."
+}
+
+pkg_postinst() {
+	if [[ -n ${DONT_MOUNT_BOOT} ]]; then
+		elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply"
+		elog "the following instructions for your /boot!"
+		elog "Neglecting to do so may cause your system to fail to boot!"
+		elog
+	else
+		setup_boot_dir "${ROOT}"/boot
+		# Trailing output because if this is run from pkg_postinst, it gets mixed into
+		# the other output.
+		einfo ""
+	fi
+	elog "To interactively install grub files to another device such as a USB"
+	elog "stick, just run the following and specify the directory as prompted:"
+	elog "   emerge --config =${PF}"
+	elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/path/to/use to tell"
+	elog "grub where to install in a non-interactive way."
+
+}
+
+pkg_config() {
+	local dir
+	if [ ! -d "${GRUB_ALT_INSTALLDIR}" ]; then
+		einfo "Enter the directory where you want to setup grub:"
+		read dir
+	else
+		dir="${GRUB_ALT_INSTALLDIR}"
+	fi
+	setup_boot_dir "${dir}"
+}