summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-08-27 11:29:52 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-08-27 11:29:52 +0000
commitac38dad5c58e48f265a85ebf8931e46431b848da (patch)
tree83c9f54581e1d3f85edd6f8a16b997cbf14d9c3a /sys-boot
parentalpha/ia64/s390/sh/sparc stable wrt #377909 (diff)
downloadgentoo-2-ac38dad5c58e48f265a85ebf8931e46431b848da.tar.gz
gentoo-2-ac38dad5c58e48f265a85ebf8931e46431b848da.tar.bz2
gentoo-2-ac38dad5c58e48f265a85ebf8931e46431b848da.zip
Bump to grub 1.99. Drop older grub2 versions. Take maintainership of grub:2 series.
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/ChangeLog11
-rw-r--r--sys-boot/grub/files/defaults30
-rw-r--r--sys-boot/grub/files/grub-1.96-genkernel.patch19
-rw-r--r--sys-boot/grub/files/grub-1.99-genkernel.patch19
-rw-r--r--sys-boot/grub/files/grub.default36
-rw-r--r--sys-boot/grub/grub-1.98.ebuild116
-rw-r--r--sys-boot/grub/grub-1.99.ebuild262
-rw-r--r--sys-boot/grub/grub-1.99_rc1.ebuild123
-rw-r--r--sys-boot/grub/grub-9999.ebuild253
-rw-r--r--sys-boot/grub/metadata.xml6
10 files changed, 508 insertions, 367 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 6abce5825926..a16e89f5863b 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.158 2011/08/21 04:33:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.159 2011/08/27 11:29:52 scarabeus Exp $
+
+*grub-1.99 (28 Aug 2011)
+
+ 28 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ -files/grub-1.96-genkernel.patch, -grub-1.98.ebuild, -grub-1.99_rc1.ebuild,
+ +grub-1.99.ebuild, -files/grub-1.99-genkernel.patch, grub-9999.ebuild,
+ +files/grub.default, -files/defaults, metadata.xml:
+ Bump to grub 1.99. Drop older grub2 versions. Take maintainership of grub:2
+ series.
21 Aug 2011; Mike Frysinger <vapier@gentoo.org> grub-1.98.ebuild,
grub-1.99_rc1.ebuild, grub-9999.ebuild:
diff --git a/sys-boot/grub/files/defaults b/sys-boot/grub/files/defaults
deleted file mode 100644
index 25e59090071f..000000000000
--- a/sys-boot/grub/files/defaults
+++ /dev/null
@@ -1,30 +0,0 @@
-# /etc/defaults/grub
-# If you change this file, run 'grub-mkconfig -o /boot/grub/grub.cfg'
-# afterwords to update /boot/grub/grub.cfg. Make sure your /boot is
-# mounted rw before executing this command.
-#
-# See the grub info page for documentation on possible variables and
-# their associated values. This wiki also has random bits of info:
-# http://en.gentoo-wiki.com/wiki/Grub2#Using_variables
-
-GRUB_DEFAULT=0
-GRUB_HIDDEN_TIMEOUT=0
-GRUB_HIDDEN_TIMEOUT_QUIET=true
-GRUB_TIMEOUT=10
-
-GRUB_CMDLINE_LINUX_DEFAULT=""
-GRUB_CMDLINE_LINUX=""
-
-# Uncomment to disable graphical terminal (grub-pc only)
-#GRUB_TERMINAL=console
-
-# The resolution used on graphical terminal
-# note that you can use only modes which your graphic card supports via VBE
-# you can see them in real GRUB with the command `vbeinfo'
-#GRUB_GFXMODE=640x480
-
-# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entrys
-#GRUB_DISABLE_RECOVERY=true
diff --git a/sys-boot/grub/files/grub-1.96-genkernel.patch b/sys-boot/grub/files/grub-1.96-genkernel.patch
deleted file mode 100644
index e06f38356a02..000000000000
--- a/sys-boot/grub/files/grub-1.96-genkernel.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- util/grub.d/10_linux.in
-+++ util/grub.d/10_linux.in
-@@ -61,7 +61,7 @@
- EOF
- }
-
--list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do
-+list=`for i in /boot/kernel-* /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do
- if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
- done`
-
-@@ -78,6 +78,7 @@
- initrd=
- for i in "initrd.img-${version}" "initrd-${version}.img" \
- "initrd-${version}" "initrd.img-${alt_version}" \
-+ "initramfs-genkernel-${version}" "initramfs-genkernel-${alt_version}" \
- "initrd-${alt_version}.img" "initrd-${alt_version}"; do
- if test -e "${dirname}/${i}" ; then
- initrd="$i"
diff --git a/sys-boot/grub/files/grub-1.99-genkernel.patch b/sys-boot/grub/files/grub-1.99-genkernel.patch
deleted file mode 100644
index 4d4aee5a0e9e..000000000000
--- a/sys-boot/grub/files/grub-1.99-genkernel.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- util/grub.d/10_linux.in
-+++ util/grub.d/10_linux.in
-@@ -109,7 +109,7 @@
- EOF
- }
-
--list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* ; do
-+list=`for i in /boot/kernel-* /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* ; do
- if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
- done`
- prepare_boot_cache=
-@@ -127,6 +127,7 @@
- initrd=
- for i in "initrd.img-${version}" "initrd-${version}.img" \
- "initrd-${version}" "initramfs-${version}.img" \
-+ "initramfs-genkernel-${version}" "initramfs-genkernel-${alt_version}" \
- "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
- "initrd-${alt_version}" "initramfs-${alt_version}.img"; do
- if test -e "${dirname}/${i}" ; then
diff --git a/sys-boot/grub/files/grub.default b/sys-boot/grub/files/grub.default
new file mode 100644
index 000000000000..b8767d9a9602
--- /dev/null
+++ b/sys-boot/grub/files/grub.default
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/files/grub.default,v 1.1 2011/08/27 11:29:52 scarabeus Exp $
+#
+# To populate all changes in this file you need to regenerate your
+# grub configuration file afterwards:
+# 'grub2-mkconfig -o /boot/grub2/grub.cfg'
+#
+# See the grub info page for documentation on possible variables and
+# their associated values.
+
+GRUB_DEFAULT=0
+GRUB_HIDDEN_TIMEOUT=0
+GRUB_HIDDEN_TIMEOUT_QUIET=true
+GRUB_TIMEOUT=10
+
+GRUB_CMDLINE_LINUX_DEFAULT=""
+GRUB_CMDLINE_LINUX=""
+
+# Uncomment to disable graphical terminal (grub-pc only)
+#GRUB_TERMINAL=console
+
+# The resolution used on graphical terminal.
+# Note that you can use only modes which your graphic card supports via VBE.
+# You can see them in real GRUB with the command `vbeinfo'.
+#GRUB_GFXMODE=640x480
+
+# Background image used on graphical terminal.
+# Can be in various bitmap formats.
+#GRUB_BACKGROUND="/boot/grub2/mybackground.png"
+
+# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
+#GRUB_DISABLE_LINUX_UUID=true
+
+# Uncomment to disable generation of recovery mode menu entrys
+#GRUB_DISABLE_RECOVERY=true
diff --git a/sys-boot/grub/grub-1.98.ebuild b/sys-boot/grub/grub-1.98.ebuild
deleted file mode 100644
index d3258228e1e3..000000000000
--- a/sys-boot/grub/grub-1.98.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.98.ebuild,v 1.11 2011/08/21 04:33:07 vapier Exp $
-
-# XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
- EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
- inherit autotools bzr
- SRC_URI=""
-else
- SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
- mirror://gentoo/${P}.tar.gz"
-fi
-
-DESCRIPTION="GNU GRUB 2 boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-
-LICENSE="GPL-3"
-use multislot && SLOT="2" || SLOT="0"
-KEYWORDS=""
-IUSE="custom-cflags debug truetype multislot static"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5
- dev-libs/lzo
- truetype? ( media-libs/freetype media-fonts/unifont )"
-DEPEND="${RDEPEND}
- dev-lang/ruby
- virtual/yacc
- sys-devel/flex"
-
-export STRIP_MASK="*/grub/*/*.mod"
-QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check bin/grub-fstest"
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- bzr_src_unpack
- else
- unpack ${A}
- fi
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-1.96-genkernel.patch #256335
- epatch_user
-
- # autogen.sh does more than just run autotools
- # need to eautomake due to weirdness #296013
- if [[ ${PV} == "9999" ]] ; then
- sed -i \
- -e '/^\(auto\|ac\)/s:^:e:' \
- -e "s:^eautomake:`which automake`:" \
- autogen.sh
- (. ./autogen.sh) || die
- fi
-}
-
-src_compile() {
- use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
- use static && append-ldflags -static
-
- econf \
- --disable-werror \
- --sbindir=/sbin \
- --bindir=/bin \
- --libdir=/$(get_libdir) \
- --disable-efiemu \
- $(use_enable truetype grub-mkfont) \
- $(use_enable debug mm-debug) \
- $(use_enable debug grub-emu-usb) \
- $(use_enable debug grub-fstest)
- emake -j1 || die "making regular stuff"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
- cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
- GRUB_DISTRIBUTOR="Gentoo"
- EOF
- if use multislot ; then
- sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
- mv "${D}"/sbin/grub{,2}-install || die
- mv "${D}"/sbin/grub{,2}-set-default || die
- mv "${D}"/usr/share/man/man8/grub{,2}-install.8 || die
- mv "${D}"/usr/share/info/grub{,2}.info || die
- fi
-}
-
-setup_boot_dir() {
- local boot_dir=$1
- local dir=${boot_dir}/grub
-
- if [[ ! -e ${dir}/grub.cfg ]] ; then
- einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
- grub-mkconfig -o "${dir}/grub.cfg"
- fi
-
- #local install=grub-install
- #use multislot && install="grub2-install --grub-setup=/bin/true"
- #einfo "Running: ${install} "
- #${install}
-}
-
-pkg_postinst() {
- mount-boot_mount_boot_partition
-
- if use multislot ; then
- elog "You have installed grub2 with USE=multislot, so to coexist"
- elog "with grub1, the grub2 install binary is named grub2-install."
- fi
- setup_boot_dir "${ROOT}"boot
-
- # needs to be after we call setup_boot_dir
- mount-boot_pkg_postinst
-}
diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebuild
new file mode 100644
index 000000000000..bd13e6eef935
--- /dev/null
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99.ebuild,v 1.1 2011/08/27 11:29:52 scarabeus Exp $
+
+EAPI=4
+
+if [[ ${PV} == "9999" ]] ; then
+ EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
+ LIVE_ECLASS="autotools bzr"
+ SRC_URI=""
+else
+ MY_P=${P/_/\~}
+ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
+ mirror://gentoo/${MY_P}.tar.xz"
+ S=${WORKDIR}/${MY_P}
+fi
+
+inherit mount-boot eutils flag-o-matic toolchain-funcs ${LIVE_ECLASS}
+unset LIVE_ECLASS
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+
+LICENSE="GPL-3"
+SLOT="2"
+[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~mips ~x86"
+IUSE="custom-cflags debug device-mapper nls static sdl truetype"
+
+GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
+# everywhere:
+# emu
+# mips only:
+# qemu-mips, yeeloong
+# amd64, x86, ppc, ppc64
+# ieee1275
+# amd64, x86
+# coreboot, multiboot, efi-32, pc, qemu
+# amd64
+# efi-64
+for i in ${GRUB_PLATFORMS}; do
+ IUSE+=" grub_platforms_${i}"
+done
+unset i
+
+# os-prober: Used on runtime to detect other OSes
+# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
+RDEPEND="
+ dev-libs/libisoburn
+ dev-libs/lzo
+ sys-boot/os-prober
+ >=sys-libs/ncurses-5.2-r5
+ debug? (
+ sdl? ( media-libs/libsdl )
+ )
+ device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+ truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
+DEPEND="${RDEPEND}
+ >=dev-lang/python-2.5.2
+ sys-devel/flex
+ virtual/yacc
+"
+if [[ ${PV} == "9999" ]]; then
+ DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
+else
+ DEPEND+=" app-arch/xz-utils"
+fi
+
+export STRIP_MASK="*/grub*/*/*.{mod,img}"
+QA_EXECSTACK="
+ lib64/grub2/*/setjmp.mod
+ lib64/grub2/*/kernel.img
+ sbin/grub2-probe
+ sbin/grub2-setup
+ sbin/grub2-mkdevicemap
+ bin/grub2-script-check
+ bin/grub2-fstest
+ bin/grub2-mklayout
+ bin/grub2-menulst2cfg
+ bin/grub2-mkrelpath
+ bin/grub2-mkpasswd-pbkdf2
+ bin/grub2-mkfont
+ bin/grub2-editenv
+ bin/grub2-mkimage
+"
+
+grub_run_phase() {
+ local phase=$1
+ local platform=$2
+ [[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]"
+
+ [[ -d "${WORKDIR}/build-${platform}" ]] || \
+ { mkdir "${WORKDIR}/build-${platform}" || die ; }
+ pushd "${WORKDIR}/build-${platform}" > /dev/null || die
+
+ echo ">>> Running ${phase} for platform \"${platform}\""
+ echo ">>> Working in: \"${WORKDIR}/build-${platform}\""
+
+ grub_${phase} ${platform}
+
+ popd > /dev/null || die
+}
+
+grub_src_configure() {
+ local platform=$1
+ local target
+
+ [[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
+
+ # if we have no platform then --with-platform=guessed does not work
+ [[ ${platform} == "guessed" ]] && platform=""
+
+ # check if we have to specify the target (EFI)
+ # or just append correct --with-platform
+ if [[ -n ${platform} ]]; then
+ if [[ ${platform} == efi* ]]; then
+ # EFI platform hack
+ [[ ${platform/*-} == 32 ]] && target=i386
+ [[ ${platform/*-} == 64 ]] && target=x86_64
+ # program-prefix is required empty because otherwise it is equal to
+ # target variable, which we do not want at all
+ platform="
+ --with-platform=${platform/-*}
+ --target=${target}
+ --program-prefix=
+ "
+ else
+ platform=" --with-platform=${platform}"
+ fi
+ fi
+
+ ECONF_SOURCE="${WORKDIR}/${P}/" \
+ econf \
+ --disable-werror \
+ --sbindir=/sbin \
+ --bindir=/bin \
+ --libdir=/$(get_libdir) \
+ --disable-efiemu \
+ --program-transform-name=s,grub,grub2, \
+ $(use_enable device-mapper) \
+ $(use_enable truetype grub-mkfont) \
+ $(use_enable nls) \
+ $(use_enable debug mm-debug) \
+ $(use sdl && use_enable debug grub-emu-sdl) \
+ $(use_enable debug grub-emu-usb) \
+ ${platform}
+}
+
+grub_src_compile() {
+ default_src_compile
+}
+
+grub_src_install() {
+ default_src_install
+}
+
+src_prepare() {
+ local i j archs
+
+ epatch_user
+
+ # autogen.sh does more than just run autotools
+ if [[ ${PV} == "9999" ]] ; then
+ sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
+ (. ./autogen.sh) || die
+ fi
+
+ # install into the right dir for eselect #372735
+ sed -i \
+ -e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \
+ util/bash-completion.d/Makefile.in || die
+
+ # get enabled platforms
+ GRUB_ENABLED_PLATFORMS=""
+ for i in ${GRUB_PLATFORMS}; do
+ use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
+ done
+ [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
+ einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
+}
+
+src_configure() {
+ local i
+
+ use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
+ use static && append-ldflags -static
+
+ for i in ${GRUB_ENABLED_PLATFORMS}; do
+ grub_run_phase ${FUNCNAME} ${i}
+ done
+}
+
+src_compile() {
+ local i
+
+ for i in ${GRUB_ENABLED_PLATFORMS}; do
+ grub_run_phase ${FUNCNAME} ${i}
+ done
+}
+
+src_install() {
+ local i
+
+ for i in ${GRUB_ENABLED_PLATFORMS}; do
+ grub_run_phase ${FUNCNAME} ${i}
+ done
+
+ # slot all collisions with grub legacy
+ mv "${ED}"/usr/share/info/grub.info \
+ "${ED}"/usr/share/info/grub2.info || die
+
+ # can't be in docs array as we use defualt_src_install in different builddir
+ dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+ insinto /etc/default
+ newins "${FILESDIR}"/grub.default grub
+ cat <<EOF >> "${ED}"/lib*/grub2/grub-mkconfig_lib
+ GRUB_DISTRIBUTOR="Gentoo"
+EOF
+}
+
+setup_boot_dir() {
+ local dir=$1
+
+ # display the link to guide if user didn't set up anything yet.
+ elog "For informations how to configure grub-2 please reffer to the guide:"
+ elog " http://dev.gentoo.org/~scarabeus/grub-2-guide.xml"
+
+ if [[ ! -e ${dir}/grub.cfg && -e ${dir/2/}/menu.lst ]] ; then
+ # This is first grub2 install and we have old configuraton for
+ # grub1 around. Lets try to generate grub.cfg from it so user
+ # does not loose any stuff when rebooting.
+ # NOTE: in long term he still NEEDS to migrate to grub.d stuff.
+ einfo "Running: grub2-menulst2cfg '${dir/2/}/menu.lst' '${dir}/grub.cfg'"
+ grub2-menulst2cfg "${dir/2/}/menu.lst" "${dir}/grub.cfg" || \
+ ewarn "Running grub2-menulst2cfg failed!"
+
+ einfo "Even if we just created configuration for your grub2 using old"
+ einfo "grub-legacy configuration file you should migrate to use new style"
+ einfo "configuration in '${ROOT}/etc/grub.d'."
+ einfo
+
+ else
+ # we need to refresh the grub.cfg everytime just to play it safe
+ einfo "Running: grub2-mkconfig -o '${dir}/grub.cfg'"
+ grub2-mkconfig -o "${dir}/grub.cfg" || \
+ ewarn "Running grub2-mkconfig failed! Check your configuration files!"
+ fi
+
+ elog "Remember to run \"grub2-mkconfig -o '${dir}/grub.cfg'\" every time"
+ elog "you update the configuration files!"
+
+ elog "Remember to run grub2-install to install your grub every time"
+ elog "you update this package!"
+}
+
+pkg_postinst() {
+ mount-boot_mount_boot_partition
+
+ setup_boot_dir "${ROOT}"boot/grub2
+
+ # needs to be called after we call setup_boot_dir
+ mount-boot_pkg_postinst
+}
diff --git a/sys-boot/grub/grub-1.99_rc1.ebuild b/sys-boot/grub/grub-1.99_rc1.ebuild
deleted file mode 100644
index d760b9127470..000000000000
--- a/sys-boot/grub/grub-1.99_rc1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99_rc1.ebuild,v 1.6 2011/08/21 04:33:07 vapier Exp $
-
-# XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
- EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
- inherit autotools bzr
- SRC_URI=""
-else
- MY_P=${P/_/\~}
- SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.gz
- mirror://gentoo/${MY_P}.tar.gz"
- S=${WORKDIR}/${MY_P}
-fi
-
-DESCRIPTION="GNU GRUB 2 boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-
-LICENSE="GPL-3"
-use multislot && SLOT="2" || SLOT="0"
-KEYWORDS=""
-IUSE="custom-cflags debug truetype multislot static"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5
- dev-libs/lzo
- truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
-DEPEND="${RDEPEND}
- >=sys-devel/autogen-5.10
- >=dev-lang/python-2.5.2
- virtual/yacc
- sys-devel/flex"
-[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
-
-export STRIP_MASK="*/grub/*/*.mod"
-QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check bin/grub-fstest"
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- bzr_src_unpack
- else
- unpack ${A}
- fi
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-1.99-genkernel.patch #256335
- epatch_user
-
- # autogen.sh does more than just run autotools
- # need to eautomake due to weirdness #296013
- if [[ ${PV} == "9999" ]] ; then
- sed -i -e '/^autoreconf/s:^:e:' autogen.sh || die
- (. ./autogen.sh) || die
- fi
-
- # install into the right dir for eselect #372735
- sed -i \
- -e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \
- util/bash-completion.d/Makefile.in || die
-}
-
-src_compile() {
- use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
- use static && append-ldflags -static
-
- econf \
- --disable-werror \
- --sbindir=/sbin \
- --bindir=/bin \
- --libdir=/$(get_libdir) \
- --disable-efiemu \
- $(use_enable truetype grub-mkfont) \
- $(use_enable debug mm-debug) \
- $(use_enable debug grub-emu) \
- $(use_enable debug grub-emu-usb) \
- $(use_enable debug grub-fstest)
- emake -j1 || die "making regular stuff"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
- cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
- GRUB_DISTRIBUTOR="Gentoo"
- EOF
- if use multislot ; then
- sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
- mv "${D}"/sbin/grub{,2}-install || die
- mv "${D}"/sbin/grub{,2}-set-default || die
- mv "${D}"/usr/share/man/man8/grub{,2}-install.8 || die
- mv "${D}"/usr/share/info/grub{,2}.info || die
- fi
-}
-
-setup_boot_dir() {
- local boot_dir=$1
- local dir=${boot_dir}/grub
-
- if [[ ! -e ${dir}/grub.cfg ]] ; then
- einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
- grub-mkconfig -o "${dir}/grub.cfg"
- fi
-
- #local install=grub-install
- #use multislot && install="grub2-install --grub-setup=/bin/true"
- #einfo "Running: ${install} "
- #${install}
-}
-
-pkg_postinst() {
- mount-boot_mount_boot_partition
-
- if use multislot ; then
- elog "You have installed grub2 with USE=multislot, so to coexist"
- elog "with grub1, the grub2 install binary is named grub2-install."
- fi
- setup_boot_dir "${ROOT}"boot
-
- # needs to be after we call setup_boot_dir
- mount-boot_pkg_postinst
-}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 9fdf88d4f966..ff941904db36 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,31 +1,54 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.36 2011/08/21 04:33:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.37 2011/08/27 11:29:52 scarabeus Exp $
-# XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch
-EAPI="2"
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs
+EAPI=4
if [[ ${PV} == "9999" ]] ; then
EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
- inherit autotools bzr
+ LIVE_ECLASS="autotools bzr"
SRC_URI=""
else
- SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
- mirror://gentoo/${P}.tar.gz"
+ MY_P=${P/_/\~}
+ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
+ mirror://gentoo/${MY_P}.tar.xz"
+ S=${WORKDIR}/${MY_P}
fi
+inherit mount-boot eutils flag-o-matic toolchain-funcs ${LIVE_ECLASS}
+unset LIVE_ECLASS
+
DESCRIPTION="GNU GRUB boot loader"
HOMEPAGE="http://www.gnu.org/software/grub/"
LICENSE="GPL-3"
-use multislot && SLOT="2" || SLOT="0"
-KEYWORDS=""
-IUSE="custom-cflags debug device-mapper multislot static sdl truetype"
+SLOT="2"
+[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~mips ~x86"
+IUSE="custom-cflags debug device-mapper nls static sdl truetype"
-RDEPEND=">=sys-libs/ncurses-5.2-r5
+GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips loongson"
+# everywhere:
+# emu
+# mips only:
+# qemu-mips, loongson
+# amd64, x86, ppc, ppc64
+# ieee1275
+# amd64, x86
+# coreboot, multiboot, efi-32, pc, qemu
+# amd64
+# efi-64
+for i in ${GRUB_PLATFORMS}; do
+ IUSE+=" grub_platforms_${i}"
+done
+unset i
+
+# os-prober: Used on runtime to detect other OSes
+# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
+RDEPEND="
+ dev-libs/libisoburn
dev-libs/lzo
+ sys-boot/os-prober
+ >=sys-libs/ncurses-5.2-r5
debug? (
sdl? ( media-libs/libsdl )
)
@@ -33,18 +56,109 @@ RDEPEND=">=sys-libs/ncurses-5.2-r5
truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
DEPEND="${RDEPEND}
>=dev-lang/python-2.5.2
+ sys-devel/flex
virtual/yacc
- sys-devel/flex"
-[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
+"
+if [[ ${PV} == "9999" ]]; then
+ DEPEND+=" >=sys-devel/autogen-5.10 sys-apps/help2man"
+else
+ DEPEND+=" app-arch/xz-utils"
+fi
+
+export STRIP_MASK="*/grub*/*/*.{mod,img}"
+QA_EXECSTACK="
+ lib64/grub2/*/setjmp.mod
+ lib64/grub2/*/kernel.img
+ sbin/grub2-probe
+ sbin/grub2-setup
+ sbin/grub2-mkdevicemap
+ bin/grub2-script-check
+ bin/grub2-fstest
+ bin/grub2-mklayout
+ bin/grub2-menulst2cfg
+ bin/grub2-mkrelpath
+ bin/grub2-mkpasswd-pbkdf2
+ bin/grub2-mkfont
+ bin/grub2-editenv
+ bin/grub2-mkimage
+"
+
+grub_run_phase() {
+ local phase=$1
+ local platform=$2
+ [[ -z ${phase} || -z ${platform} ]] && die "${FUNCNAME} [phase] [platform]"
+
+ [[ -d "${WORKDIR}/build-${platform}" ]] || \
+ { mkdir "${WORKDIR}/build-${platform}" || die ; }
+ pushd "${WORKDIR}/build-${platform}" > /dev/null || die
+
+ echo ">>> Running ${phase} for platform \"${platform}\""
+ echo ">>> Working in: \"${WORKDIR}/build-${platform}\""
+
+ grub_${phase} ${platform}
+
+ popd > /dev/null || die
+}
+
+grub_src_configure() {
+ local platform=$1
+ local target
+
+ [[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
+
+ # if we have no platform then --with-platform=guessed does not work
+ [[ ${platform} == "guessed" ]] && platform=""
+
+ # check if we have to specify the target (EFI)
+ # or just append correct --with-platform
+ if [[ -n ${platform} ]]; then
+ if [[ ${platform} == efi* ]]; then
+ # EFI platform hack
+ [[ ${platform/*-} == 32 ]] && target=i386
+ [[ ${platform/*-} == 64 ]] && target=x86_64
+ # program-prefix is required empty because otherwise it is equal to
+ # target variable, which we do not want at all
+ platform="
+ --with-platform=${platform/-*}
+ --target=${target}
+ --program-prefix=
+ "
+ else
+ platform=" --with-platform=${platform}"
+ fi
+ fi
+
+ ECONF_SOURCE="${WORKDIR}/${P}/" \
+ econf \
+ --disable-werror \
+ --sbindir=/sbin \
+ --bindir=/bin \
+ --libdir=/$(get_libdir) \
+ --disable-efiemu \
+ --program-transform-name=s,grub,grub2, \
+ $(use_enable device-mapper) \
+ $(use_enable truetype grub-mkfont) \
+ $(use_enable nls) \
+ $(use_enable debug mm-debug) \
+ $(use sdl && use_enable debug grub-emu-sdl) \
+ $(use_enable debug grub-emu-usb) \
+ ${platform}
+}
+
+grub_src_compile() {
+ default_src_compile
+}
-export STRIP_MASK="*/grub/*/*.mod"
-QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check bin/grub-fstest"
+grub_src_install() {
+ default_src_install
+}
src_prepare() {
+ local i j archs
+
epatch_user
# autogen.sh does more than just run autotools
- # need to eautomake due to weirdness #296013
if [[ ${PV} == "9999" ]] ; then
sed -i -e '/^autoreconf/s:^:set +e; e:' autogen.sh || die
(. ./autogen.sh) || die
@@ -54,72 +168,95 @@ src_prepare() {
sed -i \
-e '/^bashcompletiondir =/s:=.*:= $(datarootdir)/bash-completion:' \
util/bash-completion.d/Makefile.in || die
+
+ # get enabled platforms
+ GRUB_ENABLED_PLATFORMS=""
+ for i in ${GRUB_PLATFORMS}; do
+ use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
+ done
+ [[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
+ einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
}
src_configure() {
+ local i
+
use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
use static && append-ldflags -static
- econf \
- --disable-werror \
- --sbindir=/sbin \
- --bindir=/bin \
- --libdir=/$(get_libdir) \
- --disable-efiemu \
- $(use_enable device-mapper) \
- $(use_enable truetype grub-mkfont) \
- $(use_enable debug mm-debug) \
- $(use sdl && use_enable debug grub-emu-sdl) \
- $(use_enable debug grub-emu-usb)
+ for i in ${GRUB_ENABLED_PLATFORMS}; do
+ grub_run_phase ${FUNCNAME} ${i}
+ done
}
src_compile() {
- emake -j1 || die
+ local i
+
+ for i in ${GRUB_ENABLED_PLATFORMS}; do
+ grub_run_phase ${FUNCNAME} ${i}
+ done
}
src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+ local i
+
+ for i in ${GRUB_ENABLED_PLATFORMS}; do
+ grub_run_phase ${FUNCNAME} ${i}
+ done
+
+ # slot all collisions with grub legacy
+ mv "${ED}"/usr/share/info/grub.info \
+ "${ED}"/usr/share/info/grub2.info || die
- insinto /etc/defaults
- doins "${FILESDIR}"/defaults || die
- cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
+ # can't be in docs array as we use defualt_src_install in different builddir
+ dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+ insinto /etc/default
+ newins "${FILESDIR}"/grub.default grub
+ cat <<EOF >> "${ED}"/lib*/grub2/grub-mkconfig_lib
GRUB_DISTRIBUTOR="Gentoo"
- EOF
-
- if use multislot ; then
- sed -i "s:grub-install:grub2-install:" "${D}"/sbin/grub-install || die
- mv "${D}"/sbin/grub{,2}-install || die
- mv "${D}"/sbin/grub{,2}-set-default || die
- mv "${D}"/usr/share/man/man8/grub{,2}-install.8 || die
- mv "${D}"/usr/share/info/grub{,2}.info || die
- fi
+EOF
}
setup_boot_dir() {
- local boot_dir=$1
- local dir=${boot_dir}/grub
+ local dir=$1
+
+ # display the link to guide if user didn't set up anything yet.
+ elog "For informations how to configure grub-2 please reffer to the guide:"
+ elog " http://dev.gentoo.org/~scarabeus/grub-2-guide.xml"
+
+ if [[ ! -e ${dir}/grub.cfg && -e ${dir/2/}/menu.lst ]] ; then
+ # This is first grub2 install and we have old configuraton for
+ # grub1 around. Lets try to generate grub.cfg from it so user
+ # does not loose any stuff when rebooting.
+ # NOTE: in long term he still NEEDS to migrate to grub.d stuff.
+ einfo "Running: grub2-menulst2cfg '${dir/2/}/menu.lst' '${dir}/grub.cfg'"
+ grub2-menulst2cfg "${dir/2/}/menu.lst" "${dir}/grub.cfg" || \
+ ewarn "Running grub2-menulst2cfg failed!"
- if [[ ! -e ${dir}/grub.cfg ]] ; then
- einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
- grub-mkconfig -o "${dir}/grub.cfg"
+ einfo "Even if we just created configuration for your grub2 using old"
+ einfo "grub-legacy configuration file you should migrate to use new style"
+ einfo "configuration in '${ROOT}/etc/grub.d'."
+ einfo
+
+ else
+ # we need to refresh the grub.cfg everytime just to play it safe
+ einfo "Running: grub2-mkconfig -o '${dir}/grub.cfg'"
+ grub2-mkconfig -o "${dir}/grub.cfg" || \
+ ewarn "Running grub2-mkconfig failed! Check your configuration files!"
fi
- #local install=grub-install
- #use multislot && install="grub2-install --grub-setup=/bin/true"
- #einfo "Running: ${install} "
- #${install}
+ elog "Remember to run \"grub2-mkconfig -o '${dir}/grub.cfg'\" every time"
+ elog "you update the configuration files!"
+
+ elog "Remember to run grub2-install to install your grub every time"
+ elog "you update this package!"
}
pkg_postinst() {
mount-boot_mount_boot_partition
- if use multislot ; then
- elog "You have installed grub2 with USE=multislot, so to coexist"
- elog "with grub1, the grub2 install binary is named grub2-install."
- fi
- setup_boot_dir "${ROOT}"boot
+ setup_boot_dir "${ROOT}"boot/grub2
- # needs to be after we call setup_boot_dir
+ # needs to be called after we call setup_boot_dir
mount-boot_pkg_postinst
}
diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
index a05c3308cc79..10d306a4d940 100644
--- a/sys-boot/grub/metadata.xml
+++ b/sys-boot/grub/metadata.xml
@@ -2,8 +2,12 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>base-system</herd>
+<maintainer restrict="&gt;=sys-boot/grub-1.99">
+ <email>scarabeus@gentoo.org</email>
+ <name>Tomáš Chvátal</name>
+ <description>Grub 2 maintainer</description>
+</maintainer>
<use>
<flag name='device-mapper'>Enable support for <pkg>sys-fs/device-mapper</pkg></flag>
- <flag name='multislot'>Allow grub1 and grub2 to be installed simultaneously</flag>
</use>
</pkgmetadata>