* [gentoo-commits] gentoo-x86 commit in sys-boot/grub-static: ChangeLog grub-static-0.97-r9.ebuild
@ 2009-01-03 21:07 Christoph Mende (angelos)
0 siblings, 0 replies; 7+ messages in thread
From: Christoph Mende (angelos) @ 2009-01-03 21:07 UTC (permalink / raw
To: gentoo-commits
angelos 09/01/03 21:07:21
Modified: ChangeLog
Added: grub-static-0.97-r9.ebuild
Log:
Version bump to match sys-boot/grub
(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)
Revision Changes Path
1.17 sys-boot/grub-static/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?r1=1.16&r2=1.17
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChangeLog 28 Oct 2008 10:13:07 -0000 1.16
+++ ChangeLog 3 Jan 2009 21:07:21 -0000 1.17
@@ -1,6 +1,12 @@
# ChangeLog for sys-boot/grub-static
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.16 2008/10/28 10:13:07 angelos Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.17 2009/01/03 21:07:21 angelos Exp $
+
+*grub-static-0.97-r9 (03 Jan 2009)
+
+ 03 Jan 2009; Christoph Mende <angelos@gentoo.org>
+ +grub-static-0.97-r9.ebuild:
+ Version bump to match sys-boot/grub
28 Oct 2008; Christoph Mende <angelos@gentoo.org>
grub-static-0.97-r6.ebuild:
1.1 sys-boot/grub-static/grub-static-0.97-r9.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?rev=1.1&content-type=text/plain
Index: grub-static-0.97-r9.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v 1.1 2009/01/03 21:07:21 angelos 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 eutils mount-boot
PATCHVER="1.9" # Not used, just for tracking with main grub
DESCRIPTION="GNU GRUB Legacy boot loader (static build)"
HOMEPAGE="http://www.gnu.org/software/grub/"
SRC_URI="mirror://gentoo/${PF}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
IUSE=""
DEPEND="!sys-boot/grub"
PROVIDE="virtual/bootloader"
src_install() {
cp -a "${WORKDIR}"/* "${D}"/
}
#
# Below this point, everything is also used in grub-static!
# Please keep in sync!
#
setup_boot_dir() {
local boot_dir=$1
local dir=${boot_dir}
[[ ! -e ${dir} ]] && die "${dir} does not exist!"
[[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot"
dir="${dir}/grub"
if [[ ! -e ${dir} ]] ; then
mkdir "${dir}" || die "${dir} does not exist!"
fi
# change menu.lst to grub.conf
if [[ ! -e ${dir}/grub.conf ]] && [[ -e ${dir}/menu.lst ]] ; then
mv -f "${dir}"/menu.lst "${dir}"/grub.conf
ewarn
ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
ewarn
fi
if [[ ! -e ${dir}/menu.lst ]]; then
einfo "Linking from new grub.conf name to menu.lst"
ln -snf grub.conf "${dir}"/menu.lst
fi
if [[ -e ${dir}/stage2 ]] ; then
mv "${dir}"/stage2{,.old}
ewarn "*** IMPORTANT NOTE: you must run grub and install"
ewarn "the new version's stage1 to your MBR. Until you do,"
ewarn "stage1 and stage2 will still be the old version, but"
ewarn "later stages will be the new version, which could"
ewarn "cause problems such as an unbootable system."
ewarn "This means you must use either grub-install or perform"
ewarn "root/setup manually! For more help, see the handbook:"
ewarn "http://www.gentoo.org/doc/en/handbook/handbook-${ARCH}.xml?part=1&chap=10#grub-install-auto"
ebeep
fi
einfo "Copying files from /lib/grub, /usr/lib/grub and /usr/share/grub to ${dir}"
for x in \
"${ROOT}"/lib*/grub/*/* \
"${ROOT}"/usr/lib*/grub/*/* \
"${ROOT}"/usr/share/grub/* ; do
[[ -f ${x} ]] && cp -p "${x}" "${dir}"/
done
if [[ ! -e ${dir}/grub.conf ]] ; then
s="${ROOT}/usr/share/doc/${PF}/grub.conf.gentoo"
[[ -e "${s}" ]] && cat "${s}" >${dir}/grub.conf
[[ -e "${s}.gz" ]] && zcat "${s}.gz" >${dir}/grub.conf
[[ -e "${s}.bz2" ]] && bzcat "${s}.bz2" >${dir}/grub.conf
fi
# Per bug 218599, we support grub.conf.install for users that want to run a
# specific set of Grub setup commands rather than the default ones.
grub_config=${dir}/grub.conf.install
[[ -e ${grub_config} ]] || grub_config=${dir}/grub.conf
if [[ -e ${grub_config} ]] ; then
egrep \
-v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
"${grub_config}" | \
/sbin/grub --batch \
--device-map="${dir}"/device.map \
> /dev/null
fi
# the grub default commands silently piss themselves if
# the default file does not exist ahead of time
if [[ ! -e ${dir}/default ]] ; then
grub-set-default --root-directory="${boot_dir}" default
fi
einfo "Grub has been installed to ${boot_dir} successfully."
}
pkg_postinst() {
if [[ -n ${DONT_MOUNT_BOOT} ]]; then
elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply"
elog "the following instructions for your /boot!"
elog "Neglecting to do so may cause your system to fail to boot!"
elog
else
setup_boot_dir "${ROOT}"/boot
# Trailing output because if this is run from pkg_postinst, it gets mixed into
# the other output.
einfo ""
fi
elog "To interactively install grub files to another device such as a USB"
elog "stick, just run the following and specify the directory as prompted:"
elog " emerge --config =${PF}"
elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/path/to/use to tell"
elog "grub where to install in a non-interactive way."
}
pkg_config() {
local dir
if [ ! -d "${GRUB_ALT_INSTALLDIR}" ]; then
einfo "Enter the directory where you want to setup grub:"
read dir
else
dir="${GRUB_ALT_INSTALLDIR}"
fi
setup_boot_dir "${dir}"
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-boot/grub-static: ChangeLog grub-static-0.97-r9.ebuild
@ 2009-05-14 12:14 Christian Faulhammer (fauli)
0 siblings, 0 replies; 7+ messages in thread
From: Christian Faulhammer (fauli) @ 2009-05-14 12:14 UTC (permalink / raw
To: gentoo-commits
fauli 09/05/14 12:14:59
Modified: ChangeLog grub-static-0.97-r9.ebuild
Log:
x86 stable, bug 269201
(Portage version: 2.1.6.11/cvs/Linux i686)
Revision Changes Path
1.19 sys-boot/grub-static/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?r1=1.18&r2=1.19
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChangeLog 11 Jan 2009 21:04:00 -0000 1.18
+++ ChangeLog 14 May 2009 12:14:59 -0000 1.19
@@ -1,6 +1,10 @@
# ChangeLog for sys-boot/grub-static
# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.18 2009/01/11 21:04:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.19 2009/05/14 12:14:59 fauli Exp $
+
+ 14 May 2009; Christian Faulhammer <fauli@gentoo.org>
+ grub-static-0.97-r9.ebuild:
+ x86 stable, bug 269201
11 Jan 2009; Markus Meier <maekke@gentoo.org> grub-static-0.97-r6.ebuild:
amd64 stable, bug #254028
1.2 sys-boot/grub-static/grub-static-0.97-r9.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?r1=1.1&r2=1.2
Index: grub-static-0.97-r9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grub-static-0.97-r9.ebuild 3 Jan 2009 21:07:21 -0000 1.1
+++ grub-static-0.97-r9.ebuild 14 May 2009 12:14:59 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v 1.1 2009/01/03 21:07:21 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v 1.2 2009/05/14 12:14:59 fauli 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
@@ -17,7 +17,7 @@
SRC_URI="mirror://gentoo/${PF}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
IUSE=""
DEPEND="!sys-boot/grub"
PROVIDE="virtual/bootloader"
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-boot/grub-static: ChangeLog grub-static-0.97-r9.ebuild
@ 2009-05-15 21:12 Markus Meier (maekke)
0 siblings, 0 replies; 7+ messages in thread
From: Markus Meier (maekke) @ 2009-05-15 21:12 UTC (permalink / raw
To: gentoo-commits
maekke 09/05/15 21:12:04
Modified: ChangeLog grub-static-0.97-r9.ebuild
Log:
amd64 stable, bug #269201
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Revision Changes Path
1.20 sys-boot/grub-static/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?r1=1.19&r2=1.20
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ChangeLog 14 May 2009 12:14:59 -0000 1.19
+++ ChangeLog 15 May 2009 21:12:04 -0000 1.20
@@ -1,6 +1,9 @@
# ChangeLog for sys-boot/grub-static
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.19 2009/05/14 12:14:59 fauli Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.20 2009/05/15 21:12:04 maekke Exp $
+
+ 15 May 2009; Markus Meier <maekke@gentoo.org> grub-static-0.97-r9.ebuild:
+ amd64 stable, bug #269201
14 May 2009; Christian Faulhammer <fauli@gentoo.org>
grub-static-0.97-r9.ebuild:
1.3 sys-boot/grub-static/grub-static-0.97-r9.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?r1=1.2&r2=1.3
Index: grub-static-0.97-r9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grub-static-0.97-r9.ebuild 14 May 2009 12:14:59 -0000 1.2
+++ grub-static-0.97-r9.ebuild 15 May 2009 21:12:04 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v 1.2 2009/05/14 12:14:59 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v 1.3 2009/05/15 21:12:04 maekke 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
@@ -17,7 +17,7 @@
SRC_URI="mirror://gentoo/${PF}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
IUSE=""
DEPEND="!sys-boot/grub"
PROVIDE="virtual/bootloader"
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-boot/grub-static: ChangeLog grub-static-0.97-r9.ebuild
@ 2009-07-04 18:46 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 7+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-07-04 18:46 UTC (permalink / raw
To: gentoo-commits
robbat2 09/07/04 18:46:39
Modified: ChangeLog grub-static-0.97-r9.ebuild
Log:
Bug #255271: check for IA32_EMULATION on 64-bit, as we are building a 32-bit binary and need to be able to run it.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Revision Changes Path
1.21 sys-boot/grub-static/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?r1=1.20&r2=1.21
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -p -w -b -B -u -u -r1.20 -r1.21
--- ChangeLog 15 May 2009 21:12:04 -0000 1.20
+++ ChangeLog 4 Jul 2009 18:46:39 -0000 1.21
@@ -1,6 +1,11 @@
# ChangeLog for sys-boot/grub-static
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.20 2009/05/15 21:12:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.21 2009/07/04 18:46:39 robbat2 Exp $
+
+ 04 Jul 2009; Robin H. Johnson <robbat2@gentoo.org>
+ grub-static-0.97-r9.ebuild:
+ Bug #255271: check for IA32_EMULATION on 64-bit, as we are building a
+ 32-bit binary and need to be able to run it.
15 May 2009; Markus Meier <maekke@gentoo.org> grub-static-0.97-r9.ebuild:
amd64 stable, bug #269201
1.4 sys-boot/grub-static/grub-static-0.97-r9.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?r1=1.3&r2=1.4
Index: grub-static-0.97-r9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -p -w -b -B -u -u -r1.3 -r1.4
--- grub-static-0.97-r9.ebuild 15 May 2009 21:12:04 -0000 1.3
+++ grub-static-0.97-r9.ebuild 4 Jul 2009 18:46:39 -0000 1.4
@@ -1,13 +1,13 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v 1.3 2009/05/15 21:12:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v 1.4 2009/07/04 18:46:39 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 eutils mount-boot
+inherit eutils mount-boot toolchain-funcs linux-info
PATCHVER="1.9" # Not used, just for tracking with main grub
@@ -22,6 +22,13 @@ IUSE=""
DEPEND="!sys-boot/grub"
PROVIDE="virtual/bootloader"
+pkg_setup() {
+ local arch="$(tc-arch)"
+ case ${arch} in
+ amd64) CONFIG_CHECK='~IA32_EMULATION' check_extra_config ;;
+ esac
+}
+
src_install() {
cp -a "${WORKDIR}"/* "${D}"/
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-boot/grub-static: ChangeLog grub-static-0.97-r9.ebuild
@ 2009-07-04 18:47 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 7+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-07-04 18:47 UTC (permalink / raw
To: gentoo-commits
robbat2 09/07/04 18:47:53
Modified: ChangeLog grub-static-0.97-r9.ebuild
Log:
Port from sys-boot/grub: Bug #261857: easier install with $ROOT usage.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Revision Changes Path
1.22 sys-boot/grub-static/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?r1=1.21&r2=1.22
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -p -w -b -B -u -u -r1.21 -r1.22
--- ChangeLog 4 Jul 2009 18:46:39 -0000 1.21
+++ ChangeLog 4 Jul 2009 18:47:53 -0000 1.22
@@ -1,6 +1,10 @@
# ChangeLog for sys-boot/grub-static
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.21 2009/07/04 18:46:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.22 2009/07/04 18:47:53 robbat2 Exp $
+
+ 04 Jul 2009; Robin H. Johnson <robbat2@gentoo.org>
+ grub-static-0.97-r9.ebuild:
+ Port from sys-boot/grub: Bug #261857: easier install with $ROOT usage.
04 Jul 2009; Robin H. Johnson <robbat2@gentoo.org>
grub-static-0.97-r9.ebuild:
1.5 sys-boot/grub-static/grub-static-0.97-r9.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?r1=1.4&r2=1.5
Index: grub-static-0.97-r9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -p -w -b -B -u -u -r1.4 -r1.5
--- grub-static-0.97-r9.ebuild 4 Jul 2009 18:46:39 -0000 1.4
+++ grub-static-0.97-r9.ebuild 4 Jul 2009 18:47:53 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v 1.4 2009/07/04 18:46:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v 1.5 2009/07/04 18:47:53 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
@@ -42,7 +42,7 @@ setup_boot_dir() {
local boot_dir=$1
local dir=${boot_dir}
- [[ ! -e ${dir} ]] && die "${dir} does not exist!"
+ mkdir -p "${dir}"
[[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot"
dir="${dir}/grub"
if [[ ! -e ${dir} ]] ; then
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-boot/grub-static: ChangeLog grub-static-0.97-r9.ebuild
@ 2009-12-12 18:09 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 7+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-12-12 18:09 UTC (permalink / raw
To: gentoo-commits
robbat2 09/12/12 18:09:31
Modified: ChangeLog grub-static-0.97-r9.ebuild
Log:
Bug #296537: Increase the warnings and catch where the user does not have IA32_EMULATION set, by trying to run the binary.
(Portage version: 2.2_rc58/cvs/Linux x86_64)
Revision Changes Path
1.23 sys-boot/grub-static/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?r1=1.22&r2=1.23
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -p -w -b -B -u -u -r1.22 -r1.23
--- ChangeLog 4 Jul 2009 18:47:53 -0000 1.22
+++ ChangeLog 12 Dec 2009 18:09:30 -0000 1.23
@@ -1,6 +1,11 @@
# ChangeLog for sys-boot/grub-static
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.22 2009/07/04 18:47:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.23 2009/12/12 18:09:30 robbat2 Exp $
+
+ 12 Dec 2009; Robin H. Johnson <robbat2@gentoo.org>
+ grub-static-0.97-r9.ebuild:
+ Bug #296537: Increase the warnings and catch where the user does not have
+ IA32_EMULATION set, by trying to run the binary.
04 Jul 2009; Robin H. Johnson <robbat2@gentoo.org>
grub-static-0.97-r9.ebuild:
1.6 sys-boot/grub-static/grub-static-0.97-r9.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?r1=1.5&r2=1.6
Index: grub-static-0.97-r9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -p -w -b -B -u -u -r1.5 -r1.6
--- grub-static-0.97-r9.ebuild 4 Jul 2009 18:47:53 -0000 1.5
+++ grub-static-0.97-r9.ebuild 12 Dec 2009 18:09:30 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v 1.5 2009/07/04 18:47:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v 1.6 2009/12/12 18:09:30 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
@@ -25,12 +25,28 @@ PROVIDE="virtual/bootloader"
pkg_setup() {
local arch="$(tc-arch)"
case ${arch} in
- amd64) CONFIG_CHECK='~IA32_EMULATION' check_extra_config ;;
+ amd64)
+ CONFIG_CHECK='~IA32_EMULATION'
+ WARNING_IA32_EMULATION="You will NOT be able to run grub unless you have IA32_EMULATION set!"
+ check_extra_config
+ ;;
esac
}
src_install() {
cp -a "${WORKDIR}"/* "${D}"/
+ run_test_grub "${D}"/sbin/grub && einfo "New grub can run on your system, good!"
+}
+
+run_test_grub() {
+ local grub="$1"
+ local version="$(${grub} \
+ --read-only --no-pager --no-floppy --no-curses \
+ --no-config-file --batch --version)"
+ local error="grub test-run failed"
+ use amd64 && error="${error} Is IA32_EMULATION set?"
+ [ "${version/${PV}}" != "${version}" ] || die "${error}"
+ return 0
}
#
@@ -42,6 +58,8 @@ setup_boot_dir() {
local boot_dir=$1
local dir=${boot_dir}
+ run_test_grub /sbin/grub
+
mkdir -p "${dir}"
[[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot"
dir="${dir}/grub"
@@ -95,18 +113,24 @@ setup_boot_dir() {
grub_config=${dir}/grub.conf.install
[[ -e ${grub_config} ]] || grub_config=${dir}/grub.conf
if [[ -e ${grub_config} ]] ; then
+ local tmp="${TMPDIR}/${P}-setup_boot_dir-$$"
egrep \
-v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
- "${grub_config}" | \
+ "${grub_config}" >"${tmp}"
+ # Do NOT fail here, only warn.
/sbin/grub --batch \
--device-map="${dir}"/device.map \
- > /dev/null
+ >/dev/null <"${tmp}"
+ rc=$?
+ [[ $rc -ne 0 ]] && ewarn "Grub failed to run!"
fi
# the grub default commands silently piss themselves if
# the default file does not exist ahead of time
if [[ ! -e ${dir}/default ]] ; then
+ # This may fail, don't worry about it.
grub-set-default --root-directory="${boot_dir}" default
+ :
fi
einfo "Grub has been installed to ${boot_dir} successfully."
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-boot/grub-static: ChangeLog grub-static-0.97-r9.ebuild
@ 2009-12-12 18:13 Robin H. Johnson (robbat2)
0 siblings, 0 replies; 7+ messages in thread
From: Robin H. Johnson (robbat2) @ 2009-12-12 18:13 UTC (permalink / raw
To: gentoo-commits
robbat2 09/12/12 18:13:33
Modified: ChangeLog grub-static-0.97-r9.ebuild
Log:
Suppress the pre-stripped warning.
(Portage version: 2.2_rc58/cvs/Linux x86_64)
Revision Changes Path
1.24 sys-boot/grub-static/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?r1=1.23&r2=1.24
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -p -w -b -B -u -u -r1.23 -r1.24
--- ChangeLog 12 Dec 2009 18:09:30 -0000 1.23
+++ ChangeLog 12 Dec 2009 18:13:33 -0000 1.24
@@ -1,6 +1,10 @@
# ChangeLog for sys-boot/grub-static
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.23 2009/12/12 18:09:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.24 2009/12/12 18:13:33 robbat2 Exp $
+
+ 12 Dec 2009; Robin H. Johnson <robbat2@gentoo.org>
+ grub-static-0.97-r9.ebuild:
+ Suppress the pre-stripped warning.
12 Dec 2009; Robin H. Johnson <robbat2@gentoo.org>
grub-static-0.97-r9.ebuild:
1.8 sys-boot/grub-static/grub-static-0.97-r9.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild?r1=1.7&r2=1.8
Index: grub-static-0.97-r9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -p -w -b -B -u -u -r1.7 -r1.8
--- grub-static-0.97-r9.ebuild 12 Dec 2009 18:10:36 -0000 1.7
+++ grub-static-0.97-r9.ebuild 12 Dec 2009 18:13:33 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v 1.7 2009/12/12 18:10:36 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r9.ebuild,v 1.8 2009/12/12 18:13:33 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
@@ -22,6 +22,9 @@ IUSE=""
DEPEND="!sys-boot/grub"
PROVIDE="virtual/bootloader"
+# These are already stripped since we use a binpkg.
+QA_PRESTRIPPED="/sbin/grub /bin/mbchk"
+
pkg_setup() {
local arch="$(tc-arch)"
case ${arch} in
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-12-12 18:13 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-04 18:47 [gentoo-commits] gentoo-x86 commit in sys-boot/grub-static: ChangeLog grub-static-0.97-r9.ebuild Robin H. Johnson (robbat2)
-- strict thread matches above, loose matches on Subject: below --
2009-12-12 18:13 Robin H. Johnson (robbat2)
2009-12-12 18:09 Robin H. Johnson (robbat2)
2009-07-04 18:46 Robin H. Johnson (robbat2)
2009-05-15 21:12 Markus Meier (maekke)
2009-05-14 12:14 Christian Faulhammer (fauli)
2009-01-03 21:07 Christoph Mende (angelos)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox