Version bump to match sys-boot/grub

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

3 files changed, 150 insertions, 6 deletions

diff --git a/sys-boot/grub-static/ChangeLog b/sys-boot/grub-static/ChangeLog
index 6aed485702f2..ada4d5e8128c 100644
--- a/sys-boot/grub-static/ChangeLog
+++ b/sys-boot/grub-static/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2008/10/28 10:13:07 angelos Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.17 2009/01/03 21:07:21 angelos Exp $
+
+*grub-static-0.97-r9 (03 Jan 2009)
+
+  03 Jan 2009; Christoph Mende <angelos@gentoo.org>
+  +grub-static-0.97-r9.ebuild:
+  Version bump to match sys-boot/grub
 
   28 Oct 2008; Christoph Mende <angelos@gentoo.org>
   grub-static-0.97-r6.ebuild:
diff --git a/sys-boot/grub-static/Manifest b/sys-boot/grub-static/Manifest
index e2d33785d14f..cde85f12cb09 100644
--- a/sys-boot/grub-static/Manifest
+++ b/sys-boot/grub-static/Manifest
@@ -3,16 +3,18 @@ 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-r9.tar.bz2 937621 RMD160 d8cab235213050b5731d36097480f9f4136a34dc SHA1 fcad772b132feb1ee47771c790f83de4a4f291c8 SHA256 0d6af53c5380bd37ea67f314236364baebfff52762ea5e52bf2f66941dabe2d1
 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 4452 RMD160 bad6691f2a60cfae07d8e8d8e7322bc557642399 SHA1 359c62e79f88b9e76a5e8048430f42c01381ac14 SHA256 d0ce25ec08b630a2e99a0793878798273c226864b72d28edf24aad9f6b1e177b
+EBUILD grub-static-0.97-r9.ebuild 4452 RMD160 cb08c111261b319625c3a44a5ce3bf444887213e SHA1 41d8554fe73003a2331f196d1cc50909abc8f5d6 SHA256 a51f80230dc475ef3278ad8bba4031a8ef0747d8508e6f62dcd1599cc4217a03
 EBUILD grub-static-0.97.ebuild 2039 RMD160 4619b70df076072f36622476e35d47988bf884b3 SHA1 6dee6599dde71c33b2c1142b120e966f86e68fc9 SHA256 41704a8a311c69182ff2eabd23ab281324af5b6ad879906c9b2e3332273aaddf
-MISC ChangeLog 2543 RMD160 e25361acf1cc226bf6d0e85c6d40428011d9c4a2 SHA1 edeb3577fbe709859a45bbf4b14e3fbf1613aac3 SHA256 60cdb06faf80af360f4a127a4a6bfd2949c08ce12bbec16d9bdb10c08df9aa15
+MISC ChangeLog 2701 RMD160 fa99c5440a51786d1295112e97e73614de11dcec SHA1 f552bb16380a41063b49ee6300e6c1160036832a SHA256 a7b00331307a70954e92a673cfce14a41f5e486701327bf72d23aae7640f7dca
 MISC metadata.xml 158 RMD160 d823c6f24034325d607a095ce2851034d70fd2f2 SHA1 7e7b3c2aedeb5fa2761c27cf8f56b5240ae9678e SHA256 0df9eb61f6a4e4a3f8fc16386b0204e22e85940533d769d4a0418a4ecec50d90
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkG5b0ACgkQKhnDs22gwa+29wCghOfr9SJLvOW7Oyjc/8yZ/tcw
-ksAAnRwBrx4hwOh/AF+hdwWocn+03K/G
-=CUFo
+iEYEARECAAYFAklf05AACgkQKhnDs22gwa/n2wCcCcXwaT6k95siY9UQHx6dMudl
+oB8An0QjaR/Ss+Wdv1+TAUWspZt7EUbP
+=Xwq2
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub-static/grub-static-0.97-r9.ebuild b/sys-boot/grub-static/grub-static-0.97-r9.ebuild
new file mode 100644
index 000000000000..86c0dbdd5193
--- /dev/null
+++ b/sys-boot/grub-static/grub-static-0.97-r9.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2009 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-r9.ebuild,v 1.1 2009/01/03 21:07:21 angelos 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 eutils mount-boot
+
+PATCHVER="1.9" # 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}"
+}