* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-1.99-r2.ebuild ChangeLog grub-9999.ebuild
@ 2011-09-06 15:32 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 6+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-09-06 15:32 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/09/06 15:32:00
Modified: grub-1.99-r2.ebuild ChangeLog grub-9999.ebuild
Log:
Do not show qa warnings about exec. Fixes bug #381041.
(Portage version: 2.2.0_alpha53/cvs/Linux x86_64)
Revision Changes Path
1.2 sys-boot/grub/grub-1.99-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?r1=1.1&r2=1.2
Index: grub-1.99-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grub-1.99-r2.ebuild 4 Sep 2011 09:17:44 -0000 1.1
+++ grub-1.99-r2.ebuild 6 Sep 2011 15:31:59 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.1 2011/09/04 09:17:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.2 2011/09/06 15:31:59 scarabeus Exp $
EAPI=4
@@ -83,6 +83,11 @@
bin/grub2-mkimage
"
+QA_WX_LOAD="
+ lib*/grub2/*/kernel.img
+ lib*/grub2/*/setjmp.mod
+"
+
grub_run_phase() {
local phase=$1
local platform=$2
1.165 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.165&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.165&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.164&r2=1.165
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- ChangeLog 4 Sep 2011 09:17:44 -0000 1.164
+++ ChangeLog 6 Sep 2011 15:31:59 -0000 1.165
@@ -1,6 +1,10 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.164 2011/09/04 09:17:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.165 2011/09/06 15:31:59 scarabeus Exp $
+
+ 06 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> grub-1.99-r2.ebuild,
+ grub-9999.ebuild:
+ Do not show qa warnings about exec. Fixes bug #381041.
*grub-1.99-r2 (04 Sep 2011)
1.41 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.40&r2=1.41
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- grub-9999.ebuild 31 Aug 2011 11:27:51 -0000 1.40
+++ grub-9999.ebuild 6 Sep 2011 15:31:59 -0000 1.41
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.40 2011/08/31 11:27:51 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.41 2011/09/06 15:31:59 scarabeus Exp $
EAPI=4
@@ -83,6 +83,11 @@
bin/grub2-mkimage
"
+QA_WX_LOAD="
+ lib*/grub2/*/kernel.img
+ lib*/grub2/*/setjmp.mod
+"
+
grub_run_phase() {
local phase=$1
local platform=$2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-1.99-r2.ebuild ChangeLog grub-9999.ebuild
@ 2011-09-14 17:57 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 6+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-09-14 17:57 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/09/14 17:57:08
Modified: grub-1.99-r2.ebuild ChangeLog grub-9999.ebuild
Log:
Run the configure phase for the package only in the pkg_config. Fixes bug #382769.
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Revision Changes Path
1.3 sys-boot/grub/grub-1.99-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?r1=1.2&r2=1.3
Index: grub-1.99-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grub-1.99-r2.ebuild 6 Sep 2011 15:31:59 -0000 1.2
+++ grub-1.99-r2.ebuild 14 Sep 2011 17:57:08 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.2 2011/09/06 15:31:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.3 2011/09/14 17:57:08 scarabeus Exp $
EAPI=4
@@ -245,12 +245,15 @@
cat <<EOF >> "${ED}"/lib*/grub2/grub-mkconfig_lib
GRUB_DISTRIBUTOR="Gentoo"
EOF
+
+ elog "Remember to run emerge --config =${CATEGORY}/${P} in order"
+ elog "to set up basic settings for this package."
}
setup_boot_dir() {
local dir=$1
- # display the link to guide if user didn't set up anything yet.
+ # display the link to guide
elog "For informations how to configure grub-2 please reffer to the guide:"
elog " http://dev.gentoo.org/~scarabeus/grub-2-guide.xml"
@@ -265,7 +268,7 @@
einfo "Even if we just created configuration for your grub2 using old"
einfo "grub-legacy configuration file you should migrate to use new style"
- einfo "configuration in '${ROOT}/etc/grub.d'."
+ einfo "configuration in '${ROOT}/etc/grub.d' and '${ROOT}/etc/defaults/grub'."
einfo
else
@@ -275,18 +278,21 @@
ewarn "Running grub2-mkconfig failed! Check your configuration files!"
fi
- elog "Remember to run \"grub2-mkconfig -o '${dir}/grub.cfg'\" every time"
- elog "you update the configuration files!"
-
elog "Remember to run grub2-install to install your grub every time"
elog "you update this package!"
}
-pkg_postinst() {
+pkg_config() {
+ local dir
+
mount-boot_mount_boot_partition
- setup_boot_dir "${ROOT}"boot/grub2
+ einfo "Enter the directory where you want to setup grub2 ('${ROOT}boot/grub2/'):"
+ read dir
+
+ [[ -z ${dir} ]] && dir="${ROOT}"boot/grub2
+
+ setup_boot_dir "${dir}"
- # needs to be called after we call setup_boot_dir
mount-boot_pkg_postinst
}
1.167 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.167&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.167&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.166&r2=1.167
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- ChangeLog 10 Sep 2011 02:33:59 -0000 1.166
+++ ChangeLog 14 Sep 2011 17:57:08 -0000 1.167
@@ -1,6 +1,11 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.166 2011/09/10 02:33:59 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.167 2011/09/14 17:57:08 scarabeus Exp $
+
+ 14 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> grub-1.99-r2.ebuild,
+ grub-9999.ebuild:
+ Run the configure phase for the package only in the pkg_config. Fixes bug
+ #382769.
10 Sep 2011; Ryan Hill <dirtyepic@gentoo.org> grub-0.97-r10.ebuild:
Release patchset 1.11 to work around miscompilation with gcc-4.6 (bug
1.42 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.41&r2=1.42
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- grub-9999.ebuild 6 Sep 2011 15:31:59 -0000 1.41
+++ grub-9999.ebuild 14 Sep 2011 17:57:08 -0000 1.42
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.41 2011/09/06 15:31:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.42 2011/09/14 17:57:08 scarabeus Exp $
EAPI=4
@@ -241,12 +241,15 @@
cat <<EOF >> "${ED}"/lib*/grub2/grub-mkconfig_lib
GRUB_DISTRIBUTOR="Gentoo"
EOF
+
+ elog "Remember to run emerge --config =${CATEGORY}/${P} in order"
+ elog "to set up basic settings for this package."
}
setup_boot_dir() {
local dir=$1
- # display the link to guide if user didn't set up anything yet.
+ # display the link to guide
elog "For informations how to configure grub-2 please reffer to the guide:"
elog " http://dev.gentoo.org/~scarabeus/grub-2-guide.xml"
@@ -261,7 +264,7 @@
einfo "Even if we just created configuration for your grub2 using old"
einfo "grub-legacy configuration file you should migrate to use new style"
- einfo "configuration in '${ROOT}/etc/grub.d'."
+ einfo "configuration in '${ROOT}/etc/grub.d' and '${ROOT}/etc/defaults/grub'."
einfo
else
@@ -271,18 +274,21 @@
ewarn "Running grub2-mkconfig failed! Check your configuration files!"
fi
- elog "Remember to run \"grub2-mkconfig -o '${dir}/grub.cfg'\" every time"
- elog "you update the configuration files!"
-
elog "Remember to run grub2-install to install your grub every time"
elog "you update this package!"
}
-pkg_postinst() {
+pkg_config() {
+ local dir
+
mount-boot_mount_boot_partition
- setup_boot_dir "${ROOT}"boot/grub2
+ einfo "Enter the directory where you want to setup grub2 ('${ROOT}boot/grub2/'):"
+ read dir
+
+ [[ -z ${dir} ]] && dir="${ROOT}"boot/grub2
+
+ setup_boot_dir "${dir}"
- # needs to be called after we call setup_boot_dir
mount-boot_pkg_postinst
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-1.99-r2.ebuild ChangeLog grub-9999.ebuild
@ 2011-10-03 9:10 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 6+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-10-03 9:10 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/10/03 09:10:13
Modified: grub-1.99-r2.ebuild ChangeLog grub-9999.ebuild
Log:
Include minor fixes from Robert Trace <rtrace{at}farcaster.org>
(Portage version: 2.2.0_alpha60/cvs/Linux x86_64)
Revision Changes Path
1.4 sys-boot/grub/grub-1.99-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?r1=1.3&r2=1.4
Index: grub-1.99-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- grub-1.99-r2.ebuild 14 Sep 2011 17:57:08 -0000 1.3
+++ grub-1.99-r2.ebuild 3 Oct 2011 09:10:13 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.3 2011/09/14 17:57:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.4 2011/10/03 09:10:13 scarabeus Exp $
EAPI=4
@@ -235,10 +235,10 @@
"bin/grub2-mkimage"
)
for e in ${PAX[@]}; do
- pax-mark -mpx "${ED}/${e}"
+ pax-mark -mp "${ED}/${e}"
done
- # can't be in docs array as we use defualt_src_install in different builddir
+ # 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
@@ -246,7 +246,7 @@
GRUB_DISTRIBUTOR="Gentoo"
EOF
- elog "Remember to run emerge --config =${CATEGORY}/${P} in order"
+ elog "Remember to run emerge --config =${CATEGORY}/${PF} in order"
elog "to set up basic settings for this package."
}
@@ -254,9 +254,12 @@
local dir=$1
# display the link to guide
- elog "For informations how to configure grub-2 please reffer to the guide:"
+ elog "For informations how to configure grub-2 please refer to the guide:"
elog " http://dev.gentoo.org/~scarabeus/grub-2-guide.xml"
+ # Make sure target directory exists
+ mkdir -p "${dir}"
+
if [[ ! -e ${dir}/grub.cfg && -e ${dir/2/}/menu.lst ]] ; then
# This is first grub2 install and we have old configuraton for
# grub1 around. Lets try to generate grub.cfg from it so user
1.168 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.168&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.168&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.167&r2=1.168
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- ChangeLog 14 Sep 2011 17:57:08 -0000 1.167
+++ ChangeLog 3 Oct 2011 09:10:13 -0000 1.168
@@ -1,6 +1,10 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.167 2011/09/14 17:57:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.168 2011/10/03 09:10:13 scarabeus Exp $
+
+ 03 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> grub-1.99-r2.ebuild,
+ grub-9999.ebuild:
+ Include minor fixes from Robert Trace <rtrace{at}farcaster.org>
14 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> grub-1.99-r2.ebuild,
grub-9999.ebuild:
1.43 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.42&r2=1.43
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- grub-9999.ebuild 14 Sep 2011 17:57:08 -0000 1.42
+++ grub-9999.ebuild 3 Oct 2011 09:10:13 -0000 1.43
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.42 2011/09/14 17:57:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.43 2011/10/03 09:10:13 scarabeus Exp $
EAPI=4
@@ -231,10 +231,10 @@
"bin/grub2-mkimage"
)
for e in ${PAX[@]}; do
- pax-mark -mpx "${ED}/${e}"
+ pax-mark -mp "${ED}/${e}"
done
- # can't be in docs array as we use defualt_src_install in different builddir
+ # 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
@@ -242,7 +242,7 @@
GRUB_DISTRIBUTOR="Gentoo"
EOF
- elog "Remember to run emerge --config =${CATEGORY}/${P} in order"
+ elog "Remember to run emerge --config =${CATEGORY}/${PF} in order"
elog "to set up basic settings for this package."
}
@@ -250,9 +250,12 @@
local dir=$1
# display the link to guide
- elog "For informations how to configure grub-2 please reffer to the guide:"
+ elog "For informations how to configure grub-2 please refer to the guide:"
elog " http://dev.gentoo.org/~scarabeus/grub-2-guide.xml"
+ # Make sure target directory exists
+ mkdir -p "${dir}"
+
if [[ ! -e ${dir}/grub.cfg && -e ${dir/2/}/menu.lst ]] ; then
# This is first grub2 install and we have old configuraton for
# grub1 around. Lets try to generate grub.cfg from it so user
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-1.99-r2.ebuild ChangeLog grub-9999.ebuild
@ 2011-10-04 18:23 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 6+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-10-04 18:23 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/10/04 18:23:19
Modified: grub-1.99-r2.ebuild ChangeLog grub-9999.ebuild
Log:
Include option to prompt for grub1 configuration. Thanks to Robert Trace rtrace{at}farcaster.org for the patch.
(Portage version: 2.2.0_alpha60/cvs/Linux x86_64)
Revision Changes Path
1.5 sys-boot/grub/grub-1.99-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?r1=1.4&r2=1.5
Index: grub-1.99-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grub-1.99-r2.ebuild 3 Oct 2011 09:10:13 -0000 1.4
+++ grub-1.99-r2.ebuild 4 Oct 2011 18:23:19 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.4 2011/10/03 09:10:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.5 2011/10/04 18:23:19 scarabeus Exp $
EAPI=4
@@ -187,7 +187,7 @@
use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
done
[[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
- einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
+ elog "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
}
src_configure() {
@@ -246,43 +246,66 @@
GRUB_DISTRIBUTOR="Gentoo"
EOF
- elog "Remember to run emerge --config =${CATEGORY}/${PF} in order"
- elog "to set up basic settings for this package."
-}
-
-setup_boot_dir() {
- local dir=$1
+ elog
+ elog "To configure GRUB 2, check the defaults in /etc/default/grub and"
+ elog "then run 'emerge --config =${CATEGORY}/${PF}'."
# display the link to guide
+ show_doc_url
+}
+
+show_doc_url() {
+ elog
elog "For informations how to configure grub-2 please refer to the guide:"
elog " http://dev.gentoo.org/~scarabeus/grub-2-guide.xml"
+}
+
+setup_boot_dir() {
+ local dir=$1
+ local use_legacy='n'
# Make sure target directory exists
mkdir -p "${dir}"
- if [[ ! -e ${dir}/grub.cfg && -e ${dir/2/}/menu.lst ]] ; then
- # This is first grub2 install and we have old configuraton for
- # grub1 around. Lets try to generate grub.cfg from it so user
- # does not loose any stuff when rebooting.
- # NOTE: in long term he still NEEDS to migrate to grub.d stuff.
- einfo "Running: grub2-menulst2cfg '${dir/2/}/menu.lst' '${dir}/grub.cfg'"
- grub2-menulst2cfg "${dir/2/}/menu.lst" "${dir}/grub.cfg" || \
- ewarn "Running grub2-menulst2cfg failed!"
-
- einfo "Even if we just created configuration for your grub2 using old"
- einfo "grub-legacy configuration file you should migrate to use new style"
- einfo "configuration in '${ROOT}/etc/grub.d' and '${ROOT}/etc/defaults/grub'."
- einfo
+ if [[ -e ${dir/2/}/menu.lst ]] ; then
+ # Legacy config exists, ask user what to do
+ einfo "Found legacy GRUB configuration. Do you want to convert it"
+ einfo "instead of using autoconfig (y/N)?"
+ read use_legacy
+
+ use_legacy=${use_legacy,,[A-Z]}
+ fi
+
+ if [[ ${use_legacy} == y* ]] ; then
+ grub1_cfg=${dir/2/}/menu.lst
+ grub2_cfg=${dir}/grub.cfg
+
+ # GRUB legacy configuration exists. Use it instead of doing
+ # our normal autoconfigure.
+ #
+
+ einfo "Converting legacy config at '${grub1_cfg}' for use by GRUB2."
+ ebegin "Running: grub2-menulst2cfg '${grub1_cfg}' '${grub2_cfg}'"
+ grub2-menulst2cfg "${grub1_cfg}" "${grub2_cfg}" &> /dev/null
+ eend $?
+
+ ewarn
+ ewarn "Even though the conversion above succeeded, you are STRONGLY"
+ ewarn "URGED to upgrade to the new GRUB2 configuration format."
+ # Remind the user about the documentation
+ show_doc_url
else
- # we need to refresh the grub.cfg everytime just to play it safe
- einfo "Running: grub2-mkconfig -o '${dir}/grub.cfg'"
- grub2-mkconfig -o "${dir}/grub.cfg" || \
- ewarn "Running grub2-mkconfig failed! Check your configuration files!"
+ # Run GRUB 2 autoconfiguration
+ einfo "Running GRUB 2 autoconfiguration."
+ ebegin "grub2-mkconfig -o '${dir}/grub.cfg'"
+ grub2-mkconfig -o "${dir}/grub.cfg" &> /dev/null
+ eend $?
fi
- elog "Remember to run grub2-install to install your grub every time"
- elog "you update this package!"
+ einfo
+ einfo "Remember to run grub2-install to activate GRUB2 as your default"
+ einfo "bootloader."
}
pkg_config() {
1.169 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.169&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.169&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.168&r2=1.169
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- ChangeLog 3 Oct 2011 09:10:13 -0000 1.168
+++ ChangeLog 4 Oct 2011 18:23:19 -0000 1.169
@@ -1,6 +1,11 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.168 2011/10/03 09:10:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.169 2011/10/04 18:23:19 scarabeus Exp $
+
+ 04 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> grub-1.99-r2.ebuild,
+ grub-9999.ebuild:
+ Include option to prompt for grub1 configuration. Thanks to Robert Trace
+ rtrace{at}farcaster.org for the patch.
03 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org> grub-1.99-r2.ebuild,
grub-9999.ebuild:
1.44 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.43&r2=1.44
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- grub-9999.ebuild 3 Oct 2011 09:10:13 -0000 1.43
+++ grub-9999.ebuild 4 Oct 2011 18:23:19 -0000 1.44
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.43 2011/10/03 09:10:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.44 2011/10/04 18:23:19 scarabeus Exp $
EAPI=4
@@ -183,7 +183,7 @@
use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
done
[[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
- einfo "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
+ elog "Going to build following platforms: ${GRUB_ENABLED_PLATFORMS}"
}
src_configure() {
@@ -242,43 +242,66 @@
GRUB_DISTRIBUTOR="Gentoo"
EOF
- elog "Remember to run emerge --config =${CATEGORY}/${PF} in order"
- elog "to set up basic settings for this package."
-}
-
-setup_boot_dir() {
- local dir=$1
+ elog
+ elog "To configure GRUB 2, check the defaults in /etc/default/grub and"
+ elog "then run 'emerge --config =${CATEGORY}/${PF}'."
# display the link to guide
+ show_doc_url
+}
+
+show_doc_url() {
+ elog
elog "For informations how to configure grub-2 please refer to the guide:"
elog " http://dev.gentoo.org/~scarabeus/grub-2-guide.xml"
+}
+
+setup_boot_dir() {
+ local dir=$1
+ local use_legacy='n'
# Make sure target directory exists
mkdir -p "${dir}"
- if [[ ! -e ${dir}/grub.cfg && -e ${dir/2/}/menu.lst ]] ; then
- # This is first grub2 install and we have old configuraton for
- # grub1 around. Lets try to generate grub.cfg from it so user
- # does not loose any stuff when rebooting.
- # NOTE: in long term he still NEEDS to migrate to grub.d stuff.
- einfo "Running: grub2-menulst2cfg '${dir/2/}/menu.lst' '${dir}/grub.cfg'"
- grub2-menulst2cfg "${dir/2/}/menu.lst" "${dir}/grub.cfg" || \
- ewarn "Running grub2-menulst2cfg failed!"
-
- einfo "Even if we just created configuration for your grub2 using old"
- einfo "grub-legacy configuration file you should migrate to use new style"
- einfo "configuration in '${ROOT}/etc/grub.d' and '${ROOT}/etc/defaults/grub'."
- einfo
+ if [[ -e ${dir/2/}/menu.lst ]] ; then
+ # Legacy config exists, ask user what to do
+ einfo "Found legacy GRUB configuration. Do you want to convert it"
+ einfo "instead of using autoconfig (y/N)?"
+ read use_legacy
+
+ use_legacy=${use_legacy,,[A-Z]}
+ fi
+
+ if [[ ${use_legacy} == y* ]] ; then
+ grub1_cfg=${dir/2/}/menu.lst
+ grub2_cfg=${dir}/grub.cfg
+
+ # GRUB legacy configuration exists. Use it instead of doing
+ # our normal autoconfigure.
+ #
+
+ einfo "Converting legacy config at '${grub1_cfg}' for use by GRUB2."
+ ebegin "Running: grub2-menulst2cfg '${grub1_cfg}' '${grub2_cfg}'"
+ grub2-menulst2cfg "${grub1_cfg}" "${grub2_cfg}" &> /dev/null
+ eend $?
+
+ ewarn
+ ewarn "Even though the conversion above succeeded, you are STRONGLY"
+ ewarn "URGED to upgrade to the new GRUB2 configuration format."
+ # Remind the user about the documentation
+ show_doc_url
else
- # we need to refresh the grub.cfg everytime just to play it safe
- einfo "Running: grub2-mkconfig -o '${dir}/grub.cfg'"
- grub2-mkconfig -o "${dir}/grub.cfg" || \
- ewarn "Running grub2-mkconfig failed! Check your configuration files!"
+ # Run GRUB 2 autoconfiguration
+ einfo "Running GRUB 2 autoconfiguration."
+ ebegin "grub2-mkconfig -o '${dir}/grub.cfg'"
+ grub2-mkconfig -o "${dir}/grub.cfg" &> /dev/null
+ eend $?
fi
- elog "Remember to run grub2-install to install your grub every time"
- elog "you update this package!"
+ einfo
+ einfo "Remember to run grub2-install to activate GRUB2 as your default"
+ einfo "bootloader."
}
pkg_config() {
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-1.99-r2.ebuild ChangeLog grub-9999.ebuild
@ 2011-11-18 0:04 Mike Frysinger (vapier)
0 siblings, 0 replies; 6+ messages in thread
From: Mike Frysinger (vapier) @ 2011-11-18 0:04 UTC (permalink / raw
To: gentoo-commits
vapier 11/11/18 00:04:29
Modified: grub-1.99-r2.ebuild ChangeLog grub-9999.ebuild
Log:
Simplify GRUB_PLATFORMS handling, and move masking here.
(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)
Revision Changes Path
1.8 sys-boot/grub/grub-1.99-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?r1=1.7&r2=1.8
Index: grub-1.99-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- grub-1.99-r2.ebuild 11 Nov 2011 13:42:09 -0000 1.7
+++ grub-1.99-r2.ebuild 18 Nov 2011 00:04:29 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.7 2011/11/11 13:42:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.8 2011/11/18 00:04:29 vapier Exp $
EAPI=4
@@ -13,6 +13,9 @@
MY_P=${P/_/\~}
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
mirror://gentoo/${MY_P}.tar.xz"
+ # Masked until documentation guys consolidate the guide and approve
+ # it for usage.
+ #KEYWORDS="~amd64 ~mips ~x86"
S=${WORKDIR}/${MY_P}
fi
@@ -24,24 +27,21 @@
LICENSE="GPL-3"
SLOT="2"
-[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~mips ~x86"
IUSE="custom-cflags debug device-mapper efiemu nls static sdl truetype"
-GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
-# everywhere:
-# emu
-# mips only:
-# qemu-mips, yeeloong
-# amd64, x86, ppc, ppc64
-# ieee1275
-# amd64, x86
-# coreboot, multiboot, efi-32, pc, qemu
-# amd64
-# efi-64
-for i in ${GRUB_PLATFORMS}; do
- IUSE+=" grub_platforms_${i}"
-done
-unset i
+GRUB_PLATFORMS=(
+ # everywhere:
+ emu
+ # mips only:
+ qemu-mips yeeloong
+ # amd64, x86, ppc, ppc64:
+ ieee1275
+ # amd64, x86:
+ coreboot multiboot efi-32 pc qemu
+ # amd64:
+ 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
@@ -192,7 +192,7 @@
# get enabled platforms
GRUB_ENABLED_PLATFORMS=""
- for i in ${GRUB_PLATFORMS}; do
+ for i in ${GRUB_PLATFORMS[@]}; do
use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
done
[[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
1.173 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.173&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.173&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.172&r2=1.173
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- ChangeLog 11 Nov 2011 13:42:09 -0000 1.172
+++ ChangeLog 18 Nov 2011 00:04:29 -0000 1.173
@@ -1,6 +1,10 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.172 2011/11/11 13:42:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.173 2011/11/18 00:04:29 vapier Exp $
+
+ 18 Nov 2011; Mike Frysinger <vapier@gentoo.org> grub-1.99-r2.ebuild,
+ grub-9999.ebuild:
+ Simplify GRUB_PLATFORMS handling, and move masking here.
11 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org> grub-1.99-r2.ebuild,
grub-9999.ebuild:
1.47 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.46&r2=1.47
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- grub-9999.ebuild 11 Nov 2011 13:42:09 -0000 1.46
+++ grub-9999.ebuild 18 Nov 2011 00:04:29 -0000 1.47
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.46 2011/11/11 13:42:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.47 2011/11/18 00:04:29 vapier Exp $
EAPI=4
@@ -13,6 +13,9 @@
MY_P=${P/_/\~}
SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
mirror://gentoo/${MY_P}.tar.xz"
+ # Masked until documentation guys consolidate the guide and approve
+ # it for usage.
+ #KEYWORDS="~amd64 ~mips ~x86"
S=${WORKDIR}/${MY_P}
fi
@@ -24,24 +27,21 @@
LICENSE="GPL-3"
SLOT="2"
-[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~mips ~x86"
IUSE="custom-cflags debug device-mapper efiemu nls static sdl truetype"
-GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips loongson"
-# everywhere:
-# emu
-# mips only:
-# qemu-mips, loongson
-# amd64, x86, ppc, ppc64
-# ieee1275
-# amd64, x86
-# coreboot, multiboot, efi-32, pc, qemu
-# amd64
-# efi-64
-for i in ${GRUB_PLATFORMS}; do
- IUSE+=" grub_platforms_${i}"
-done
-unset i
+GRUB_PLATFORMS=(
+ # everywhere:
+ emu
+ # mips only:
+ qemu-mips yeeloong
+ # amd64, x86, ppc, ppc64:
+ ieee1275
+ # amd64, x86:
+ coreboot multiboot efi-32 pc qemu
+ # amd64:
+ 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
@@ -188,7 +188,7 @@
# get enabled platforms
GRUB_ENABLED_PLATFORMS=""
- for i in ${GRUB_PLATFORMS}; do
+ for i in ${GRUB_PLATFORMS[@]}; do
use grub_platforms_${i} && GRUB_ENABLED_PLATFORMS+=" ${i}"
done
[[ -z ${GRUB_ENABLED_PLATFORMS} ]] && GRUB_ENABLED_PLATFORMS="guessed"
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-1.99-r2.ebuild ChangeLog grub-9999.ebuild
@ 2012-01-30 9:14 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 6+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2012-01-30 9:14 UTC (permalink / raw
To: gentoo-commits
scarabeus 12/01/30 09:14:59
Modified: grub-1.99-r2.ebuild ChangeLog grub-9999.ebuild
Log:
Add more relaxed pax marking to work on hardened. Fixes bug #396371.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Revision Changes Path
1.9 sys-boot/grub/grub-1.99-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild?r1=1.8&r2=1.9
Index: grub-1.99-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grub-1.99-r2.ebuild 18 Nov 2011 00:04:29 -0000 1.8
+++ grub-1.99-r2.ebuild 30 Jan 2012 09:14:59 -0000 1.9
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-1.99-r2.ebuild,v 1.8 2011/11/18 00:04:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r2.ebuild,v 1.9 2012/01/30 09:14:59 scarabeus Exp $
EAPI=4
@@ -249,7 +249,7 @@
"bin/grub2-mkimage"
)
for e in ${PAX[@]}; do
- pax-mark -mp "${ED}/${e}"
+ pax-mark -mpes "${ED}/${e}"
done
# can't be in docs array as we use default_src_install in different builddir
1.177 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.177&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.177&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.176&r2=1.177
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- ChangeLog 15 Jan 2012 02:19:54 -0000 1.176
+++ ChangeLog 30 Jan 2012 09:14:59 -0000 1.177
@@ -1,6 +1,10 @@
# 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.176 2012/01/15 02:19:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.177 2012/01/30 09:14:59 scarabeus Exp $
+
+ 30 Jan 2012; Tomáš Chvátal <scarabeus@gentoo.org> grub-1.99-r2.ebuild,
+ grub-9999.ebuild:
+ Add more relaxed pax marking to work on hardened. Fixes bug #396371.
15 Jan 2012; Mike Gilbert <floppym@gentoo.org> grub-9999.ebuild:
1.99-call_proper_grub_probe.patch has been applied upstream.
1.49 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.48&r2=1.49
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- grub-9999.ebuild 15 Jan 2012 02:19:54 -0000 1.48
+++ grub-9999.ebuild 30 Jan 2012 09:14:59 -0000 1.49
@@ -1,6 +1,6 @@
# 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-9999.ebuild,v 1.48 2012/01/15 02:19:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.49 2012/01/30 09:14:59 scarabeus Exp $
EAPI=4
@@ -242,7 +242,7 @@
"bin/grub2-mkimage"
)
for e in ${PAX[@]}; do
- pax-mark -mp "${ED}/${e}"
+ pax-mark -mpes "${ED}/${e}"
done
# can't be in docs array as we use default_src_install in different builddir
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-01-30 9:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-06 15:32 [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-1.99-r2.ebuild ChangeLog grub-9999.ebuild Tomas Chvatal (scarabeus)
-- strict thread matches above, loose matches on Subject: below --
2011-09-14 17:57 Tomas Chvatal (scarabeus)
2011-10-03 9:10 Tomas Chvatal (scarabeus)
2011-10-04 18:23 Tomas Chvatal (scarabeus)
2011-11-18 0:04 Mike Frysinger (vapier)
2012-01-30 9:14 Tomas Chvatal (scarabeus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox