Add patch to support genkernel initramfs in 10_linux.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 332 insertions, 5 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index c38ce91cd4fc..436347960bb9 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.194 2012/04/01 21:28:06 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.195 2012/04/07 21:33:13 floppym Exp $
+
+*grub-2.00_beta3-r1 (07 Apr 2012)
+
+  07 Apr 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/grub-2.00-10_linux-genkernel.patch, +grub-2.00_beta3-r1.ebuild:
+  Add patch to support genkernel initramfs in 10_linux.
 
 *grub-2.00_beta3 (01 Apr 2012)
 
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index cce610533807..2ab2b3f77e86 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -7,6 +7,7 @@ AUX 1.99-improve_devmapper.patch 7134 RMD160 a8dbf91626c607f5fec85235a2042b7e82f
 AUX 1.99-stat_root_device_properly-p1.patch 698 RMD160 f28b945c2342a2a95e67357c5387cadf16d8e34f SHA1 3872ccd325e8f4f4693984f0abf26b935c475dae SHA256 1facf84e5195eb98b390e43e0a0d6f791e9500ef678b025e95f96d5a2769da5a
 AUX 1.99-stat_root_device_properly-p2.patch 621 RMD160 2b52c8cbddf95def3fcc77ec8a2cb3524891fd1e SHA1 280dafa0d0c93905a850b17e9a9f09cea1357a05 SHA256 431876459562c0aae6e854a97eeaf0cacdad8ceb5477788a4d691e4e6fa613eb
 AUX grub-0.97-gpt.patch 10682 RMD160 53dd38d52f2b38fb28dfb670d6fd27e47a562bbb SHA1 6057a076110d469fb63e56e57711d281221f9b42 SHA256 5e38046cfb727420e5b4b19d71c7fb4ddff22cbcc356c9f888763b0c1963d389
+AUX grub-2.00-10_linux-genkernel.patch 1727 RMD160 a261fedaa6dabdf69059db65ae21d8a8b5398a91 SHA1 525ec9124cd3becd5d95e7c110899812ba5b86ef SHA256 d1699f3db468c39bf85fa8e22ac5ad8a04ecfa34c3a294b11ff3ba0633cd70b8
 AUX grub.conf.gentoo 627 RMD160 d90fb4373bad476f98ec9c5065d6cdfd9e3b706f SHA1 004f2fc04605ec9190de0a87e7df8bbc33daff89 SHA256 914b15af252210a32776196437cd8013e10e57d5780e66877ef3fe9a2b4b9776
 AUX grub.default 1254 RMD160 06e05de60133cc1e31769c6106031fe59de46053 SHA1 4fc3138fe313707bfdd307d4538bfc98c14c4cbc SHA256 181bdb7433ebcbde635e7058a1febaf0100e4e9c83ea4fd222d7010c375882d8
 DIST grub-0.92-gentoo-0.2.tar.bz2 21727 RMD160 f420e3352d46fdfb77a1121879382265805bc3ef SHA1 1bb1463067679aab909d1bd96996cfa72556de81 SHA256 f579b49b2d24702905c333ce2b6170a554ce26d0232c65478a21a1fd2eb8b8fe
@@ -50,15 +51,16 @@ EBUILD grub-2.00_beta0.ebuild 5993 RMD160 88832dcfd48236a47039c12c89c0099f2033b1
 EBUILD grub-2.00_beta1.ebuild 5837 RMD160 7269e69d2c57d79f3299dded2b9ac26c9c625e10 SHA1 d3b629db5ae54b3f8e9e168bcca51949e54a6136 SHA256 9b159e68d77c414e5b8e131ab3b18fe009e116ec78a7721a267f1ddd0bf91db9
 EBUILD grub-2.00_beta2-r1.ebuild 6572 RMD160 358eced67e79b91738abfb362b3920cd3b17d38e SHA1 7d51a484673ea6028c8a36b3048c82b379f4f9ba SHA256 9711a3d05e4f0e0a6bf5a83aef3995b356ac5ffc5d4a0d47f1c0eddbe6f919a9
 EBUILD grub-2.00_beta2.ebuild 6476 RMD160 43557ca6eb3e61f66fe4d8c2977d9ac1e4db2d96 SHA1 0d7d68e9869b646275d28e1acd3badbe80b33559 SHA256 d60330fd91721d586fe4254bbaa02add8accc2ea729fff1c376aa544ed4f96ca
+EBUILD grub-2.00_beta3-r1.ebuild 6548 RMD160 780668a6a07b2cb7d816285e20121540b2c15bfc SHA1 24ff5a9cfc326119a8b0e5f9aea0ca64ee87a431 SHA256 cb7b903bd1f622a7932c81134bfe5dd22b65ca14df45589ae9f1c46d7386a298
 EBUILD grub-2.00_beta3.ebuild 6488 RMD160 d0cbccc50d81e7b6e70c27c5309c2faec2ff3b44 SHA1 a2c074dcd6c535fb66a0ffb189dcf00394528772 SHA256 d39abf04dc1d6b4e03511647c3585ab8950b5778ec3a1fe0fe87de615b334477
 EBUILD grub-9999.ebuild 6483 RMD160 748fe0ae667575da0ac5343e4d8843395ea0221f SHA1 9d542764857f04fe57a9a1090404347851b38ef3 SHA256 86dbfcf375e6660306bb78e1bbb3ab800865379ea19e496f8de71d9b8e480ef8
-MISC ChangeLog 38975 RMD160 c9af7a8d1668bd20e3424f9f9fb89ddce1ee33c5 SHA1 c7c92d7fed56e6f725f9fd627c513d6f6b8393e6 SHA256 af9e1d77be244dd19b995d50268ae81bcd24a1d5d1076fce372038a86f7f71ca
+MISC ChangeLog 39189 RMD160 554a355dbf59553e38a67e849aa8cc4dd63362b1 SHA1 ddd7668bb7f271b9f0a66fb6c639f854d7008a6b SHA256 7643e90ca94adffb7740395ffbfd09b3ce79548b189d7013296e84eea970726b
 MISC grub-9999.ebuild.orig 6471 RMD160 44a6134970c488856e0df8f637e99768bdb00181 SHA1 c3c8c14032951bcc8a2350f97674e2156476c972 SHA256 d7ea52eca2b187d6d256bade46e0ba30def79e7d416c3ced1c63a72f4b308a4b
 MISC metadata.xml 673 RMD160 2181a768c776eed3e76c3604a2a0c03be360aa06 SHA1 0434ff5fb3b8702ca4a4661240ed08cfb06c529c SHA256 e14e5e46b726a3645b85217a2afbd5b04adb54990c7db837e01a50a8322d81b9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk94yG8ACgkQC77qH+pIQ6R6rQD6A3tNUS87jC8jii+hrbUWwvZf
-Drk1KD5EX+KPxC2oFioBAL27BQHgHLUXYFKnoU/PkxqiJnLZsGxjkGZ5xjspY3D4
-=PkBE
+iF4EAREIAAYFAk+Asp8ACgkQC77qH+pIQ6SsXQEAojWpyDdiSSqlC+MDJNEz+HMa
+bvijSFwtkvPTkjz3JMoA/RIlXQV7iMCBQ3Md77vPWCwTyJormVWQGDR7J8Xwaxm1
+=nooc
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch b/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch
new file mode 100644
index 000000000000..4849048ee832
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch
@@ -0,0 +1,49 @@
+=== modified file 'util/grub.d/10_linux.in'
+--- util/grub.d/10_linux.in	2012-03-10 14:21:25 +0000
++++ util/grub.d/10_linux.in	2012-04-07 21:24:06 +0000
+@@ -135,7 +135,7 @@
+   message="$(gettext_printf "Loading Linux %s ..." ${version})"
+   sed "s/^/$submenu_indentation/" << EOF
+ 	echo	'$message'
+-	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
++	linux	${rel_dirname}/${basename} ${rootcmd}=${linux_root_device_thisversion} ro ${args}
+ EOF
+   if test -n "${initrd}" ; then
+     # TRANSLATORS: ramdisk isn't identifier. Should be translated.
+@@ -181,19 +181,31 @@
+   alt_version=`echo $version | sed -e "s,\.old$,,g"`
+   linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
+ 
++  rootcmd=root
+   initrd=
++  pushd "${dirname}" > /dev/null
+   for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
+ 	   "initrd-${version}" "initramfs-${version}.img" \
+ 	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
+-	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
+-	   "initramfs-genkernel-${version}" \
+-	   "initramfs-genkernel-${alt_version}"; do
+-    if test -e "${dirname}/${i}" ; then
++	   "initrd-${alt_version}" "initramfs-${alt_version}.img"; do
++    if test -e "${i}" ; then
+       initrd="$i"
+       break
+     fi
+   done
+ 
++  if [ "x$initrd" = x ]; then
++    for i in "initramfs-genkernel"*"-${version}" \
++	     "initramfs-genkernel"*"-${alt_version}"; do
++      if test -e "${i}"; then
++	initrd="$i"
++	rootcmd=real_root
++	break
++      fi
++    done
++  fi
++  popd > /dev/null
++
+   config=
+   for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
+     if test -e "${i}" ; then
+
diff --git a/sys-boot/grub/grub-2.00_beta3-r1.ebuild b/sys-boot/grub/grub-2.00_beta3-r1.ebuild
new file mode 100644
index 000000000000..cc440f0b832b
--- /dev/null
+++ b/sys-boot/grub/grub-2.00_beta3-r1.ebuild
@@ -0,0 +1,270 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_beta3-r1.ebuild,v 1.1 2012/04/07 21:33:13 floppym Exp $
+
+EAPI=4
+
+if [[ ${PV} == "9999" ]] ; then
+	EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/grub/trunk/grub/"
+	LIVE_ECLASS="bzr"
+	SRC_URI=""
+	DO_AUTORECONF="true"
+else
+	MY_P=${P/_/\~}
+	if [[ ${PV} == *_alpha* || ${PV} == *_beta* ]]; then
+		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
+	else
+		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
+		mirror://gentoo/${MY_P}.tar.xz"
+	fi
+	# Masked until documentation guys consolidate the guide and approve
+	# it for usage.
+	#KEYWORDS="~amd64 ~mips ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+inherit eutils flag-o-matic pax-utils toolchain-funcs ${DO_AUTORECONF:+autotools} ${LIVE_ECLASS}
+unset LIVE_ECLASS
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+
+LICENSE="GPL-3"
+SLOT="2"
+IUSE="custom-cflags debug device-mapper efiemu mount nls static sdl truetype libzfs"
+
+GRUB_PLATFORMS=(
+	# everywhere:
+	emu
+	# mips only:
+	qemu-mips yeeloong
+	# amd64, x86, ppc, ppc64:
+	ieee1275
+	# amd64, x86:
+	coreboot multiboot efi-32 pc qemu
+	# amd64, ia64:
+	efi-64
+)
+IUSE+=" ${GRUB_PLATFORMS[@]/#/grub_platforms_}"
+
+# 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 )
+	libzfs? ( sys-fs/zfs )
+	mount? ( sys-fs/fuse )
+	truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
+DEPEND="${RDEPEND}
+	>=dev-lang/python-2.5.2
+	sys-devel/flex
+	virtual/yacc
+	sys-apps/texinfo
+"
+RDEPEND+="
+	grub_platforms_efi-32? ( sys-boot/efibootmgr )
+	grub_platforms_efi-64? ( sys-boot/efibootmgr )
+"
+if [[ -n ${DO_AUTORECONF} ]] ; 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="
+	usr/bin/grub*
+	usr/sbin/grub*
+	usr/lib*/grub/*/*.mod
+	usr/lib*/grub/*/kernel.exec
+	usr/lib*/grub/*/kernel.img
+	usr/lib*/grub/*/setjmp.module
+"
+
+QA_WX_LOAD="
+	usr/lib*/grub/*/kernel.exec
+	usr/lib*/grub/*/kernel.img
+	usr/lib*/grub/*/*.image
+"
+
+QA_PRESTRIPPED="
+	usr/lib.*/grub/.*/kernel.img
+"
+
+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 with_platform=
+
+	[[ -z ${platform} ]] && die "${FUNCNAME} [platform]"
+
+	# Used below for efi cross-building
+	tc-export CC NM OBJCOPY STRIP
+
+	estack_push CTARGET "${CTARGET}"
+	estack_push TARGET_CC "${TARGET_CC}"
+	estack_push TARGET_CFLAGS "${TARGET_CFLAGS}"
+	estack_push TARGET_CPPFLAGS "${TARGET_CPPFLAGS}"
+
+	case ${platform} in
+		efi-32)
+			if [[ ${CHOST} == x86_64* ]]; then
+				CTARGET="${CTARGET:-i386}"
+				TARGET_CC="${TARGET_CC:-${CC}}"
+				export TARGET_CC
+			fi
+			with_platform="--with-platform=efi"
+			;;
+		efi-64)
+			if [[ ${CHOST} == i?86* ]]; then
+				CTARGET="${CTARGET:-x86_64}"
+				TARGET_CC="${TARGET_CC:-${CC}}"
+				TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+				TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+				export TARGET_CC TARGET_CFLAGS TARGET_CPPFLAGS
+			fi
+			with_platform="--with-platform=efi"
+			;;
+		guessed) ;;
+		*) with_platform="--with-platform=${platform}" ;;
+	esac
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-werror \
+		--program-prefix= \
+		--program-transform-name="s,grub,grub2," \
+		--with-grubdir=grub2 \
+		${with_platform} \
+		$(use_enable debug mm-debug) \
+		$(use_enable debug grub-emu-usb) \
+		$(use_enable device-mapper) \
+		$(use_enable efiemu) \
+		$(use_enable mount grub-mount) \
+		$(use_enable nls) \
+		$(use_enable truetype grub-mkfont) \
+		$(use_enable libzfs) \
+		$(use sdl && use_enable debug grub-emu-sdl)
+
+	estack_pop CTARGET CTARGET || die
+	estack_pop TARGET_CC TARGET_CC || die
+	estack_pop TARGET_CFLAGS TARGET_CFLAGS || die
+	estack_pop TARGET_CPPFLAGS TARGET_CPPFLAGS || die
+}
+
+grub_src_compile() {
+	default_src_compile
+	pax-mark -mpes "${grub_binaries[@]}"
+}
+
+grub_src_install() {
+	default_src_install
+}
+
+src_prepare() {
+	local i j
+
+	epatch "${FILESDIR}/grub-2.00-10_linux-genkernel.patch"
+	epatch_user
+
+	# autogen.sh does more than just run autotools
+	if [[ -n ${DO_AUTORECONF} ]] ; 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"
+	elog "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
+}
+
+src_configure() {
+	local i
+
+	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
+	use libzfs && addpredict /etc/dfs
+	use static && append-ldflags -static
+
+	for i in ${GRUB_ENABLED_PLATFORMS}; do
+		grub_run_phase ${FUNCNAME} ${i}
+	done
+}
+
+src_compile() {
+	# Used for pax marking in grub_src_compile
+	local grub_binaries=(
+		grub-editenv
+		grub-fstest
+		grub-menulst2cfg
+		grub-mkimage
+		grub-mklayout
+		grub-mkpasswd-pbkdf2
+		grub-mkrelpath
+		grub-script-check
+		grub-bios-setup
+		grub-ofpathname
+		grub-probe
+		grub-sparc64-setup
+	)
+	use mount && grub_binaries+=( grub-mount )
+	use truetype && grub_binaries+=( grub-mkfont )
+
+	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
+
+	mv "${ED}"usr/share/info/grub{,2}.info || die
+
+	# can't be in docs array as we use default_src_install in different builddir
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	insinto /etc/default
+	newins "${FILESDIR}"/grub.default grub
+}
+
+pkg_postinst() {
+	# display the link to guide
+	elog "For information on how to configure grub-2 please refer to the guide:"
+	elog "    http://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
+}