summaryrefslogtreecommitdiff
path: root/usr/src/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/pkg')
-rw-r--r--usr/src/pkg/Makefile8
-rw-r--r--usr/src/pkg/manifests/app-example-foo.mf64
-rw-r--r--usr/src/pkg/manifests/driver-graphics-drm.mf162
-rw-r--r--usr/src/pkg/manifests/driver-graphics-drm.p5m145
-rw-r--r--usr/src/pkg/manifests/system-header-header-drm.mf42
5 files changed, 180 insertions, 241 deletions
diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile
index 79063b7..f93829e 100644
--- a/usr/src/pkg/Makefile
+++ b/usr/src/pkg/Makefile
@@ -108,7 +108,7 @@ PKGMOGRIFY= pkgmogrify
#
# In the real ON gate, this was "redist"
#
-REPOS= skel
+REPOS= drm
#
# The packages directory will contain the processed manifests as
@@ -127,7 +127,7 @@ PDIR= packages.$(PKGMACH)
$(PDIR)/developer-build-onbld.dep:= PKGROOT= $(TOOLSROOT)
# In the real ON gate, was "on-nightly"
-PKGPUBLISHER= on-skel
+PKGPUBLISHER= gfx-drm
#
# To get these defaults, manifests should simply refer to $(PKGVERS).
@@ -494,7 +494,7 @@ $(PDIR)/%.mog: manifests/%.mf
$(PKGDEBUG)$(PKGMOGRIFY) $(PKGMOG_VERBOSE) $(PM_INC:%= -I %) \
$(PKGMOG_DEFINES:%=-D %) -P $(@).vars -O $(@) \
$(<) $(PM_TRANSFORMS)
- $(PKGDEBUG)eval REPO=skel PKGSTAT=current NODEPEND=$(SUPPRESSPKGDEP) \
+ $(PKGDEBUG)eval REPO=$(REPOS) PKGSTAT=current NODEPEND=$(SUPPRESSPKGDEP) \
`$(CAT) -s $(@).vars`; \
if [ -f $(@) ]; then \
if [ "$$NODEPEND" != "false" ]; then \
@@ -562,7 +562,7 @@ $(PROC_SYNTH_PKGS): $(PKGLISTS) $$(@F:%.mog=%.mf)
$(PKGMOG_DEFINES:%=-D %) -D PKGDEP_TYPE=$(PKGDEP_TYPE) \
-P $(@).vars -O $(@) $(@F:%.mog=%.mf) \
$(PM_TRANSFORMS) synthetic
- $(PKGDEBUG)eval REPO=skel PKGSTAT=current `$(CAT) -s $(@).vars`; \
+ $(PKGDEBUG)eval REPO=$(REPOS) PKGSTAT=current `$(CAT) -s $(@).vars`; \
if [ -f $(@) ]; then \
$(LN) -s $(@F) \
$(PDIR)/$(@F:%.mog=%).metadata.$$PKGSTAT.$$REPO; \
diff --git a/usr/src/pkg/manifests/app-example-foo.mf b/usr/src/pkg/manifests/app-example-foo.mf
deleted file mode 100644
index 39aaafc..0000000
--- a/usr/src/pkg/manifests/app-example-foo.mf
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# This file and its contents are supplied under the terms of the
-# Common Development and Distribution License ("CDDL"), version 1.0.
-# You may only use this file in accordance with the terms of version
-# 1.0 of the CDDL.
-#
-# A full copy of the text of the CDDL should have accompanied this
-# source. A copy of the CDDL is also available via the Internet at
-# http://www.illumos.org/license/CDDL.
-#
-
-#
-# Copyright 2015 Nexenta Systems, Inc. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/application/example/foo@$(PKGVERS)
-set name=pkg.description value="application example foo"
-set name=pkg.summary value="application example foo"
-set name=info.classification \
- value=org.opensolaris.category.2008:Applications/Examples
-set name=variant.arch value=$(ARCH)
-
-# dirs
-dir path=kernel group=sys
-dir path=kernel/drv group=sys
-dir path=kernel/drv/$(ARCH64) group=sys
-dir path=usr group=sys
-dir path=usr/bin
-dir path=usr/include
-dir path=usr/include/libfoo
-dir path=usr/share/man/man1
-dir path=usr/share/man/man3x
-dir path=usr/share/man/man7
-
-# files
-file path=kernel/drv/$(ARCH64)/foo
-$(i386_ONLY)file path=kernel/drv/foo
-file path=kernel/drv/foo.conf
-file path=kernel/kmdb/$(ARCH64)/foo
-$(i386_ONLY)file path=kernel/kmdb/foo
-file path=usr/bin/foo mode=0555
-file path=usr/include/libfoo/foo.h
-file path=usr/lib/$(ARCH64)/libfoo.so.1
-file path=usr/lib/$(ARCH64)/llib-lfoo.ln
-file path=usr/lib/libfoo.so.1
-file path=usr/lib/llib-lfoo
-file path=usr/lib/llib-lfoo.ln
-file path=usr/lib/mdb/kvm/amd64/foo.so
-file path=usr/lib/mdb/kvm/foo.so
-file path=usr/share/man/man1/foo.1
-file path=usr/share/man/man3x/foo.3x
-file path=usr/share/man/man7/foo.7
-
-# What licenses?
-license lic_CDDL license=lic_CDDL
-license usr/src/uts/common/io/foo/LICENSE \
- license=usr/src/uts/common/io/foo/LICENSE
-
-# links
-link path=usr/lib/$(ARCH64)/libfoo.so target=libfoo.so.1
-link path=usr/lib/libfoo.so target=libfoo.so.1
-link path=usr/share/man/man3x/foo_getcnt.3x target=foo.3x
-link path=usr/share/man/man3x/foo_message.3x target=foo.3x
-link path=usr/share/man/man3x/libfoo.3x target=foo.3x
diff --git a/usr/src/pkg/manifests/driver-graphics-drm.mf b/usr/src/pkg/manifests/driver-graphics-drm.mf
index ecb4553..1a4ca44 100644
--- a/usr/src/pkg/manifests/driver-graphics-drm.mf
+++ b/usr/src/pkg/manifests/driver-graphics-drm.mf
@@ -1,26 +1,25 @@
#
-# CDDL HEADER START
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
#
-# 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.
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
#
-# 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]
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
#
#
@@ -35,19 +34,49 @@ set name=pkg.description \
set name=pkg.summary value="DRM Kernel Drivers"
set name=info.classification \
value=org.opensolaris.category.2008:Drivers/Display
+set name=info.upstream value="Direct Rendering Infrastructure (DRI) project"
+set name=info.upstream-url value=http://dri.freedesktop.org/
set name=org.opensolaris.noincorp value=true
set name=variant.arch value=i386
dir path=kernel group=sys
dir path=kernel/drv group=sys
dir path=kernel/drv/$(ARCH64) group=sys
+dir path=kernel/kmdb group=sys
+dir path=kernel/kmdb/$(ARCH64) group=sys
dir path=kernel/misc group=sys
dir path=kernel/misc/$(ARCH64) group=sys
+dir path=usr/lib
+dir path=usr/lib/devfsadm group=sys
+dir path=usr/lib/devfsadm/linkmod group=sys
+dir path=usr/lib/mdb group=sys
+dir path=usr/lib/mdb/kvm group=sys
+dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
+dir path=usr/share
dir path=usr/share/man
dir path=usr/share/man/man7d
+# Note: The authoritative list of supported PCI IDs supported by
+# the i915 driver is in: i915_drv.c:pciidlist[]
+# This list was generated by: uts/intel/io/i915/Make-PCI-ID-list.awk
driver name=i915 perms="* 0644 root sys" \
+ alias=pci8086,102 \
+ alias=pci8086,106 \
+ alias=pci8086,10a \
+ alias=pci8086,112 \
+ alias=pci8086,116 \
+ alias=pci8086,122 \
+ alias=pci8086,126 \
+ alias=pci8086,152 \
+ alias=pci8086,155 \
+ alias=pci8086,156 \
+ alias=pci8086,157 \
+ alias=pci8086,15a \
+ alias=pci8086,162 \
+ alias=pci8086,166 \
+ alias=pci8086,16a \
alias=pci8086,2562 \
alias=pci8086,2572 \
alias=pci8086,2582 \
+ alias=pci8086,258a \
alias=pci8086,2592 \
alias=pci8086,2772 \
alias=pci8086,27a2 \
@@ -62,23 +91,100 @@ driver name=i915 perms="* 0644 root sys" \
alias=pci8086,2a02 \
alias=pci8086,2a12 \
alias=pci8086,2a42 \
- alias=pci8086,2e02.8086.2e02 \
+ alias=pci8086,2e02 \
alias=pci8086,2e12 \
alias=pci8086,2e22 \
alias=pci8086,2e32 \
alias=pci8086,2e42 \
+ alias=pci8086,2e92 \
+ alias=pci8086,3577 \
+ alias=pci8086,3582 \
+ alias=pci8086,358e \
+ alias=pci8086,402 \
+ alias=pci8086,406 \
+ alias=pci8086,40a \
+ alias=pci8086,40b \
+ alias=pci8086,40e \
+ alias=pci8086,412 \
+ alias=pci8086,416 \
+ alias=pci8086,41a \
+ alias=pci8086,41b \
+ alias=pci8086,41e \
alias=pci8086,42 \
- alias=pci8086,46
-file path=kernel/drv/$(ARCH64)/i915 group=sys
-file path=kernel/drv/$(ARCH64)/radeon group=sys
-file path=kernel/drv/i915 group=sys
-file path=kernel/drv/radeon group=sys
+ alias=pci8086,422 \
+ alias=pci8086,426 \
+ alias=pci8086,42a \
+ alias=pci8086,42b \
+ alias=pci8086,42e \
+ alias=pci8086,46 \
+ alias=pci8086,a001 \
+ alias=pci8086,a011 \
+ alias=pci8086,a02 \
+ alias=pci8086,a06 \
+ alias=pci8086,a0a \
+ alias=pci8086,a0b \
+ alias=pci8086,a0e \
+ alias=pci8086,a12 \
+ alias=pci8086,a16 \
+ alias=pci8086,a1a \
+ alias=pci8086,a1b \
+ alias=pci8086,a1e \
+ alias=pci8086,a22 \
+ alias=pci8086,a26 \
+ alias=pci8086,a2a \
+ alias=pci8086,a2b \
+ alias=pci8086,a2e \
+ alias=pci8086,c02 \
+ alias=pci8086,c06 \
+ alias=pci8086,c0a \
+ alias=pci8086,c0b \
+ alias=pci8086,c0e \
+ alias=pci8086,c12 \
+ alias=pci8086,c16 \
+ alias=pci8086,c1a \
+ alias=pci8086,c1b \
+ alias=pci8086,c1e \
+ alias=pci8086,c22 \
+ alias=pci8086,c26 \
+ alias=pci8086,c2a \
+ alias=pci8086,c2b \
+ alias=pci8086,c2e \
+ alias=pci8086,d02 \
+ alias=pci8086,d06 \
+ alias=pci8086,d0a \
+ alias=pci8086,d0b \
+ alias=pci8086,d0e \
+ alias=pci8086,d12 \
+ alias=pci8086,d16 \
+ alias=pci8086,d1a \
+ alias=pci8086,d1b \
+ alias=pci8086,d1e \
+ alias=pci8086,d22 \
+ alias=pci8086,d26 \
+ alias=pci8086,d2a \
+ alias=pci8086,d2b \
+ alias=pci8086,d2e \
+ alias=pci8086,f30 \
+ alias=pci8086,f31 \
+ alias=pci8086,f32 \
+ alias=pci8086,f33
+file path=kernel/drv/$(ARCH64)/i915 group=sys mode=0755
+#file path=kernel/drv/$(ARCH64)/radeon group=sys mode=0755
+file path=kernel/drv/i915 group=sys mode=0755
+#file path=kernel/drv/radeon group=sys mode=0755
+file path=kernel/kmdb/$(ARCH64)/i915 group=sys mode=0555
+file path=kernel/kmdb/i915 group=sys mode=0555
file path=kernel/misc/$(ARCH64)/drm group=sys mode=0755
file path=kernel/misc/drm group=sys mode=0755
+file path=usr/lib/devfsadm/linkmod/SUNW_drm_link_i386.so group=sys mode=0755
+file path=usr/lib/mdb/kvm/$(ARCH64)/i915.so group=sys mode=0555
+file path=usr/lib/mdb/kvm/i915.so group=sys mode=0555
file path=usr/share/man/man7d/i915.7d
-file path=usr/share/man/man7d/radeon.7d
+#file path=usr/share/man/man7d/radeon.7d
legacy pkg=SUNWdrmr desc="Direct Rendering Manager kernel drivers and modules" \
name="DRM Kernel Drivers, (Root)"
-license cr_Sun license=cr_Sun
-license usr/src/uts/common/io/drm/THIRDPARTYLICENSE \
- license=usr/src/uts/common/io/drm/THIRDPARTYLICENSE
+license usr/src/uts/common/io/drm/LICENSE_DRM \
+ license=usr/src/uts/common/io/drm/LICENSE_DRM
+license usr/src/uts/intel/io/i915/LICENSE_I915 \
+ license=usr/src/uts/intel/io/i915/LICENSE_I915
+depend fmri=pkg:/driver/graphics/agpgart type=require
diff --git a/usr/src/pkg/manifests/driver-graphics-drm.p5m b/usr/src/pkg/manifests/driver-graphics-drm.p5m
deleted file mode 100644
index 5f011bb..0000000
--- a/usr/src/pkg/manifests/driver-graphics-drm.p5m
+++ /dev/null
@@ -1,145 +0,0 @@
-#
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
-#
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-
-#
-# 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/graphics/drm@$(OSPKGVERS)
-set name=pkg.summary value="DRM Kernel Drivers"
-set name=pkg.description \
- value="Direct Rendering Manager kernel drivers and modules. Currently supports Intel(R) integrated graphics devices with hardware acceleration, video memory management, Graphics Execution Manager (GEM), and kernel modesetting (KMS)."
-set name=info.upstream value="Direct Rendering Infrastructure (DRI) project"
-set name=info.upstream-url value=http://dri.freedesktop.org/
-set name=variant.arch value=i386
-file path=kernel/drv/$(ARCH64)/i915 group=sys
-file path=kernel/kmdb/$(ARCH64)/i915 group=sys
-file path=kernel/misc/$(ARCH64)/drm group=sys
-file path=usr/lib/mdb/kvm/$(ARCH64)/i915.so group=sys
-file path=usr/share/man/man4d/i915.4d
-driver name=i915 perms="* 0644 root sys" \
- alias=pci8086,42 \
- alias=pci8086,46 \
- alias=pci8086,102 \
- alias=pci8086,106 \
- alias=pci8086,10a \
- alias=pci8086,112 \
- alias=pci8086,116 \
- alias=pci8086,122 \
- alias=pci8086,126 \
- alias=pci8086,152 \
- alias=pci8086,156 \
- alias=pci8086,15a \
- alias=pci8086,162 \
- alias=pci8086,166 \
- alias=pci8086,16a \
- alias=pci8086,402 \
- alias=pci8086,406 \
- alias=pci8086,40a \
- alias=pci8086,40b \
- alias=pci8086,40e \
- alias=pci8086,412 \
- alias=pci8086,416 \
- alias=pci8086,41a \
- alias=pci8086,41b \
- alias=pci8086,41e \
- alias=pci8086,422 \
- alias=pci8086,426 \
- alias=pci8086,42a \
- alias=pci8086,42b \
- alias=pci8086,42e \
- alias=pci8086,a02 \
- alias=pci8086,a06 \
- alias=pci8086,a0a \
- alias=pci8086,a0b \
- alias=pci8086,a0e \
- alias=pci8086,a12 \
- alias=pci8086,a16 \
- alias=pci8086,a1a \
- alias=pci8086,a1b \
- alias=pci8086,a1e \
- alias=pci8086,a22 \
- alias=pci8086,a26 \
- alias=pci8086,a2a \
- alias=pci8086,a2b \
- alias=pci8086,a2e \
- alias=pci8086,c02 \
- alias=pci8086,c06 \
- alias=pci8086,c0a \
- alias=pci8086,c0b \
- alias=pci8086,c0e \
- alias=pci8086,c12 \
- alias=pci8086,c16 \
- alias=pci8086,c1a \
- alias=pci8086,c1b \
- alias=pci8086,c1e \
- alias=pci8086,c22 \
- alias=pci8086,c26 \
- alias=pci8086,c2a \
- alias=pci8086,c2b \
- alias=pci8086,c2e \
- alias=pci8086,d02 \
- alias=pci8086,d06 \
- alias=pci8086,d0a \
- alias=pci8086,d0b \
- alias=pci8086,d0e \
- alias=pci8086,d12 \
- alias=pci8086,d16 \
- alias=pci8086,d1a \
- alias=pci8086,d1b \
- alias=pci8086,d1e \
- alias=pci8086,d22 \
- alias=pci8086,d26 \
- alias=pci8086,d2a \
- alias=pci8086,d2b \
- alias=pci8086,d2e \
- alias=pci8086,2562 \
- alias=pci8086,2572 \
- alias=pci8086,2582 \
- alias=pci8086,2592 \
- alias=pci8086,2772 \
- alias=pci8086,27a2 \
- alias=pci8086,27ae \
- alias=pci8086,2972 \
- alias=pci8086,2982 \
- alias=pci8086,2992 \
- alias=pci8086,29a2 \
- alias=pci8086,29b2 \
- alias=pci8086,29c2 \
- alias=pci8086,29d2 \
- alias=pci8086,2a02 \
- alias=pci8086,2a12 \
- alias=pci8086,2a42 \
- alias=pci8086,2e02.8086.2e02 \
- alias=pci8086,2e12 \
- alias=pci8086,2e22 \
- alias=pci8086,2e32 \
- alias=pci8086,2e42 \
- alias=pci8086,3582 \
- alias=pci8086,a001 \
- alias=pci8086,a011
-legacy pkg=SUNWdrmr desc="Direct Rendering Manager kernel drivers and modules" \
- name="DRM Kernel Drivers, (Root)"
diff --git a/usr/src/pkg/manifests/system-header-header-drm.mf b/usr/src/pkg/manifests/system-header-header-drm.mf
new file mode 100644
index 0000000..628c3c7
--- /dev/null
+++ b/usr/src/pkg/manifests/system-header-header-drm.mf
@@ -0,0 +1,42 @@
+#
+# 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) 2010, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/system/header/header-drm@$(PKGVERS)
+set name=pkg.description value="DRM Driver Header Files for x86 Workstations"
+set name=pkg.summary value="DRM Driver Header Files"
+set name=info.classification \
+ value=org.opensolaris.category.2008:Development/System
+set name=variant.arch value=i386
+dir path=usr group=sys
+dir path=usr/include
+dir path=usr/include/drm
+file path=usr/include/drm/drm.h
+file path=usr/include/drm/drm_fourcc.h
+file path=usr/include/drm/drm_mode.h
+file path=usr/include/drm/drm_os_solaris.h
+file path=usr/include/drm/drm_sarea.h
+file path=usr/include/drm/i915_drm.h
+license usr/src/uts/common/io/drm/LICENSE_DRM \
+ license=usr/src/uts/common/io/drm/LICENSE_DRM
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-18 17:02:15 +0000