From e530ec092359ff63d216a596441d945392499f56 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 2 Jun 2012 06:38:57 +0000 Subject: Version bump. (Portage version: 2.2.0_alpha108/cvs/Linux x86_64) --- sys-boot/grub-static/ChangeLog | 9 +- sys-boot/grub-static/grub-static-0.97-r12.ebuild | 180 +++++++++++++++++++++++ 2 files changed, 187 insertions(+), 2 deletions(-) create mode 100644 sys-boot/grub-static/grub-static-0.97-r12.ebuild (limited to 'sys-boot/grub-static') diff --git a/sys-boot/grub-static/ChangeLog b/sys-boot/grub-static/ChangeLog index f3686b6baa5a..42dbc22bf4d8 100644 --- a/sys-boot/grub-static/ChangeLog +++ b/sys-boot/grub-static/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-boot/grub-static -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.31 2011/04/10 14:26:12 ulm Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.32 2012/06/02 06:38:57 vapier Exp $ + +*grub-static-0.97-r12 (02 Jun 2012) + + 02 Jun 2012; Mike Frysinger +grub-static-0.97-r12.ebuild: + Version bump. 10 Apr 2011; Ulrich Mueller grub-static-0.96-r1.ebuild, grub-static-0.97.ebuild, grub-static-0.97-r6.ebuild, diff --git a/sys-boot/grub-static/grub-static-0.97-r12.ebuild b/sys-boot/grub-static/grub-static-0.97-r12.ebuild new file mode 100644 index 000000000000..0424e87708ab --- /dev/null +++ b/sys-boot/grub-static/grub-static-0.97-r12.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2012 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-r12.ebuild,v 1.1 2012/06/02 06:38:57 vapier 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 toolchain-funcs linux-info + +PATCHVER="1.14" # 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" +RDEPEND="${DEPEND}" + +S=${WORKDIR} + +pkg_setup() { + case $(tc-arch) in + amd64) + CONFIG_CHECK='~IA32_EMULATION' + WARNING_IA32_EMULATION="You will NOT be able to run grub unless you have IA32_EMULATION set!" + check_extra_config + ;; + esac +} + +src_install() { + cp -a * "${D}"/ + # Make sure the docs get compressed + dodoc usr/share/doc/${PF}/* + + if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then + run_test_grub "${D}"/sbin/grub && einfo "New grub can run on your system, good!" + fi +} + +run_test_grub() { + local grub="$1" + local version="$(${grub} \ + --read-only --no-pager --no-floppy --no-curses \ + --no-config-file --batch --version)" + local error="grub test-run failed" + use amd64 && error="${error} Is IA32_EMULATION set?" + [ "${version/${PV}}" != "${version}" ] || die "${error}" + return 0 +} + +# +# 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} + + if [[ -z "${I_KNOW_WHAT_I_AM_DOING}" ]]; then + run_test_grub /sbin/grub + fi + + mkdir -p "${dir}" + [[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot" + dir="${dir}/grub" + if [[ ! -e ${dir} ]] ; then + mkdir "${dir}" || die + 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 + local tmp="${TMPDIR}/${P}-setup_boot_dir-$$" + egrep \ + -v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \ + "${grub_config}" >"${tmp}" + # Do NOT fail here, only warn. + /sbin/grub --batch \ + --device-map="${dir}"/device.map \ + >/dev/null <"${tmp}" + rc=$? + [[ $rc -ne 0 ]] && ewarn "Grub failed to run!" + fi + + # the grub default commands silently piss themselves if + # the default file does not exist ahead of time + if [[ ! -e ${dir}/default ]] ; then + # This may fail, don't worry about it. + grub-set-default --root-directory="${boot_dir}" default + fi + einfo "Grub has been installed to ${boot_dir} successfully." +} + +pkg_postinst() { + mount-boot_mount_boot_partition + + 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." + + # needs to be after we call setup_boot_dir + mount-boot_pkg_postinst +} + +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}" +} -- cgit v1.2.3-65-gdbad