[gentoo-commits] dev/dev-zero:master commit in: sys-boot/grub/files/, sys-boot/grub/

["Tiziano Müller" <dev-zero@gentoo.org>]

commit:     23a12b74c8ebf79bb564fce71bdde56b879305d7
Author:     Tiziano Mueller <dev-zero <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  4 13:30:19 2011 +0000
Commit:     Tiziano Müller <dev-zero <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 13:30:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=23a12b74

Version bump.

---
 sys-boot/grub/Manifest                             |    5 +-
 .../files/0001-recognize-genkernel-images.patch    |   35 +++++++++
 .../{grub-1.97.2.ebuild => grub-1.99_rc1.ebuild}   |   74 ++++++++++++++-----
 3 files changed, 92 insertions(+), 22 deletions(-)

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 93e2d0a..25844c3 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,4 +1,5 @@
+AUX 0001-recognize-genkernel-images.patch 1228 RMD160 e5baf9f5a17e801f0524921021aa070e592e29a6 SHA1 8c2c519aa73ce5fb710931b36463de8bda30b378 SHA256 f07c4a45df92897a17e7fac6692ea62331b4f1d80eb387bd02c89db9d9a39ef7
 AUX 1.97.1-gentoo.patch 11058 RMD160 127aceb638eb2bcc22210335b8ab95679445a1f2 SHA1 efba3fc077e5b5788cef5bd4417702d0006de968 SHA256 d9521cc9c765b25a98eb1c30c881eea35ba4b0b51a120ce84b2717380aef009d
 AUX 1.97.1-recognize-genkernel-images.patch 858 RMD160 6029d02fc60175182c42a0a3b80ef3ef292e95c9 SHA1 86f844f29c95124927aced70c3997db3d8470889 SHA256 3e314ee4d3157819ee3a4d005aea62ce206728753f034780df33dbb92063c51b
-EBUILD grub-1.97.2.ebuild 2482 RMD160 ec51cc0c46399888566deb0da010ac8cb1940813 SHA1 5fcb9ebef4d154ee8fc71e37b79a7a5ab26a9f24 SHA256 e23aa7d005af4be6ee06116388ea00c10d5f7b082c7d6a084d944160a697e223
-DIST grub-1.97.2.tar.gz 1249181 RMD160 6f1779edb70f5d111fbc6e018547e78c042d2c3b SHA1 90aca596add560afeb9f2a829421dfd360d4c725 SHA256 98c1d2623ce809ec25ba9136ea59c15a4580c71478d122be765e819cb06a1c49
+EBUILD grub-1.99_rc1.ebuild 3436 RMD160 48177e8c31a827b2435fbbfea4600f6522d925f4 SHA1 07cf46a56e676e638791865420360f33b5c8272d SHA256 d19e753367956cdbe963a0b597a1da4db0c8a2b9b76e120bfeffe4e61b3fd35f
+DIST grub-1.99~rc1.tar.gz 4256752 RMD160 e99ac336db296cd2aaaf9529a230833383b2fdbf SHA1 866b6979974ad7209d236cb4e1819039f0bd1c6d SHA256 f0333efa6c5e3198f658b8124eebcf613b916b7873d647abb009169d1ff39d52

diff --git a/sys-boot/grub/files/0001-recognize-genkernel-images.patch b/sys-boot/grub/files/0001-recognize-genkernel-images.patch
new file mode 100644
index 0000000..bc03aa8
--- /dev/null
+++ b/sys-boot/grub/files/0001-recognize-genkernel-images.patch
@@ -0,0 +1,35 @@
+From a2d640d0b593108bdc35c8495d8981999646a22f Mon Sep 17 00:00:00 2001
+From: Tiziano Mueller <dev-zero@gentoo.org>
+Date: Tue, 8 Mar 2011 11:12:04 +0100
+Subject: [PATCH] recognize genkernel images
+
+---
+ util/grub.d/10_linux.in |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index a09c3e6..e618544 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -111,7 +111,7 @@ EOF
+ EOF
+ }
+ 
+-list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* ; do
++list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
+         if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
+       done`
+ prepare_boot_cache=
+@@ -130,7 +130,8 @@ while [ "x$list" != "x" ] ; do
+   for i in "initrd.img-${version}" "initrd-${version}.img" \
+ 	   "initrd-${version}" "initramfs-${version}.img" \
+ 	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
+-	   "initrd-${alt_version}" "initramfs-${alt_version}.img"; do
++	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
++       "initramfs-*-${alt_version}" ; do
+     if test -e "${dirname}/${i}" ; then
+       initrd="$i"
+       break
+-- 
+1.7.4.1
+

diff --git a/sys-boot/grub/grub-1.97.2.ebuild b/sys-boot/grub/grub-1.99_rc1.ebuild
similarity index 53%
rename from sys-boot/grub/grub-1.97.2.ebuild
rename to sys-boot/grub/grub-1.99_rc1.ebuild
index 9a8f7f0..393629a 100644
--- a/sys-boot/grub/grub-1.97.2.ebuild
+++ b/sys-boot/grub/grub-1.99_rc1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="2"
 
-inherit eutils flag-o-matic multilib
+inherit eutils flag-o-matic multilib mount-boot
 
 MY_P="${P/_/~}"
 
@@ -16,27 +16,29 @@ SLOT="2"
 KEYWORDS="~amd64 ~x86"
 IUSE="amd64 custom-cflags +debug efiemu multilib static truetype usb"
 
-DEPEND=">=sys-libs/ncurses-5.2-r5
-	truetype? ( media-libs/freetype:2 )
+RDEPEND=">=sys-libs/ncurses-5.2-r5
+    dev-libs/lzo
+	truetype? ( media-libs/freetype:2 >=media-fonts/unifont-5 )
 	usb? ( virtual/libusb:0 )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	>=sys-devel/autogen-5.10
+	>=dev-lang/python-2.5.2"
 
 PROVIDE="virtual/bootloader"
 
 export STRIP_MASK="*/grub/*/*.mod"
-QA_EXECSTACK="sbin/grub-probe sbin/grub-setup"
+QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check bin/grub-fstest"
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}/1.97.1-recognize-genkernel-images.patch" \
-		"${FILESDIR}/1.97.1-gentoo.patch"
+		"${FILESDIR}/0001-recognize-genkernel-images.patch"
 	# don't want to have to run autoconf here but
 	# patching configure screws the patch for every version bump
-	sed -i \
-		-e "s|PACKAGE_TARNAME='grub'|PACKAGE_TARNAME='grub2'|" \
-		configure || die "sed failed"
+#	sed -i \
+#		-e "s|PACKAGE_TARNAME='grub'|PACKAGE_TARNAME='grub2'|" \
+#		configure || die "sed failed"
 }
 
 src_configure() {
@@ -59,7 +61,7 @@ src_configure() {
 	else
 		myconf="${myconf} --disable-efiemu"
 	fi
-	
+
 	if use usb ; then
 		if use debug ; then
 			myconf="${myconf} --enable-grub-emu-usb"
@@ -72,26 +74,58 @@ src_configure() {
 	fi
 
 	econf \
+		--disable-werror \
 		--sbindir=/sbin \
 		--bindir=/bin \
 		--libdir="${libdir}" \
-		--disable-werror \
+		--program-transform-name="s|grub|grub2|" \
+		$(use_enable truetype grub-mkfont) \
+		$(use_enable debug mm-debug) \
 		$(use_enable debug grub-emu) \
 		$(use_enable debug grub-fstest) \
 		--enable-grub-pe2elf \
-		$(use_enable truetype grub-mkfont) \
 		${myconf}
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
-	local b=""
-	for f in "${D}"/sbin/* "${D}"/bin/* "${D}"/usr/share/man/man1/* "${D}"/usr/share/man/man8/* ; do
-		b="$(basename "${f}")"
-		mv "${f}" "$(dirname "${f}")/${b/grub/grub2}" || die "renaming \"${f}\" failed"
-	done
+	cat <<-EOF >> "${D}"/lib*/grub/grub-mkconfig_lib
+	GRUB_DISTRIBUTOR="Gentoo"
+	EOF
+#	local b=""
+#	for f in "${D}"/sbin/* "${D}"/bin/* "${D}"/usr/share/man/man1/* "${D}"/usr/share/man/man8/* ; do
+#		b="$(basename "${f}")"
+#		mv "${f}" "$(dirname "${f}")/${b/grub/grub2}" || die "renaming \"${f}\" failed"
+#	done
 
 	mv "${D}"/usr/share/info/grub{,2}.info
 }
+
+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
+}