1 |
robbat2 08/10/27 10:50:08 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: grub-static-0.97-r6.ebuild |
5 |
Log: |
6 |
Bug #239224, version bump to match current non-static build. See bug for full list of fixes. Beware /boot/grub/splash.xpm.gz sometimes vanishing due to a Portage bug. Make SURE you follow the upgrade instructions or you might end up with a non-booting box. |
7 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.15 sys-boot/grub-static/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?rev=1.15&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?rev=1.15&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/ChangeLog?r1=1.14&r2=1.15 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v |
19 |
retrieving revision 1.14 |
20 |
retrieving revision 1.15 |
21 |
diff -p -w -b -B -u -u -r1.14 -r1.15 |
22 |
--- ChangeLog 25 Feb 2008 22:13:20 -0000 1.14 |
23 |
+++ ChangeLog 27 Oct 2008 10:50:08 -0000 1.15 |
24 |
@@ -1,6 +1,15 @@ |
25 |
# ChangeLog for sys-boot/grub-static |
26 |
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.14 2008/02/25 22:13:20 wolf31o2 Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/ChangeLog,v 1.15 2008/10/27 10:50:08 robbat2 Exp $ |
29 |
+ |
30 |
+*grub-static-0.97-r6 (27 Oct 2008) |
31 |
+ |
32 |
+ 27 Oct 2008; Robin H. Johnson <robbat2@g.o> |
33 |
+ +grub-static-0.97-r6.ebuild: |
34 |
+ Bug #239224, version bump to match current non-static build. See bug for |
35 |
+ full list of fixes. Beware /boot/grub/splash.xpm.gz sometimes vanishing |
36 |
+ due to a Portage bug. Make SURE you follow the upgrade instructions or you |
37 |
+ might end up with a non-booting box. |
38 |
|
39 |
25 Feb 2008; Chris Gianelloni <wolf31o2@g.o> |
40 |
grub-static-0.97.ebuild: |
41 |
|
42 |
|
43 |
|
44 |
1.1 sys-boot/grub-static/grub-static-0.97-r6.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r6.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r6.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: grub-static-0.97-r6.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2008 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub-static/grub-static-0.97-r6.ebuild,v 1.1 2008/10/27 10:50:08 robbat2 Exp $ |
54 |
|
55 |
# XXX: we need to review menu.lst vs grub.conf handling. We've been converting |
56 |
# all systems to grub.conf (and symlinking menu.lst to grub.conf), but |
57 |
# we never updated any of the source code (it still all wants menu.lst), |
58 |
# and there is no indication that upstream is making the transition. |
59 |
|
60 |
inherit mount-boot |
61 |
|
62 |
PATCHVER="1.7" # Not used, just for tracking with main grub |
63 |
|
64 |
DESCRIPTION="GNU GRUB Legacy boot loader (static build)" |
65 |
|
66 |
HOMEPAGE="http://www.gnu.org/software/grub/" |
67 |
SRC_URI="mirror://gentoo/${PF}.tar.bz2" |
68 |
LICENSE="GPL-2" |
69 |
SLOT="0" |
70 |
KEYWORDS="-* ~amd64 ~x86" |
71 |
IUSE="" |
72 |
DEPEND="!sys-boot/grub" |
73 |
PROVIDE="virtual/bootloader" |
74 |
|
75 |
src_install() { |
76 |
cp -a "${WORKDIR}"/* "${D}"/ |
77 |
} |
78 |
|
79 |
# |
80 |
# Below this point, everything is also used in grub-static! |
81 |
# Please keep in sync! |
82 |
# |
83 |
|
84 |
setup_boot_dir() { |
85 |
local boot_dir=$1 |
86 |
local dir=${boot_dir} |
87 |
|
88 |
[[ ! -e ${dir} ]] && die "${dir} does not exist!" |
89 |
[[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot" |
90 |
dir="${dir}/grub" |
91 |
if [[ ! -e ${dir} ]] ; then |
92 |
mkdir "${dir}" || die "${dir} does not exist!" |
93 |
fi |
94 |
|
95 |
# change menu.lst to grub.conf |
96 |
if [[ ! -e ${dir}/grub.conf ]] && [[ -e ${dir}/menu.lst ]] ; then |
97 |
mv -f "${dir}"/menu.lst "${dir}"/grub.conf |
98 |
ewarn |
99 |
ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf" |
100 |
ewarn |
101 |
fi |
102 |
|
103 |
if [[ ! -e ${dir}/menu.lst ]]; then |
104 |
einfo "Linking from new grub.conf name to menu.lst" |
105 |
ln -snf grub.conf "${dir}"/menu.lst |
106 |
fi |
107 |
|
108 |
if [[ -e ${dir}/stage2 ]] ; then |
109 |
mv "${dir}"/stage2{,.old} |
110 |
ewarn "*** IMPORTANT NOTE: you must run grub and install" |
111 |
ewarn "the new version's stage1 to your MBR. Until you do," |
112 |
ewarn "stage1 and stage2 will still be the old version, but" |
113 |
ewarn "later stages will be the new version, which could" |
114 |
ewarn "cause problems such as an unbootable system." |
115 |
ewarn "This means you must use either grub-install or perform" |
116 |
ewarn "root/setup manually! For more help, see the handbook:" |
117 |
ewarn "http://www.gentoo.org/doc/en/handbook/handbook-${ARCH}.xml?part=1&chap=10#grub-install-auto" |
118 |
ebeep |
119 |
fi |
120 |
|
121 |
einfo "Copying files from /lib/grub, /usr/lib/grub and /usr/share/grub to ${dir}" |
122 |
for x in \ |
123 |
"${ROOT}"/lib*/grub/*/* \ |
124 |
"${ROOT}"/usr/lib*/grub/*/* \ |
125 |
"${ROOT}"/usr/share/grub/* ; do |
126 |
[[ -f ${x} ]] && cp -p "${x}" "${dir}"/ |
127 |
done |
128 |
|
129 |
if [[ ! -e ${dir}/grub.conf ]] ; then |
130 |
s="${ROOT}/usr/share/doc/${PF}/grub.conf.gentoo" |
131 |
[[ -e "${s}" ]] && cat "${s}" >${dir}/grub.conf |
132 |
[[ -e "${s}.gz" ]] && zcat "${s}.gz" >${dir}/grub.conf |
133 |
[[ -e "${s}.bz2" ]] && bzcat "${s}.bz2" >${dir}/grub.conf |
134 |
fi |
135 |
|
136 |
# Per bug 218599, we support grub.conf.install for users that want to run a |
137 |
# specific set of Grub setup commands rather than the default ones. |
138 |
grub_config=${dir}/grub.conf.install |
139 |
[[ -e ${grub_config} ]] || grub_config=${dir}/grub.conf |
140 |
if [[ -e ${grub_config} ]] ; then |
141 |
egrep \ |
142 |
-v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \ |
143 |
"${grub_config}" | \ |
144 |
/sbin/grub --batch \ |
145 |
--device-map="${dir}"/device.map \ |
146 |
> /dev/null |
147 |
fi |
148 |
|
149 |
# the grub default commands silently piss themselves if |
150 |
# the default file does not exist ahead of time |
151 |
if [[ ! -e ${dir}/default ]] ; then |
152 |
grub-set-default --root-directory="${boot_dir}" default |
153 |
fi |
154 |
einfo "Grub has been installed to ${boot_dir} successfully." |
155 |
} |
156 |
|
157 |
pkg_postinst() { |
158 |
if [[ -n ${DONT_MOUNT_BOOT} ]]; then |
159 |
elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply" |
160 |
elog "the following instructions for your /boot!" |
161 |
elog "Neglecting to do so may cause your system to fail to boot!" |
162 |
elog |
163 |
else |
164 |
setup_boot_dir "${ROOT}"/boot |
165 |
# Trailing output because if this is run from pkg_postinst, it gets mixed into |
166 |
# the other output. |
167 |
einfo "" |
168 |
fi |
169 |
elog "To interactively install grub files to another device such as a USB" |
170 |
elog "stick, just run the following and specify the directory as prompted:" |
171 |
elog " emerge --config =${PF}" |
172 |
elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/path/to/use to tell" |
173 |
elog "grub where to install in a non-interactive way." |
174 |
|
175 |
} |
176 |
|
177 |
pkg_config() { |
178 |
local dir |
179 |
if [ ! -d "${GRUB_ALT_INSTALLDIR}" ]; then |
180 |
einfo "Enter the directory where you want to setup grub:" |
181 |
read dir |
182 |
else |
183 |
dir="${GRUB_ALT_INSTALLDIR}" |
184 |
fi |
185 |
setup_boot_dir "${dir}" |
186 |
} |