Fixes by Jon Bernard/Roy Walker for address checks on machines with lots of ram ...

Package-Manager: portage-2.0.53_rc7

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index d88aec2652d878d4cf6425720388cf8f4e1f5094..bca0451e6b0a049eea8f39666514f214f35ea736 100644 (file)
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.52 2005/08/21 02:24:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.53 2005/11/08 02:53:47 vapier Exp $
+
+*grub-0.97-r1 (08 Nov 2005)
+
+  08 Nov 2005; Mike Frysinger <vapier@gentoo.org> +grub-0.97-r1.ebuild:
+  Fixes by Jon Bernard/Roy Walker for address checks on machines with lots of
+  ram #99897 and add support for Reiser4 #69590.
 
   21 Aug 2005; Mike Frysinger <vapier@gentoo.org> grub-0.94-r1.ebuild,
   grub-0.96-r1.ebuild, grub-0.96-r2.ebuild, grub-0.96-r3.ebuild,

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 5b0bee9358b3f499f0003a4fdcf533324603a6e9..77989a48b6cfc7502cc66f04748c0c7fc53d35d6 100644 (file)
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 bb061c69fc3ad3e5484726111bacb933 grub-0.96-r2.ebuild 4597
-MD5 39a70f2e6c41b7e432c0f5603d01c1da grub-0.96-r1.ebuild 4742
-MD5 80623fad414fd78bb04b0479b94d76df grub-0.96-r3.ebuild 4577
-MD5 c634a95c2668abba2e886a917b363d5d grub-0.94-r1.ebuild 3528
-MD5 98aac6dc17a7d909ca1de859ef1394a2 grub-0.97.ebuild 4518
-MD5 c8d30bf5c47b6d9cb935d2adb12a9ac9 grub-0.92-r1.ebuild 2629
-MD5 ace1405356b6428d5d0b6c8251b32320 ChangeLog 15964
-MD5 97d88870847fafcf5fe4162f6d273e74 files/digest-grub-0.96-r2 193
+MD5 c6ab63bf3bc5d39e00c7dc8c88fa7b6f ChangeLog 16193
+MD5 5695c7ea410b6913901208938e05b1ad files/digest-grub-0.92-r1 190
 MD5 c5c746f1feb71d47fb2f5481590b83df files/digest-grub-0.94-r1 190
-MD5 80b2642d044b2ad2983d3925c4531952 files/digest-grub-0.97 191
 MD5 a098fd63c2d2748ecbbfe53aae07ed79 files/digest-grub-0.96-r1 193
+MD5 97d88870847fafcf5fe4162f6d273e74 files/digest-grub-0.96-r2 193
 MD5 9b6b79b2fbed61b893a1333b4f0e62c6 files/digest-grub-0.96-r3 191
-MD5 5695c7ea410b6913901208938e05b1ad files/digest-grub-0.92-r1 190
+MD5 80b2642d044b2ad2983d3925c4531952 files/digest-grub-0.97 191
+MD5 485041aa6ced0fae7a859d510543f1a5 files/digest-grub-0.97-r1 191
+MD5 c8d30bf5c47b6d9cb935d2adb12a9ac9 grub-0.92-r1.ebuild 2629
+MD5 c634a95c2668abba2e886a917b363d5d grub-0.94-r1.ebuild 3528
+MD5 39a70f2e6c41b7e432c0f5603d01c1da grub-0.96-r1.ebuild 4742
+MD5 bb061c69fc3ad3e5484726111bacb933 grub-0.96-r2.ebuild 4597
+MD5 80623fad414fd78bb04b0479b94d76df grub-0.96-r3.ebuild 4577
+MD5 d4c76735698e89795b90d6ed8a90cc50 grub-0.97-r1.ebuild 4477
+MD5 98aac6dc17a7d909ca1de859ef1394a2 grub-0.97.ebuild 4518
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDB+XqgIKl8Uu19MoRAo9cAJ9/5TEAV5N4PkLr1q5xS6ZulmjaHwCdGwH+
-0Qe8shQm7vjzEVT8jc55pYg=
-=osBe
+iD8DBQFDcBNigIKl8Uu19MoRAhxkAJ9oeBBk5oKtUC0jjMs+0jkwu1hFMACfabdu
+SHvf4/nuwBMScGz+otb+LXg=
+=UxoZ
 -----END PGP SIGNATURE-----

diff --git a/sys-boot/grub/files/digest-grub-0.97-r1 b/sys-boot/grub/files/digest-grub-0.97-r1
new file mode 100644 (file)
index 0000000..98095e9
--- /dev/null
+++ b/sys-boot/grub/files/digest-grub-0.97-r1
@@ -0,0 +1,3 @@
+MD5 5948981cb9b4c0397d03a230af995263 grub-0.97-patches-1.1.tar.bz2 20407
+MD5 cd3f3eb54446be6003156158d51f4884 grub-0.97.tar.gz 971783
+MD5 cdd6c89d48982ecd544c0b4774755afd splash.xpm.gz 33856

diff --git a/sys-boot/grub/grub-0.97-r1.ebuild b/sys-boot/grub/grub-0.97-r1.ebuild
new file mode 100644 (file)
index 0000000..475c1ef
--- /dev/null
+++ b/sys-boot/grub/grub-0.97-r1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r1.ebuild,v 1.1 2005/11/08 02:53:47 vapier Exp $
+
+inherit mount-boot eutils flag-o-matic toolchain-funcs
+
+PATCHVER=1.1
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+       ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
+       mirror://gentoo/splash.xpm.gz
+       mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static netboot custom-cflags"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5"
+DEPEND="${RDEPEND}
+       >=sys-devel/automake-1.7
+       >=sys-devel/autoconf-2.5"
+PROVIDE="virtual/bootloader"
+
+pkg_setup() {
+       if use amd64 ; then
+               if ! has_m32 ; then
+                       eerror "Your compiler seems to be unable to compile 32bit code."
+                       eerror "If you are on amd64, make sure you compile gcc with:"
+                       echo
+                       eerror "    USE=multilib FEATURES=-sandbox"
+                       die "Cannot produce 32bit objects!"
+               fi
+
+               ABI_ALLOW="x86"
+               ABI="x86"
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       if [[ -n ${PATCHVER} ]] ; then
+               EPATCH_SUFFIX="patch"
+               epatch "${WORKDIR}"/patch
+
+               # a bunch of patches apply to raw autotool files
+               autoconf || die "autoconf failed"
+               aclocal || die "aclocal failed"
+               automake || die "automake failed"
+       fi
+}
+
+src_compile() {
+       unset BLOCK_SIZE #73499
+
+       ### i686-specific code in the boot loader is a bad idea; disabling to ensure
+       ### at least some compatibility if the hard drive is moved to an older or
+       ### incompatible system.
+
+       # grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
+       # but the objcopy's (faulty) test fails if -fstack-protector is default.
+       # create a cache telling configure that objcopy is ok, and add -C to econf
+       # to make use of the cache.
+       #
+       # CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
+       # STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
+       # -fno-stack-protector detected by configure, removed from netboot's emake.
+       use custom-cflags || unset CFLAGS
+
+       export grub_cv_prog_objcopy_absolute=yes #79734
+       use static && append-ldflags -static
+
+       # build the net-bootable grub first, but only if "netboot" is set
+       if use netboot ; then
+               econf \
+               --libdir=/lib \
+               --datadir=/usr/lib/grub \
+               --exec-prefix=/ \
+               --disable-auto-linux-mem-opt \
+               --enable-diskless \
+               --enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
+               --enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
+               --enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
+               --enable-{tulip,via-rhine,w89c840} || die "netboot econf failed"
+
+               emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
+
+               mv -f stage2/{nbgrub,pxegrub} "${S}"/
+               mv -f stage2/stage2 stage2/stage2.netboot
+
+               make clean || die "make clean failed"
+       fi
+
+       # Now build the regular grub
+       # Note that FFS and UFS2 support are broken for now - stage1_5 files too big
+       econf \
+               --libdir=/lib \
+               --datadir=/usr/lib/grub \
+               --exec-prefix=/ \
+               --disable-auto-linux-mem-opt || die "econf failed"
+       emake || die "making regular stuff"
+}
+
+src_test() {
+       # non-default block size also give false pass/fails.
+       unset BLOCK_SIZE
+       make check || die "make check failed"
+}
+
+src_install() {
+       make DESTDIR="${D}" install || die
+       if use netboot ; then
+               exeinto /usr/lib/grub/${CHOST}
+               doexe nbgrub pxegrub stage2/stage2.netboot || die "netboot install"
+       fi
+
+       insinto /boot/grub
+       doins "${DISTDIR}"/splash.xpm.gz
+       newins docs/menu.lst grub.conf.sample
+
+       dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
+       newdoc docs/menu.lst grub.conf.sample
+}
+
+pkg_postinst() {
+       [[ ${ROOT} != "/" ]] && return 0
+
+       # change menu.lst to grub.conf
+       if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then
+               mv -f /boot/grub/menu.lst /boot/grub/grub.conf
+               ewarn
+               ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
+               ewarn
+       fi
+       einfo "Linking from new grub.conf name to menu.lst"
+       [[ ! -e /boot/grub/menu.lst ]] && ln -snf grub.conf /boot/grub/menu.lst
+
+       [[ -e /boot/grub/stage2 ]] && mv /boot/grub/stage2{,.old}
+
+       einfo "Copying files from /lib/grub and /usr/lib/grub to /boot"
+       for x in /lib/grub/*/* /usr/lib/grub/*/* ; do
+               [[ -f ${x} ]] && cp -p ${x} /boot/grub
+       done
+
+       [[ -e /boot/grub/grub.conf ]] \
+               && /sbin/grub \
+                       --batch \
+                       --device-map=/boot/grub/device.map \
+                       < /boot/grub/grub.conf > /dev/null 2>&1
+}