Fix up some merges where we wanted the upstream version.
re #13879 make libsqlite a real shared lib (tweaks)
  Fix rebuild after pull (remove files left in the way)
  Make sqlite.h SQLITE_VERSION more predictable.
OS-5 Integrate virtio drivers
    integration cleanup (copyrights, cddl 1.0)
port of illumos-1147
    1147 integrate the virtio-block driver
    Reviewed by: Dmitry Yusupov <Dmitry.Yusupov@nexenta.com>
    Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
    Approved by: Garrett D'Amore <garrett@damore.org>

          --- old/usr/src/pkg/manifests/driver-storage-vioblk.mf
          +++ new/usr/src/pkg/manifests/driver-storage-vioblk.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      -# Copyright 2012 Nexenta Systems, Inc. All rights reserved.
       23 +# Copyright 2012 Nexenta Systems, Inc.  All rights reserved.
  24   24  #
  25   25  
  26   26  #
  27   27  # The default for payload-bearing actions in this package is to appear in the
  28   28  # global zone only.  See the include file for greater detail, as well as
  29   29  # information about overriding the defaults.
  30   30  #
  31   31  <include global_zone_only_component>
  32   32  set name=pkg.fmri value=pkg:/driver/storage/vioblk@$(PKGVERS)
  33   33  set name=pkg.description value="Virtio block driver"
  34   34  set name=pkg.summary value="Virtio block"
  35   35  set name=info.classification \
  36   36      value=org.opensolaris.category.2008:System/Hardware
  37      -set name=variant.arch value=i386
       37 +set name=variant.arch value=$(ARCH)
  38   38  dir path=kernel group=sys
  39   39  dir path=kernel/drv group=sys
  40   40  dir path=kernel/drv/$(ARCH64) group=sys
  41   41  driver name=vioblk alias=pci1af4,1001 clone_perms="vioblk 0666 root sys" \
  42   42      perms="* 0666 root sys"
  43   43  file path=kernel/drv/$(ARCH64)/vioblk group=sys
  44   44  license lic_CDDL license=lic_CDDL
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX