diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-03-30 17:29:13 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-03-30 17:29:13 +0000 |
| commit | a30f76ba65ca6fae8a7390e246d0f55af22dfdf5 (patch) | |
| tree | c601c10a17ea443176921e8bc2e89c6be418fe3a /sys-boot/grub | |
| parent | Bring in the warning from bug #98768, as it's now important with the new Grub... (diff) | |
| download | historical-a30f76ba65ca6fae8a7390e246d0f55af22dfdf5.tar.gz historical-a30f76ba65ca6fae8a7390e246d0f55af22dfdf5.tar.bz2 historical-a30f76ba65ca6fae8a7390e246d0f55af22dfdf5.zip | |
dont bother date stamping things as that just leads to bloat over time. do not use $ARCH. clean up style.
Package-Manager: portage-2.2_pre5
Diffstat (limited to 'sys-boot/grub')
| -rw-r--r-- | sys-boot/grub/Manifest | 12 | ||||
| -rw-r--r-- | sys-boot/grub/grub-0.97-r5.ebuild | 19 |
2 files changed, 20 insertions, 11 deletions
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 8f1b1807f3f7..aafea70443c9 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX grub-0.97-gpt.patch 10682 RMD160 53dd38d52f2b38fb28dfb670d6fd27e47a562bbb SHA1 6057a076110d469fb63e56e57711d281221f9b42 SHA256 5e38046cfb727420e5b4b19d71c7fb4ddff22cbcc356c9f888763b0c1963d389 AUX grub-1.95-build.patch 522 RMD160 eec01af7250a0883604530f321b154c575b14c41 SHA1 6f93b47a212ed0b3fb807bcf96e04792fa196ba1 SHA256 26d45247376f1e42b4197088161146173ea5bee3800282a707b331c49aed6ccf DIST grub-0.92-gentoo-0.2.tar.bz2 21727 RMD160 f420e3352d46fdfb77a1121879382265805bc3ef SHA1 1bb1463067679aab909d1bd96996cfa72556de81 SHA256 f579b49b2d24702905c333ce2b6170a554ce26d0232c65478a21a1fd2eb8b8fe @@ -23,8 +26,15 @@ EBUILD grub-0.96-r3.ebuild 4580 RMD160 f0c3d0697bf808afa9e24c9a0acb007b8473e53b EBUILD grub-0.97-r2.ebuild 4854 RMD160 e78aaa77647ba2d658b9a89e1926110997ce4b2b SHA1 a63f69d34080940651bd3cd928cd18a0ac9402ab SHA256 d15e83fdb06d5a9d4cce0a84352ca4a20bc3cc5dd7861a12f1a1a500dea25429 EBUILD grub-0.97-r3.ebuild 4723 RMD160 0becf2078d55ca28738106765ea54742c2aa209b SHA1 c0ce849f7273c070fed44cc4acddb2fecce6c2e5 SHA256 5f96e99ae205c151ea672842b5fd1708541d4efe16f79c03baf70fac5b1301b9 EBUILD grub-0.97-r4.ebuild 4967 RMD160 a24281663a2b5ca3452a044f18dcd1a231870812 SHA1 01cecc3f8505585fc28519ead7d524c3ace778b5 SHA256 1c40a3df3ba6b09ecce9f9d4bc934d342e23d19c5fc1c5eccda589e219bf6e8e -EBUILD grub-0.97-r5.ebuild 6374 RMD160 774e9c8d8d7a17942902d5334834c598b64f376b SHA1 1cb40fc394a075f2acd1165bd72807f9bc613569 SHA256 a8da8aa6cad916bed0fb3157af57055ac76e57369800b658eaa9ba169b689921 +EBUILD grub-0.97-r5.ebuild 6340 RMD160 417dba6e14c9f40c988b0d1e1a73cf64e547abc9 SHA1 4dd2ba57e4309d551ff8040fc4d8bebc5bcd7320 SHA256 fbede1c24d06ab52a3309dbaa30e05029a70e1ff8c595b937abf077505916d8c EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a EBUILD grub-1.96.ebuild 956 RMD160 f462517b57bda30e9e4b64c43e691099d0beeb9a SHA1 55629e1cf96e29ff702c36d579c08c7487708698 SHA256 8bb370a35d006fa89133863c0393b6356be8e8f66ad3f34f63750624d9b46cb4 MISC ChangeLog 20864 RMD160 5c7118e3679e479b9026ebfe08a9cc44e16e45e1 SHA1 9de8fbc7078ec2dbd508996f4f970fb29b688417 SHA256 b6653912fb2f0943bc71a3efab255f53bc8620bc4469c551792cebb27db248c9 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFH787Fj9hvisErhMIRAgIYAJwPKQWQ8iOwy84jsSSeXWR5eJOhrgCfY2PL +WcLcsw8DuzaOM0UYYipA3Ug= +=Snas +-----END PGP SIGNATURE----- diff --git a/sys-boot/grub/grub-0.97-r5.ebuild b/sys-boot/grub/grub-0.97-r5.ebuild index 8cc0e5ae9ea8..2efeaecb9011 100644 --- a/sys-boot/grub/grub-0.97-r5.ebuild +++ b/sys-boot/grub/grub-0.97-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild,v 1.5 2008/03/30 17:20:32 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild,v 1.6 2008/03/30 17:29:13 vapier Exp $ inherit mount-boot eutils flag-o-matic toolchain-funcs autotools @@ -37,10 +37,10 @@ src_unpack() { # value in make.conf, it is possible to make kernels ~16Mb in size, but it # needs the kitchen sink built-in. local t="custom" - if [[ -z "$GRUB_MAX_KERNEL_SIZE" ]]; then - case $ARCH in - amd64*) GRUB_MAX_KERNEL_SIZE=7 ;; - x86*) GRUB_MAX_KERNEL_SIZE=3 ;; + if [[ -z ${GRUB_MAX_KERNEL_SIZE} ]] ; then + case $(tc-arch) in + amd64) GRUB_MAX_KERNEL_SIZE=7 ;; + x86) GRUB_MAX_KERNEL_SIZE=3 ;; esac t="default" fi @@ -158,14 +158,13 @@ setup_boot_dir() { ewarn fi - if [[ ! -e ${dir}/menu.lst ]]; then + 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 \ - "${dir}"/stage2-$(date -u +%Y%m%d-%H%MZ) + 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" @@ -176,7 +175,7 @@ setup_boot_dir() { einfo "Copying files from /lib/grub and /usr/lib/grub to ${dir}" for x in "${ROOT}"/lib*/grub/*/* "${ROOT}"/usr/lib*/grub/*/* ; do - [[ -f "${x}" ]] && cp -p "${x}" "${dir}"/ + [[ -f ${x} ]] && cp -p "${x}" "${dir}"/ done if [[ -e ${dir}/grub.conf ]] ; then |