| 1 |
vapier 08/03/30 17:29:14 |
| 2 |
|
| 3 |
Modified: grub-0.97-r5.ebuild |
| 4 |
Log: |
| 5 |
dont bother date stamping things as that just leads to bloat over time. do not use $ARCH. clean up style. |
| 6 |
(Portage version: 2.2_pre5) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.6 sys-boot/grub/grub-0.97-r5.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild?rev=1.6&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild?rev=1.6&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild?r1=1.5&r2=1.6 |
| 14 |
|
| 15 |
Index: grub-0.97-r5.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild,v |
| 18 |
retrieving revision 1.5 |
| 19 |
retrieving revision 1.6 |
| 20 |
diff -u -r1.5 -r1.6 |
| 21 |
--- grub-0.97-r5.ebuild 30 Mar 2008 17:20:32 -0000 1.5 |
| 22 |
+++ grub-0.97-r5.ebuild 30 Mar 2008 17:29:13 -0000 1.6 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2008 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild,v 1.5 2008/03/30 17:20:32 robbat2 Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild,v 1.6 2008/03/30 17:29:13 vapier Exp $ |
| 28 |
|
| 29 |
inherit mount-boot eutils flag-o-matic toolchain-funcs autotools |
| 30 |
|
| 31 |
@@ -37,10 +37,10 @@ |
| 32 |
# value in make.conf, it is possible to make kernels ~16Mb in size, but it |
| 33 |
# needs the kitchen sink built-in. |
| 34 |
local t="custom" |
| 35 |
- if [[ -z "$GRUB_MAX_KERNEL_SIZE" ]]; then |
| 36 |
- case $ARCH in |
| 37 |
- amd64*) GRUB_MAX_KERNEL_SIZE=7 ;; |
| 38 |
- x86*) GRUB_MAX_KERNEL_SIZE=3 ;; |
| 39 |
+ if [[ -z ${GRUB_MAX_KERNEL_SIZE} ]] ; then |
| 40 |
+ case $(tc-arch) in |
| 41 |
+ amd64) GRUB_MAX_KERNEL_SIZE=7 ;; |
| 42 |
+ x86) GRUB_MAX_KERNEL_SIZE=3 ;; |
| 43 |
esac |
| 44 |
t="default" |
| 45 |
fi |
| 46 |
@@ -158,14 +158,13 @@ |
| 47 |
ewarn |
| 48 |
fi |
| 49 |
|
| 50 |
- if [[ ! -e ${dir}/menu.lst ]]; then |
| 51 |
+ if [[ ! -e ${dir}/menu.lst ]] ; then |
| 52 |
einfo "Linking from new grub.conf name to menu.lst" |
| 53 |
ln -snf grub.conf "${dir}"/menu.lst |
| 54 |
fi |
| 55 |
|
| 56 |
- if [[ -e ${dir}/stage2 ]]; then |
| 57 |
- mv "${dir}"/stage2 \ |
| 58 |
- "${dir}"/stage2-$(date -u +%Y%m%d-%H%MZ) |
| 59 |
+ if [[ -e ${dir}/stage2 ]] ; then |
| 60 |
+ mv "${dir}"/stage2{,.old} |
| 61 |
ewarn "*** IMPORTANT NOTE: you must run grub and install" |
| 62 |
ewarn "the new version's stage1 to your MBR. Until you do," |
| 63 |
ewarn "stage1 and stage2 will still be the old version, but" |
| 64 |
@@ -176,7 +175,7 @@ |
| 65 |
|
| 66 |
einfo "Copying files from /lib/grub and /usr/lib/grub to ${dir}" |
| 67 |
for x in "${ROOT}"/lib*/grub/*/* "${ROOT}"/usr/lib*/grub/*/* ; do |
| 68 |
- [[ -f "${x}" ]] && cp -p "${x}" "${dir}"/ |
| 69 |
+ [[ -f ${x} ]] && cp -p "${x}" "${dir}"/ |
| 70 |
done |
| 71 |
|
| 72 |
if [[ -e ${dir}/grub.conf ]] ; then |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
-- |
| 77 |
gentoo-commits@l.g.o mailing list |
Archives