diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-03-14 13:28:30 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-03-14 13:28:30 +0000 |
| commit | 0647ac1098ea23ab1d6ea60a9a372d0f5f8bf21e (patch) | |
| tree | 45a9b9c14191f9a30b2dcf6071959002d42eb0c3 /sys-boot/grub | |
| parent | amd64/x86 stable, bug #262421 (diff) | |
| download | gentoo-2-0647ac1098ea23ab1d6ea60a9a372d0f5f8bf21e.tar.gz gentoo-2-0647ac1098ea23ab1d6ea60a9a372d0f5f8bf21e.tar.bz2 gentoo-2-0647ac1098ea23ab1d6ea60a9a372d0f5f8bf21e.zip | |
Locate kernels made by genkernel #256335 and mark Gentoo as the distro.
(Portage version: 2.2_rc25/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot/grub')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-boot/grub/files/grub-1.96-genkernel.patch | 11 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 18 |
3 files changed, 32 insertions, 3 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index edef3e9b1db3..3ec26ec0fef6 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.111 2009/02/28 10:26:35 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.112 2009/03/14 13:28:30 vapier Exp $ + + 14 Mar 2009; Mike Frysinger <vapier@gentoo.org> + +files/grub-1.96-genkernel.patch, grub-9999.ebuild: + Locate kernels made by genkernel #256335 and mark Gentoo as the distro. 28 Feb 2009; Markus Meier <maekke@gentoo.org> metadata.xml: custom-cflags is a global USE-flag diff --git a/sys-boot/grub/files/grub-1.96-genkernel.patch b/sys-boot/grub/files/grub-1.96-genkernel.patch new file mode 100644 index 000000000000..471fc66a99da --- /dev/null +++ b/sys-boot/grub/files/grub-1.96-genkernel.patch @@ -0,0 +1,11 @@ +--- util/grub.d/10_linux.in ++++ util/grub.d/10_linux.in +@@ -93,7 +93,7 @@ + echo "$a" + } + +-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` + diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 660ea937f6e2..10b84fd67757 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 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.5 2009/01/01 11:24:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.6 2009/03/14 13:28:30 vapier Exp $ inherit mount-boot eutils flag-o-matic toolchain-funcs @@ -28,6 +28,16 @@ PROVIDE="virtual/bootloader" export STRIP_MASK="*/grub/*/*.mod" QA_EXECSTACK="sbin/grub-probe sbin/grub-setup" +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + subversion_src_unpack + else + unpack ${A} + fi + cd "${S}" + epatch "${FILESDIR}"/${PN}-1.96-genkernel.patch #256335 +} + src_compile() { use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS use static && append-ldflags -static @@ -43,6 +53,10 @@ src_compile() { 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 + EOF if use multislot ; then sed -i s:grub-install:grub2-install: "${D}"/sbin/grub-install mv "${D}"/sbin/grub{,2}-install || die |