diff options
Diffstat (limited to 'usr/src/pkg')
| -rw-r--r-- | usr/src/pkg/manifests/developer-build-onbld.mf | 47 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/developer-opensolaris-osnet.mf | 2 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/driver-ipmi.mf | 45 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/driver-misc-virtio.mf | 43 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/driver-storage-mpt_sas.mf | 1 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/driver-storage-vioblk.mf | 45 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/system-zones.mf | 4 |
7 files changed, 139 insertions, 48 deletions
diff --git a/usr/src/pkg/manifests/developer-build-onbld.mf b/usr/src/pkg/manifests/developer-build-onbld.mf index dbb194fb77..bf01650e0f 100644 --- a/usr/src/pkg/manifests/developer-build-onbld.mf +++ b/usr/src/pkg/manifests/developer-build-onbld.mf @@ -22,6 +22,7 @@ # # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2010, Richard Lowe +# Copyright 2012, Piotr Jasiukajtis # set name=pkg.fmri value=pkg:/developer/build/onbld@$(PKGVERS) @@ -47,11 +48,6 @@ dir path=opt/onbld/gk dir path=opt/onbld/lib dir path=opt/onbld/lib/$(ARCH) dir path=opt/onbld/lib/perl -dir path=opt/onbld/lib/python2.4 -dir path=opt/onbld/lib/python2.4/onbld -dir path=opt/onbld/lib/python2.4/onbld/Checks -dir path=opt/onbld/lib/python2.4/onbld/Scm -dir path=opt/onbld/lib/python2.4/onbld/hgext dir path=opt/onbld/lib/python2.6 dir path=opt/onbld/lib/python2.6/onbld dir path=opt/onbld/lib/python2.6/onbld/Checks @@ -149,43 +145,6 @@ file path=opt/onbld/gk/gen_make.machines mode=0755 file path=opt/onbld/lib/$(ARCH)/libdwarf.so.1 file path=opt/onbld/lib/perl/onbld_elfmod.pm file path=opt/onbld/lib/perl/onbld_elfmod_vertype.pm -file path=opt/onbld/lib/python2.4/onbld/Checks/CStyle.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/CStyle.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Cddl.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Cddl.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/CmtBlk.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/CmtBlk.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Comments.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Comments.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Copyright.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Copyright.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/DbLookups.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/DbLookups.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/HdrChk.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/HdrChk.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/JStyle.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/JStyle.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Keywords.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Keywords.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Mapfile.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/Mapfile.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/ProcessCheck.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/ProcessCheck.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/__init__.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Checks/__init__.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Scm/Backup.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Scm/Backup.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Scm/Version.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Scm/Version.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Scm/WorkSpace.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Scm/WorkSpace.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Scm/__init__.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/Scm/__init__.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/__init__.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/__init__.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/hgext/__init__.py mode=0444 -file path=opt/onbld/lib/python2.4/onbld/hgext/__init__.pyc mode=0444 -file path=opt/onbld/lib/python2.4/onbld/hgext/cdm.py mode=0444 file path=opt/onbld/lib/python2.6/onbld/Checks/CStyle.py mode=0444 file path=opt/onbld/lib/python2.6/onbld/Checks/CStyle.pyc mode=0444 file path=opt/onbld/lib/python2.6/onbld/Checks/Cddl.py mode=0444 @@ -266,10 +225,8 @@ license usr/src/tools/ctf/dwarf/THIRDPARTYLICENSE \ license usr/src/tools/onbld/THIRDPARTYLICENSE \ license=usr/src/tools/onbld/THIRDPARTYLICENSE link path=opt/onbld/bin/git-nits target=git-pbchk -link path=opt/onbld/lib/python target=python2.4 +link path=opt/onbld/lib/python target=python2.6 link path=opt/onbld/man/man1/git-nits.1 target=git-pbchk.1 -# DbLookups.py requires elementtree -depend fmri=library/python-2/python-extra-24 type=require # webrev(1) requires ps2pdf depend fmri=print/filter/ghostscript type=require # hgsetup(1) uses check-hostname(1) and nightly sendmail(1M) diff --git a/usr/src/pkg/manifests/developer-opensolaris-osnet.mf b/usr/src/pkg/manifests/developer-opensolaris-osnet.mf index d05fbd7291..9632c7d614 100644 --- a/usr/src/pkg/manifests/developer-opensolaris-osnet.mf +++ b/usr/src/pkg/manifests/developer-opensolaris-osnet.mf @@ -34,7 +34,7 @@ depend fmri=data/docbook@0.5.11-0.133 type=require depend fmri=developer/astdev@0.5.11-0.133 type=require depend fmri=developer/build/make@0.5.11-0.133 type=require depend fmri=developer/build/onbld@0.5.11-0.133 type=require -depend fmri=developer/gcc-3@3.4.3-0.133 type=require +$(i386_ONLY)depend fmri=developer/gnu-binutils@2.19-0.133 type=require depend fmri=developer/java/jdk@0.5.11-0.133 type=require depend fmri=developer/lexer/flex@2.5.35-0.133 type=require depend fmri=developer/object-file@0.5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/driver-ipmi.mf b/usr/src/pkg/manifests/driver-ipmi.mf new file mode 100644 index 0000000000..e6eea4cb99 --- /dev/null +++ b/usr/src/pkg/manifests/driver-ipmi.mf @@ -0,0 +1,45 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +<include global_zone_only_component> +set name=pkg.fmri value=pkg:/driver/ipmi@$(PKGVERS) +set name=pkg.summary \ + value="Intelligent Platform Management Interface baseboard driver" +set name=info.classification value=org.opensolaris.category.2008:Drivers/Ports +set name=variant.arch value=i386 +dir path=usr/include +dir path=usr/include/sys +dir path=usr/include/sys +dir path=usr/kernel group=sys +dir path=usr/kernel/drv group=sys +dir path=usr/kernel/drv/$(ARCH64) group=sys +dir path=usr/share +dir path=usr/share/man +dir path=usr/share/man/man7d +driver name=ipmi perms="* 0600 root sys" +file path=usr/include/sys/ipmi.h +file path=usr/kernel/drv/amd64/ipmi +file path=usr/kernel/drv/ipmi +file path=usr/kernel/drv/ipmi.conf +file path=usr/share/man/man7d/ipmi.7d +license lic_CDDL license=lic_CDDL +license usr/src/uts/intel/io/ipmi/THIRDPARTYLICENSE \ + license=usr/src/uts/intel/io/ipmi/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/driver-misc-virtio.mf b/usr/src/pkg/manifests/driver-misc-virtio.mf new file mode 100644 index 0000000000..805f52137d --- /dev/null +++ b/usr/src/pkg/manifests/driver-misc-virtio.mf @@ -0,0 +1,43 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2012 Nexenta Systems, Inc. All rights reserved. +# + +# +# 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 global_zone_only_component> +set name=pkg.fmri value=pkg:/driver/misc/virtio@$(PKGVERS) +set name=pkg.description value="Virtio core" +set name=pkg.summary value="Virtio core" +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware +set name=variant.arch value=i386 +dir path=kernel group=sys +dir path=kernel/misc group=sys +dir path=kernel/misc/$(ARCH64) group=sys +file path=kernel/misc/$(ARCH64)/virtio group=sys mode=0755 +file path=kernel/misc/virtio group=sys mode=0755 +license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-storage-mpt_sas.mf b/usr/src/pkg/manifests/driver-storage-mpt_sas.mf index 6d4bb62965..2ea1c67aea 100644 --- a/usr/src/pkg/manifests/driver-storage-mpt_sas.mf +++ b/usr/src/pkg/manifests/driver-storage-mpt_sas.mf @@ -49,6 +49,7 @@ driver name=mpt_sas class=scsi-self-identifying \ alias=pciex1000,70 \ alias=pciex1000,72 \ alias=pciex1000,76 \ + alias=pciex1000,86 \ alias=pciex1000,87 file path=kernel/drv/$(ARCH64)/mpt_sas group=sys $(i386_ONLY)file path=kernel/drv/mpt_sas group=sys diff --git a/usr/src/pkg/manifests/driver-storage-vioblk.mf b/usr/src/pkg/manifests/driver-storage-vioblk.mf new file mode 100644 index 0000000000..f3bc3ef128 --- /dev/null +++ b/usr/src/pkg/manifests/driver-storage-vioblk.mf @@ -0,0 +1,45 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2012 Nexenta Systems, Inc. All rights reserved. +# + +# +# 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 global_zone_only_component> +set name=pkg.fmri value=pkg:/driver/storage/vioblk@$(PKGVERS) +set name=pkg.description value="Virtio block driver" +set name=pkg.summary value="Virtio block" +set name=info.classification \ + value=org.opensolaris.category.2008:System/Hardware +set name=variant.arch value=i386 +dir path=kernel group=sys +dir path=kernel/drv group=sys +dir path=kernel/drv/$(ARCH64) group=sys +driver name=vioblk alias=pci1af4,1001 clone_perms="vioblk 0666 root sys" \ + perms="* 0666 root sys" +file path=kernel/drv/$(ARCH64)/vioblk group=sys +file path=kernel/drv/vioblk group=sys +license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-zones.mf b/usr/src/pkg/manifests/system-zones.mf index de67c46f80..ff5787a608 100644 --- a/usr/src/pkg/manifests/system-zones.mf +++ b/usr/src/pkg/manifests/system-zones.mf @@ -59,8 +59,8 @@ dir path=usr/share/man/man1m dir path=usr/share/man/man5 dir path=usr/share/man/man7d driver name=zcons -file path=etc/zones/SUNWblank.xml mode=0444 -file path=etc/zones/SUNWdefault.xml mode=0444 +file path=etc/zones/SUNWblank.xml mode=0444 variant.opensolaris.zone=global +file path=etc/zones/SUNWdefault.xml mode=0444 variant.opensolaris.zone=global file path=etc/zones/index group=sys original_name=SUNWzone:etc/zones/index \ preserve=true variant.opensolaris.zone=global file path=lib/svc/manifest/system/resource-mgmt.xml group=sys mode=0444 \ |