diff options
| -rw-r--r-- | sys-boot/grub/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-boot/grub/files/grub-1.99-genkernel.patch | 19 | ||||
| -rw-r--r-- | sys-boot/grub/grub-1.98.ebuild | 4 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 8 |
4 files changed, 31 insertions, 6 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index e2c764731f84..9af1f6a02fcc 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.135 2010/06/25 06:19:58 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.136 2010/07/06 00:33:33 vapier Exp $ + + 06 Jul 2010; Mike Frysinger <vapier@gentoo.org> grub-1.98.ebuild, + +files/grub-1.99-genkernel.patch, grub-9999.ebuild: + Fix building with latest upstream revs #324587 by Jeff Kowalczyk. *grub-0.97-r10 (25 Jun 2010) diff --git a/sys-boot/grub/files/grub-1.99-genkernel.patch b/sys-boot/grub/files/grub-1.99-genkernel.patch new file mode 100644 index 000000000000..4947f8cec2d5 --- /dev/null +++ b/sys-boot/grub/files/grub-1.99-genkernel.patch @@ -0,0 +1,19 @@ +--- util/grub.d/10_linux.in ++++ util/grub.d/10_linux.in +@@ -102,7 +102,7 @@ + EOF + } + +-list=`for i in /boot/vmlinu[zx]-* /vmlinu[zx]-* ; do ++list=`for i in /boot/kernel-* /boot/vmlinu[zx]-* /vmlinu[zx]-* ; do + if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi + done` + prepare_boot_cache= +@@ -120,6 +120,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/grub-1.98.ebuild b/sys-boot/grub/grub-1.98.ebuild index 9dca37fe657f..2fea4f2b81aa 100644 --- a/sys-boot/grub/grub-1.98.ebuild +++ b/sys-boot/grub/grub-1.98.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.2 2010/05/08 17:21:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.98.ebuild,v 1.3 2010/07/06 00:33:33 vapier Exp $ # XXX: need to implement a grub.conf migration in pkg_postinst before we ~arch @@ -31,7 +31,7 @@ DEPEND="${RDEPEND} PROVIDE="virtual/bootloader" export STRIP_MASK="*/grub/*/*.mod" -QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap" +QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check" src_unpack() { if [[ ${PV} == "9999" ]] ; then diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 94123c7c5051..246179d87fea 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2010 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.20 2010/05/08 17:21:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.21 2010/07/06 00:33:33 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 @@ -29,7 +31,7 @@ DEPEND="${RDEPEND} PROVIDE="virtual/bootloader" export STRIP_MASK="*/grub/*/*.mod" -QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap" +QA_EXECSTACK="sbin/grub-probe sbin/grub-setup sbin/grub-mkdevicemap bin/grub-script-check" src_unpack() { if [[ ${PV} == "9999" ]] ; then @@ -38,7 +40,7 @@ src_unpack() { unpack ${A} fi cd "${S}" - epatch "${FILESDIR}"/${PN}-1.96-genkernel.patch #256335 + epatch "${FILESDIR}"/${PN}-1.99-genkernel.patch #256335 epatch_user # autogen.sh does more than just run autotools |