summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-11-10 02:37:12 +0000
committerMike Frysinger <vapier@gentoo.org>2005-11-10 02:37:12 +0000
commit40b25e4299cc2290b2678e4a1da8c2497089c909 (patch)
treea59440799facd906a03f82aeb74b0f1c62d0121f /sys-boot
parentStable on x86; bug #111926 (diff)
downloadhistorical-40b25e4299cc2290b2678e4a1da8c2497089c909.tar.gz
historical-40b25e4299cc2290b2678e4a1da8c2497089c909.tar.bz2
historical-40b25e4299cc2290b2678e4a1da8c2497089c909.zip
Punt reiser4 patch since it breaks booting for some #111885.
Package-Manager: portage-2.0.53_rc7
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/ChangeLog8
-rw-r--r--sys-boot/grub/Manifest12
-rw-r--r--sys-boot/grub/files/digest-grub-0.97-r2 (renamed from sys-boot/grub/files/digest-grub-0.97-r1)0
-rw-r--r--sys-boot/grub/grub-0.97-r2.ebuild (renamed from sys-boot/grub/grub-0.97-r1.ebuild)5
4 files changed, 17 insertions, 8 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index bca0451e6b0a..97e9f1dc4957 100644
--- 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.53 2005/11/08 02:53:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.54 2005/11/10 02:37:12 vapier Exp $
+
+*grub-0.97-r2 (10 Nov 2005)
+
+ 10 Nov 2005; Mike Frysinger <vapier@gentoo.org> -grub-0.97-r1.ebuild,
+ +grub-0.97-r2.ebuild:
+ Punt reiser4 patch since it breaks booting for some #111885.
*grub-0.97-r1 (08 Nov 2005)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 77989a48b6cf..3bf98495ed79 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,26 +1,26 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 c6ab63bf3bc5d39e00c7dc8c88fa7b6f ChangeLog 16193
+MD5 995c5abe78b5cc9e234ccd0069a00143 ChangeLog 16382
MD5 5695c7ea410b6913901208938e05b1ad files/digest-grub-0.92-r1 190
MD5 c5c746f1feb71d47fb2f5481590b83df files/digest-grub-0.94-r1 190
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 80b2642d044b2ad2983d3925c4531952 files/digest-grub-0.97 191
-MD5 485041aa6ced0fae7a859d510543f1a5 files/digest-grub-0.97-r1 191
+MD5 485041aa6ced0fae7a859d510543f1a5 files/digest-grub-0.97-r2 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 5fd192ab55a660ce5e6e9c8edb8a10f5 grub-0.97-r2.ebuild 4555
MD5 98aac6dc17a7d909ca1de859ef1394a2 grub-0.97.ebuild 4518
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
-iD8DBQFDcBNigIKl8Uu19MoRAhxkAJ9oeBBk5oKtUC0jjMs+0jkwu1hFMACfabdu
-SHvf4/nuwBMScGz+otb+LXg=
-=UxoZ
+iD8DBQFDcrKIgIKl8Uu19MoRAjHUAJ9kEtGXtO3YCy6MYFtDDoECNvqppwCfSU65
+UlTLmeEVP2na9z+V1ZGzNN0=
+=VqoQ
-----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/files/digest-grub-0.97-r1 b/sys-boot/grub/files/digest-grub-0.97-r2
index 98095e9bed82..98095e9bed82 100644
--- a/sys-boot/grub/files/digest-grub-0.97-r1
+++ b/sys-boot/grub/files/digest-grub-0.97-r2
diff --git a/sys-boot/grub/grub-0.97-r1.ebuild b/sys-boot/grub/grub-0.97-r2.ebuild
index 475c1efc8130..9bef418d7c18 100644
--- a/sys-boot/grub/grub-0.97-r1.ebuild
+++ b/sys-boot/grub/grub-0.97-r2.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild,v 1.1 2005/11/10 02:37:12 vapier Exp $
inherit mount-boot eutils flag-o-matic toolchain-funcs
@@ -42,6 +42,9 @@ src_unpack() {
unpack ${A}
cd "${S}"
+ # patch breaks booting for some people #111885
+ rm "${WORKDIR}"/patch/400_*
+
if [[ -n ${PATCHVER} ]] ; then
EPATCH_SUFFIX="patch"
epatch "${WORKDIR}"/patch