diff options
| author | jlam <jlam> | 2005-11-12 06:35:24 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-11-12 06:35:24 +0000 |
| commit | 35b98d948ef9d5a5b19a0cc9c6375bcc526adb62 (patch) | |
| tree | 96106db257b3bad436b82e75189340ec11c828cb /sysutils/grub | |
| parent | 12376e60dd4e1f9811b60a82a2899cbb19576a1d (diff) | |
| download | pkgsrc-35b98d948ef9d5a5b19a0cc9c6375bcc526adb62.tar.gz | |
On NetBSD, recognize ld(4) disk devices attached to HW raid controllers,
e.g. aac(4), amr(4), twe(4), etc., so that we can install grub onto
them. Bump PKGREVISION of sysutils/grub to 0.97nb3.
Diffstat (limited to 'sysutils/grub')
| -rw-r--r-- | sysutils/grub/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/grub/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/grub/patches/patch-ai | 19 |
3 files changed, 20 insertions, 7 deletions
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile index 07dc97679f5..25bd90dbb92 100644 --- a/sysutils/grub/Makefile +++ b/sysutils/grub/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.36 2005/09/24 00:20:44 jlam Exp $ +# $NetBSD: Makefile,v 1.37 2005/11/12 06:35:24 jlam Exp $ # DISTNAME= grub-0.97 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= sysutils MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/ diff --git a/sysutils/grub/distinfo b/sysutils/grub/distinfo index 05730cc7997..5ff354708a7 100644 --- a/sysutils/grub/distinfo +++ b/sysutils/grub/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2005/10/23 19:53:24 rillig Exp $ +$NetBSD: distinfo,v 1.18 2005/11/12 06:35:24 jlam Exp $ SHA1 (grub-0.97.tar.gz) = 2580626c4579bd99336d3af4482c346c95dac4fb RMD160 (grub-0.97.tar.gz) = 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 @@ -6,5 +6,5 @@ Size (grub-0.97.tar.gz) = 971783 bytes SHA1 (patch-ac) = c2c657af9b4ed15991d642a1359cb65d61662df6 SHA1 (patch-ad) = 613e915a015ad22c9bd5712d416e12b1b81fdb93 SHA1 (patch-ae) = 96d8283e90ceb3e887ba0ada05619858c52bc144 -SHA1 (patch-ai) = 61d81c9b4f1bbec6e9bd1f922f1a88cd7a02a8ba +SHA1 (patch-ai) = 60088cf6786a364da37e19fbb5df4c6fd7641016 SHA1 (patch-aj) = bfbac23a7c250ed615dcfb4a988708c970b617d8 diff --git a/sysutils/grub/patches/patch-ai b/sysutils/grub/patches/patch-ai index e009a07623a..df6cf3162da 100644 --- a/sysutils/grub/patches/patch-ai +++ b/sysutils/grub/patches/patch-ai @@ -1,8 +1,21 @@ -$NetBSD: patch-ai,v 1.1 2003/07/13 17:35:05 wiz Exp $ +$NetBSD: patch-ai,v 1.2 2005/11/12 06:35:24 jlam Exp $ ---- util/grub-install.in.orig Mon May 20 13:21:50 2002 +--- util/grub-install.in.orig 2004-07-24 14:57:31.000000000 -0400 +++ util/grub-install.in -@@ -297,7 +297,7 @@ fi +@@ -119,10 +119,10 @@ convert () { + | sed "s%.*/r\{0,1\}da[0-9]\(s[0-9]*[a-h]\)%\1%"` + ;; + netbsd* | knetbsd*-gnu) +- tmp_disk=`echo "$1" | sed 's%r\{0,1\}\([sw]d[0-9]*\).*$%r\1d%' \ ++ tmp_disk=`echo "$1" | sed 's%r\{0,1\}\([lsw]d[0-9]*\).*$%r\1d%' \ + | sed 's%r\{0,1\}\(fd[0-9]*\).*$%r\1a%'` + tmp_part=`echo "$1" \ +- | sed "s%.*/r\{0,1\}[sw]d[0-9]\([abe-p]\)%\1%"` ++ | sed "s%.*/r\{0,1\}[lsw]d[0-9]\([abe-p]\)%\1%"` + ;; + *) + echo "grub-install does not support your OS yet." 1>&2 +@@ -321,7 +321,7 @@ fi # Stage 1.5 does not exist. # Create the GRUB directory if it is not present. |