--- a/usr/src/pkg/manifests/driver-usb.mf Sun Jun 13 09:24:10 2010 +0800
+++ b/usr/src/pkg/manifests/driver-usb.mf Sat Jun 12 23:20:18 2010 -0700
@@ -20,22 +20,20 @@
#
#
-# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
#
#
-# This package will install successfully into any zone, global or
-# non-global. The files, directories, links, and hardlinks, however,
-# will only be installed into the global zone.
+# The default for payload-bearing actions in this package is to appear in the
+# global zone only. See the include file for greater detail, as well as
+# information about overriding the defaults.
#
-<include hollow_zone_pkg>
+<include global_zone_only_component>
set name=pkg.fmri value=pkg:/driver/usb@$(PKGVERS)
set name=pkg.description value="USBA (USB framework) and USB Device Drivers"
set name=pkg.summary value="USB Device Drivers"
set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports
set name=variant.arch value=$(ARCH)
-set name=variant.opensolaris.zone value=global value=nonglobal
dir path=etc group=sys
dir path=etc/usb group=sys
dir path=kernel group=sys
@@ -49,10 +47,10 @@
dir path=kernel/strmod/$(ARCH64) group=sys
dir path=lib
dir path=lib/svc
+dir path=lib/svc/manifest group=sys
+dir path=lib/svc/manifest/system group=sys
dir path=lib/svc/method
dir path=sbin group=sys
-dir path=lib/svc/manifest group=sys
-dir path=lib/svc/manifest/system group=sys
driver name=ehci alias=pciclass,0c0320 perms="* 0644 root sys"
driver name=hid alias=usbif,class3 perms="* 0600 root sys"
driver name=hubd alias=usbif,class9 perms="* 0644 root sys"
@@ -90,51 +88,44 @@
file path=kernel/drv/$(ARCH64)/wusb_ca group=sys
file path=kernel/drv/$(ARCH64)/wusb_df group=sys
$(i386_ONLY)file path=kernel/drv/ehci group=sys
-file path=kernel/drv/ehci.conf group=sys reboot-needed=false
+file path=kernel/drv/ehci.conf group=sys
$(i386_ONLY)file path=kernel/drv/hid group=sys
$(i386_ONLY)file path=kernel/drv/hubd group=sys
$(i386_ONLY)file path=kernel/drv/hwahc group=sys
$(i386_ONLY)file path=kernel/drv/hwarc group=sys
$(i386_ONLY)file path=kernel/drv/ohci group=sys
-file path=kernel/drv/ohci.conf group=sys reboot-needed=false
+file path=kernel/drv/ohci.conf group=sys
$(i386_ONLY)file path=kernel/drv/scsa2usb group=sys
file path=kernel/drv/scsa2usb.conf group=sys \
- original_name=SUNWusb:kernel/drv/scsa2usb.conf preserve=true \
- reboot-needed=false
+ original_name=SUNWusb:kernel/drv/scsa2usb.conf preserve=true
$(i386_ONLY)file path=kernel/drv/uhci group=sys
-file path=kernel/drv/uhci.conf group=sys reboot-needed=false
+file path=kernel/drv/uhci.conf group=sys
$(i386_ONLY)file path=kernel/drv/usb_ac group=sys
-file path=kernel/drv/usb_ac.conf group=sys reboot-needed=false
+file path=kernel/drv/usb_ac.conf group=sys
$(i386_ONLY)file path=kernel/drv/usb_as group=sys
$(i386_ONLY)file path=kernel/drv/usb_ia group=sys
$(i386_ONLY)file path=kernel/drv/usb_mid group=sys
$(i386_ONLY)file path=kernel/drv/usbprn group=sys
$(i386_ONLY)file path=kernel/drv/wusb_ca group=sys
$(i386_ONLY)file path=kernel/drv/wusb_df group=sys
-file path=kernel/misc/$(ARCH64)/hidparser group=sys mode=0755 reboot-needed=true
-file path=kernel/misc/$(ARCH64)/hwa1480_fw group=sys mode=0755 \
- reboot-needed=true
-file path=kernel/misc/$(ARCH64)/usba group=sys mode=0755 reboot-needed=true
-file path=kernel/misc/$(ARCH64)/usba10 group=sys mode=0755 reboot-needed=true
-$(i386_ONLY)file path=kernel/misc/hidparser group=sys mode=0755 \
- reboot-needed=true
-$(i386_ONLY)file path=kernel/misc/hwa1480_fw group=sys mode=0755 \
- reboot-needed=true
-$(i386_ONLY)file path=kernel/misc/usba group=sys mode=0755 reboot-needed=true
-$(i386_ONLY)file path=kernel/misc/usba10 group=sys mode=0755 reboot-needed=true
-file path=kernel/strmod/$(ARCH64)/usb_ah group=sys mode=0755 reboot-needed=true
-file path=kernel/strmod/$(ARCH64)/usbkbm group=sys mode=0755 reboot-needed=true
-file path=kernel/strmod/$(ARCH64)/usbms group=sys mode=0755 reboot-needed=true
-file path=kernel/strmod/$(ARCH64)/usbwcm group=sys mode=0755 reboot-needed=true
-$(i386_ONLY)file path=kernel/strmod/usb_ah group=sys mode=0755 \
- reboot-needed=true
-$(i386_ONLY)file path=kernel/strmod/usbkbm group=sys mode=0755 \
- reboot-needed=true
-$(i386_ONLY)file path=kernel/strmod/usbms group=sys mode=0755 reboot-needed=true
-$(i386_ONLY)file path=kernel/strmod/usbwcm group=sys mode=0755 \
- reboot-needed=true
+file path=kernel/misc/$(ARCH64)/hidparser group=sys mode=0755
+file path=kernel/misc/$(ARCH64)/hwa1480_fw group=sys mode=0755
+file path=kernel/misc/$(ARCH64)/usba group=sys mode=0755
+file path=kernel/misc/$(ARCH64)/usba10 group=sys mode=0755
+$(i386_ONLY)file path=kernel/misc/hidparser group=sys mode=0755
+$(i386_ONLY)file path=kernel/misc/hwa1480_fw group=sys mode=0755
+$(i386_ONLY)file path=kernel/misc/usba group=sys mode=0755
+$(i386_ONLY)file path=kernel/misc/usba10 group=sys mode=0755
+file path=kernel/strmod/$(ARCH64)/usb_ah group=sys mode=0755
+file path=kernel/strmod/$(ARCH64)/usbkbm group=sys mode=0755
+file path=kernel/strmod/$(ARCH64)/usbms group=sys mode=0755
+file path=kernel/strmod/$(ARCH64)/usbwcm group=sys mode=0755
+$(i386_ONLY)file path=kernel/strmod/usb_ah group=sys mode=0755
+$(i386_ONLY)file path=kernel/strmod/usbkbm group=sys mode=0755
+$(i386_ONLY)file path=kernel/strmod/usbms group=sys mode=0755
+$(i386_ONLY)file path=kernel/strmod/usbwcm group=sys mode=0755
+file path=lib/svc/manifest/system/wusb.xml group=sys mode=0444
file path=lib/svc/method/svc-wusb mode=0555
-file path=lib/svc/manifest/system/wusb.xml group=sys mode=0444
legacy pkg=SUNWusb arch=$(ARCH) category=system \
desc="USBA (USB framework) and USB Device Drivers" \
hotline="Please contact your local service provider" \