re #9978 rb3077 PCI ID conflict between amr(7d) and Dell C6220
--HG--
branch : stable-4.0
re #9978 rb3077 PCI ID conflict between amr(7d) and Dell C6220

          --- old/usr/src/pkg/manifests/driver-storage-amr.mf
          +++ new/usr/src/pkg/manifests/driver-storage-amr.mf

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each

  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  23   23  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
       24 +# Copyright 2012 Nexenta Systems, Inc.  All rights reserved.
  24   25  #
  25   26  
  26   27  #
  27   28  # The default for payload-bearing actions in this package is to appear in the
  28   29  # global zone only.  See the include file for greater detail, as well as
  29   30  # information about overriding the defaults.
  30   31  #
  31   32  <include global_zone_only_component>
  32   33  set name=pkg.fmri value=pkg:/driver/storage/amr@$(PKGVERS)
  33   34  set name=pkg.description value="LSI MegaRAID SCSI HBA Driver"

  34   35  set name=pkg.summary value="LSI MegaRAID SCSI HBA Driver"

  35   36  set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports
  36   37  set name=variant.arch value=i386
  37   38  dir path=kernel group=sys
  38   39  dir path=kernel/drv group=sys
  39   40  dir path=kernel/drv/$(ARCH64) group=sys
  40   41  dir path=usr/share/man
  41   42  dir path=usr/share/man/man7d
  42   43  driver name=amr class=scsi \
  43   44      alias=pci1000,532 \
  44   45      alias=pci1028,493 \
  45      -    alias=pci1028,518 \
  46   46      alias=pci1028,520 \
  47   47      alias=pci1028,e \
  48   48      alias=pci1028,f
  49   49  file path=kernel/drv/$(ARCH64)/amr group=sys
  50   50  file path=kernel/drv/amr.conf group=sys
  51   51  file path=usr/share/man/man7d/amr.7d
  52   52  legacy pkg=SUNWamr desc="LSI MegaRAID SCSI HBA Driver" \
  53   53      name="LSI MegaRAID SCSI HBA Driver"
  54   54  license cr_Sun license=cr_Sun
  55   55  license usr/src/uts/intel/io/amr/THIRDPARTYLICENSE \
  56   56      license=usr/src/uts/intel/io/amr/THIRDPARTYLICENSE
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX