diff options
| -rw-r--r-- | sys-boot/grub/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-boot/grub/Manifest | 6 | ||||
| -rw-r--r-- | sys-boot/grub/files/digest-grub-0.93.20031222 | 1 | ||||
| -rw-r--r-- | sys-boot/grub/files/digest-grub-0.93.20040125 | 1 | ||||
| -rw-r--r-- | sys-boot/grub/files/digest-grub-0.94-r1 (renamed from sys-boot/grub/files/digest-grub-0.94) | 0 | ||||
| -rw-r--r-- | sys-boot/grub/grub-0.93.20031222.ebuild | 126 | ||||
| -rw-r--r-- | sys-boot/grub/grub-0.93.20040125.ebuild | 126 | ||||
| -rw-r--r-- | sys-boot/grub/grub-0.94-r1.ebuild (renamed from sys-boot/grub/grub-0.94.ebuild) | 2 |
8 files changed, 10 insertions, 260 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index b562166faa59..ce8bc5b255ed 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-boot/grub # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.7 2004/02/15 22:26:22 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.8 2004/02/26 07:38:10 seemant Exp $ + +*grub-0.94-r1 (25 Feb 2004) + + 25 Feb 2004; Seemant Kulleen <seemant@gentoo.org> grub-0.93.20031222.ebuild, + grub-0.93.20040125.ebuild, grub-0.94-r1.ebuild, grub-0.94.ebuild: + revision bump for spock's change 15 Feb 2004; Michal Januszewski <spock@gentoo.org> grub-0.94.ebuild: Added the 'grubsplash' patch, closes #40827. diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index aa5251525cf2..e8f87d531e84 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -1,14 +1,12 @@ +MD5 3ec1613e07206d535b075c0c4b3c1134 grub-0.94-r1.ebuild 3668 MD5 3ec1613e07206d535b075c0c4b3c1134 grub-0.94.ebuild 3668 MD5 90a586f628c8972bcf8c213bea95a19a grub-0.92-r1.ebuild 2544 -MD5 2975a6c11508d86b142407b10a1fe4d8 grub-0.93.20040125.ebuild 3476 -MD5 a2f1c803b74cbb0d24cc25910ad48d11 grub-0.93.20031222.ebuild 3476 MD5 5f7128b961e9dd51fb6f073c2ba71592 ChangeLog 8049 MD5 143492d67264ac30e251ffb1d62a1a67 grub-0.93.20030118.ebuild 2429 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94 131 MD5 cdd6c89d48982ecd544c0b4774755afd files/splash.xpm.gz 33856 MD5 b302edf756d9f8996d9e1ae6d3a49768 files/digest-grub-0.93.20030118 1764 -MD5 ab313df0ff3caf5f6d6c6245662a5a8e files/digest-grub-0.93.20031222 71 -MD5 34aeeeb59233ead1d215b463e3d4ab78 files/digest-grub-0.93.20040125 71 MD5 16039704cf1e6b6f46b4413532af082c files/digest-grub-0.92-r1 133 +MD5 0b52e1b3a6a9f3c9b86742580eabf28d files/digest-grub-0.94-r1 131 MD5 8d898cd9d1928916596cc3f9883eac67 files/grub-0.93-gcc3.3.diff 639 diff --git a/sys-boot/grub/files/digest-grub-0.93.20031222 b/sys-boot/grub/files/digest-grub-0.93.20031222 deleted file mode 100644 index c88853e0aa59..000000000000 --- a/sys-boot/grub/files/digest-grub-0.93.20031222 +++ /dev/null @@ -1 +0,0 @@ -MD5 11102d53a1fedd1bda10a1032f9072e2 grub-0.93.20031222.tar.bz2 718937 diff --git a/sys-boot/grub/files/digest-grub-0.93.20040125 b/sys-boot/grub/files/digest-grub-0.93.20040125 deleted file mode 100644 index b3573f29f234..000000000000 --- a/sys-boot/grub/files/digest-grub-0.93.20040125 +++ /dev/null @@ -1 +0,0 @@ -MD5 5e6991f7ec993f02b7d7f1dd97dc7cd2 grub-0.93.20040125.tar.bz2 719839 diff --git a/sys-boot/grub/files/digest-grub-0.94 b/sys-boot/grub/files/digest-grub-0.94-r1 index 6e16be87c678..6e16be87c678 100644 --- a/sys-boot/grub/files/digest-grub-0.94 +++ b/sys-boot/grub/files/digest-grub-0.94-r1 diff --git a/sys-boot/grub/grub-0.93.20031222.ebuild b/sys-boot/grub/grub-0.93.20031222.ebuild deleted file mode 100644 index 073f28088cca..000000000000 --- a/sys-boot/grub/grub-0.93.20031222.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.93.20031222.ebuild,v 1.2 2004/01/25 18:22:07 seemant Exp $ - -inherit mount-boot eutils flag-o-matic - -filter-flags "-fstack-protector" - -IUSE="static" - -S=${WORKDIR}/${PN} -DESCRIPTION="GNU GRUB boot loader" -HOMEPAGE="http://www.gnu.org/software/grub/" -SRC_URI="mirror://gentoo/${P}.tar.bz2 - http://dev.gentoo.org/~seemant/extras/${P}.tar.bz2" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="-* ~x86" - -DEPEND=">=sys-libs/ncurses-5.2-r5 - >=sys-devel/autoconf-2.5" - -PROVIDE="virtual/bootloader" - -src_unpack() { - unpack ${A} || die - cd ${S} || die - # grub-0.93.20030118-gentoo.diff; <woodchip@gentoo.org> (18 Jan 2003) - # -fixes from grub CVS pulled on 20030118 - # -vga16 patches; mined from Debian's grub-0.93+cvs20030102-1.diff - # -special-raid-devices.patch - # -addsyncs.patch - # -splashimagehelp.patch - # -configfile.patch - # -installcopyonly.patch - - # This patchset is from SuSE -- hopefully fixes the acl symlink issue - # And should add some boot prettification -# epatch ${WORKDIR}/${PF}-gentoo.diff -# epatch ${FILESDIR}/${P}-test.patch -} - -src_compile() { - ### 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. - unset CFLAGS - - append-flags "-DNDEBUG -minline-all-stringops" - use static && export LDFLAGS="${LDFLAGS} -static" - - # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml - if has_version 'sys-devel/hardened-gcc' && [ "${CC}"="gcc" ] - then - # the configure script has problems with -nostdlib - CC="${CC} -yet_exec -yno_propolice" - fi - - autoconf || die - aclocal || die - automake || die - - # build the net-bootable grub first - CFLAGS="" \ - econf \ - --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 - - emake w89c840_o_CFLAGS="-O" || die "making netboot stuff" - - mv stage2/{nbgrub,pxegrub} ${S} - mv stage2/stage2 stage2/stage2.netboot - - make clean || die - - # now build the regular grub - CFLAGS="${CFLAGS}" \ - econf \ - --datadir=/usr/lib/grub \ - --exec-prefix=/ \ - --disable-auto-linux-mem-opt || die - emake || die "making regular stuff" -} - -src_install() { - make DESTDIR=${D} install || die - exeinto /usr/lib/grub - doexe nbgrub pxegrub stage2/stage2 stage2/stage2.netboot - - insinto /boot/grub - doins ${FILESDIR}/splash.xpm.gz - newins docs/menu.lst grub.conf.sample - - dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO - newdoc docs/menu.lst grub.conf.sample -} - -pkg_postinst() { - [ "$ROOT" != "/" ] && return 0 - /sbin/grub-install --just-copy - - # change menu.lst to grub.conf - if [ ! -e /boot/grub/grub.conf -a -e /boot/grub/menu.lst ] - then - mv /boot/grub/menu.lst /boot/grub/grub.conf - ln -s grub.conf /boot/grub/menu.lst - ewarn - ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf" - ewarn - fi - - [ -e /boot/grub/stage2 ] && mv /boot/grub/stage2{,.old} - cp -p /usr/lib/grub/* /boot/grub - [ -e /boot/grub/grub.conf ] \ - && /usr/sbin/grub \ - --batch \ - --device-map=/boot/grub/device.map \ - < /boot/grub/grub.conf > /dev/null 2>&1 -} diff --git a/sys-boot/grub/grub-0.93.20040125.ebuild b/sys-boot/grub/grub-0.93.20040125.ebuild deleted file mode 100644 index 9a4a201136ce..000000000000 --- a/sys-boot/grub/grub-0.93.20040125.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.93.20040125.ebuild,v 1.2 2004/01/25 18:22:07 seemant Exp $ - -inherit mount-boot eutils flag-o-matic - -filter-flags "-fstack-protector" - -IUSE="static" - -S=${WORKDIR}/${PN} -DESCRIPTION="GNU GRUB boot loader" -HOMEPAGE="http://www.gnu.org/software/grub/" -SRC_URI="mirror://gentoo/${P}.tar.bz2 - http://dev.gentoo.org/~seemant/extras/${P}.tar.bz2" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="-* ~x86" - -DEPEND=">=sys-libs/ncurses-5.2-r5 - >=sys-devel/autoconf-2.5" - -PROVIDE="virtual/bootloader" - -src_unpack() { - unpack ${A} || die - cd ${S} || die - # grub-0.93.20030118-gentoo.diff; <woodchip@gentoo.org> (18 Jan 2003) - # -fixes from grub CVS pulled on 20030118 - # -vga16 patches; mined from Debian's grub-0.93+cvs20030102-1.diff - # -special-raid-devices.patch - # -addsyncs.patch - # -splashimagehelp.patch - # -configfile.patch - # -installcopyonly.patch - - # This patchset is from SuSE -- hopefully fixes the acl symlink issue - # And should add some boot prettification -# epatch ${WORKDIR}/${PF}-gentoo.diff -# epatch ${FILESDIR}/${P}-test.patch -} - -src_compile() { - ### 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. - unset CFLAGS - - append-flags "-DNDEBUG -minline-all-stringops" - use static && export LDFLAGS="${LDFLAGS} -static" - - # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml - if has_version 'sys-devel/hardened-gcc' && [ "${CC}"="gcc" ] - then - # the configure script has problems with -nostdlib - CC="${CC} -yet_exec -yno_propolice" - fi - - autoconf || die - aclocal || die - automake || die - - # build the net-bootable grub first - CFLAGS="" \ - econf \ - --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 - - emake w89c840_o_CFLAGS="-O" || die "making netboot stuff" - - mv stage2/{nbgrub,pxegrub} ${S} - mv stage2/stage2 stage2/stage2.netboot - - make clean || die - - # now build the regular grub - CFLAGS="${CFLAGS}" \ - econf \ - --datadir=/usr/lib/grub \ - --exec-prefix=/ \ - --disable-auto-linux-mem-opt || die - emake || die "making regular stuff" -} - -src_install() { - make DESTDIR=${D} install || die - exeinto /usr/lib/grub - doexe nbgrub pxegrub stage2/stage2 stage2/stage2.netboot - - insinto /boot/grub - doins ${FILESDIR}/splash.xpm.gz - newins docs/menu.lst grub.conf.sample - - dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO - newdoc docs/menu.lst grub.conf.sample -} - -pkg_postinst() { - [ "$ROOT" != "/" ] && return 0 - /sbin/grub-install --just-copy - - # change menu.lst to grub.conf - if [ ! -e /boot/grub/grub.conf -a -e /boot/grub/menu.lst ] - then - mv /boot/grub/menu.lst /boot/grub/grub.conf - ln -s grub.conf /boot/grub/menu.lst - ewarn - ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf" - ewarn - fi - - [ -e /boot/grub/stage2 ] && mv /boot/grub/stage2{,.old} - cp -p /usr/lib/grub/* /boot/grub - [ -e /boot/grub/grub.conf ] \ - && /usr/sbin/grub \ - --batch \ - --device-map=/boot/grub/device.map \ - < /boot/grub/grub.conf > /dev/null 2>&1 -} diff --git a/sys-boot/grub/grub-0.94.ebuild b/sys-boot/grub/grub-0.94-r1.ebuild index 27cbd506e54a..115620b6da7d 100644 --- a/sys-boot/grub/grub-0.94.ebuild +++ b/sys-boot/grub/grub-0.94-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94.ebuild,v 1.4 2004/02/15 22:26:22 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r1.ebuild,v 1.1 2004/02/26 07:38:10 seemant Exp $ inherit mount-boot eutils flag-o-matic gcc |