summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-09-02 21:18:09 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-09-02 21:18:09 +0000
commit5cd6f191435dc78abf5c26f49a439c7926a5a8f6 (patch)
tree56df01f841b986a53143dc035fc5294bf360a77f /sys-boot
parentVersion bump (diff)
downloadgentoo-2-5cd6f191435dc78abf5c26f49a439c7926a5a8f6.tar.gz
gentoo-2-5cd6f191435dc78abf5c26f49a439c7926a5a8f6.tar.bz2
gentoo-2-5cd6f191435dc78abf5c26f49a439c7926a5a8f6.zip
Bug #330745: Grub needs executable stack. No version bump yet, new revbump with patchset coming in a few days.
(Portage version: 2.2_rc71/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/ChangeLog6
-rw-r--r--sys-boot/grub/grub-0.97-r10.ebuild7
2 files changed, 10 insertions, 3 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index a1a5713633e2..21b7610565ba 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.143 2010/08/24 22:52:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.144 2010/09/02 21:18:09 robbat2 Exp $
+
+ 02 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> grub-0.97-r10.ebuild:
+ Bug #330745: Grub needs executable stack. No version bump yet, new revbump
+ with patchset coming in a few days.
24 Aug 2010; Mike Frysinger <vapier@gentoo.org> grub-9999.ebuild:
Redo autotool generation now that upstream uses python/autogen #334333.
diff --git a/sys-boot/grub/grub-0.97-r10.ebuild b/sys-boot/grub/grub-0.97-r10.ebuild
index 97b33ba23058..b07369ca9aea 100644
--- a/sys-boot/grub/grub-0.97-r10.ebuild
+++ b/sys-boot/grub/grub-0.97-r10.ebuild
@@ -1,13 +1,13 @@
# 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-0.97-r10.ebuild,v 1.4 2010/07/31 22:26:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r10.ebuild,v 1.5 2010/09/02 21:18:09 robbat2 Exp $
# XXX: we need to review menu.lst vs grub.conf handling. We've been converting
# all systems to grub.conf (and symlinking menu.lst to grub.conf), but
# we never updated any of the source code (it still all wants menu.lst),
# and there is no indication that upstream is making the transition.
-inherit mount-boot eutils flag-o-matic toolchain-funcs autotools linux-info
+inherit mount-boot eutils flag-o-matic toolchain-funcs autotools linux-info pax-utils
PATCHVER="1.10" # Should match the revision ideally
DESCRIPTION="GNU GRUB Legacy boot loader"
@@ -157,6 +157,9 @@ src_install() {
exeinto /usr/lib/grub/${CHOST}
doexe nbgrub pxegrub stage2/stage2.netboot || die "netboot install"
fi
+
+ # bug 330745
+ pax-mark -m "${D}"/sbin/grub
dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
newdoc docs/menu.lst grub.conf.sample