From 9c31cf024c08128fce3fce725716f43a0286b787 Mon Sep 17 00:00:00 2001 From: Gordon Ross Date: Fri, 4 Nov 2016 21:56:07 -0400 Subject: 7623 Move agpmaster to graphics-agpgart, and set noincorp Reviewed by: Alexander Pyhalov Reviewed by: Hans Rosenfeld Reviewed by: Toomas Soome Approved by: Richard Lowe --- usr/src/pkg/manifests/driver-graphics-agpgart.mf | 8 +++++++- usr/src/pkg/manifests/driver-graphics-drm.mf | 2 ++ usr/src/pkg/manifests/system-header-header-agp.mf | 1 + usr/src/pkg/manifests/system-kernel.mf | 2 -- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/usr/src/pkg/manifests/driver-graphics-agpgart.mf b/usr/src/pkg/manifests/driver-graphics-agpgart.mf index 59b2deb4ee..d159eff659 100644 --- a/usr/src/pkg/manifests/driver-graphics-agpgart.mf +++ b/usr/src/pkg/manifests/driver-graphics-agpgart.mf @@ -34,13 +34,15 @@ set name=pkg.description value="AGP GART driver for x86 workstations" set name=pkg.summary value="AGP GART Driver" set name=info.classification \ value=org.opensolaris.category.2008:Drivers/Display +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/misc group=sys +dir path=kernel/misc/$(ARCH64) group=sys dir path=usr/share/man dir path=usr/share/man/man7i -driver name=$(ARCH64)_gart alias=pci1022,1103 perms="* 0644 root sys" driver name=agpgart perms="* 0644 root sys" driver name=agptarget perms="* 0644 root sys" \ alias=pci1022,7454 \ @@ -76,6 +78,8 @@ driver name=agptarget perms="* 0644 root sys" \ alias=pci8086,7120 \ alias=pci8086,7122 \ alias=pci8086,7124 +# Note: the name of this driver _really_is_ amd64_gart... +driver name=amd64_gart alias=pci1022,1103 perms="* 0644 root sys" file path=kernel/drv/$(ARCH64)/$(ARCH64)_gart group=sys file path=kernel/drv/$(ARCH64)/agpgart group=sys file path=kernel/drv/$(ARCH64)/agptarget group=sys @@ -83,6 +87,8 @@ file path=kernel/drv/$(ARCH64)_gart group=sys file path=kernel/drv/agpgart group=sys file path=kernel/drv/agpgart.conf group=sys file path=kernel/drv/agptarget group=sys +file path=kernel/misc/$(ARCH64)/agpmaster group=sys mode=0755 +file path=kernel/misc/agpmaster group=sys mode=0755 file path=usr/share/man/man7i/agpgart_io.7i legacy pkg=SUNWagp desc="AGP GART driver for x86 workstations" \ name="AGP GART Driver" diff --git a/usr/src/pkg/manifests/driver-graphics-drm.mf b/usr/src/pkg/manifests/driver-graphics-drm.mf index 80ffff7208..9291f9c989 100644 --- a/usr/src/pkg/manifests/driver-graphics-drm.mf +++ b/usr/src/pkg/manifests/driver-graphics-drm.mf @@ -35,6 +35,7 @@ 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=org.opensolaris.noincorp value=true set name=variant.arch value=i386 dir path=kernel group=sys dir path=kernel/drv group=sys @@ -85,3 +86,4 @@ legacy pkg=SUNWdrmr desc="Direct Rendering Manager kernel drivers and modules" \ license cr_Sun license=cr_Sun license usr/src/uts/common/io/drm/THIRDPARTYLICENSE \ license=usr/src/uts/common/io/drm/THIRDPARTYLICENSE +depend fmri=pkg:/driver/graphics/agpgart type=require diff --git a/usr/src/pkg/manifests/system-header-header-agp.mf b/usr/src/pkg/manifests/system-header-header-agp.mf index bfc6bbd86a..b270266ccf 100644 --- a/usr/src/pkg/manifests/system-header-header-agp.mf +++ b/usr/src/pkg/manifests/system-header-header-agp.mf @@ -28,6 +28,7 @@ set name=pkg.description value="AGP GART Header Files for x86 Workstations" set name=pkg.summary value="AGP GART Driver Header Files" set name=info.classification \ value=org.opensolaris.category.2008:Development/System +set name=org.opensolaris.noincorp value=true set name=variant.arch value=i386 dir path=usr group=sys dir path=usr/include diff --git a/usr/src/pkg/manifests/system-kernel.mf b/usr/src/pkg/manifests/system-kernel.mf index 9a2c454757..df7912ebf3 100644 --- a/usr/src/pkg/manifests/system-kernel.mf +++ b/usr/src/pkg/manifests/system-kernel.mf @@ -652,7 +652,6 @@ $(i386_ONLY)file path=kernel/mac/mac_ipv4 group=sys mode=0755 $(i386_ONLY)file path=kernel/mac/mac_ipv6 group=sys mode=0755 $(i386_ONLY)file path=kernel/mac/mac_wifi group=sys mode=0755 $(i386_ONLY)file path=kernel/misc/$(ARCH64)/acpica group=sys mode=0755 -$(i386_ONLY)file path=kernel/misc/$(ARCH64)/agpmaster group=sys mode=0755 file path=kernel/misc/$(ARCH64)/bignum group=sys mode=0755 $(i386_ONLY)file path=kernel/misc/$(ARCH64)/bootdev group=sys mode=0755 file path=kernel/misc/$(ARCH64)/busra group=sys mode=0755 @@ -690,7 +689,6 @@ $(sparc_ONLY)file path=kernel/misc/$(ARCH64)/swapgeneric group=sys mode=0755 file path=kernel/misc/$(ARCH64)/tem group=sys mode=0755 file path=kernel/misc/$(ARCH64)/tlimod group=sys mode=0755 $(i386_ONLY)file path=kernel/misc/acpica group=sys mode=0755 -$(i386_ONLY)file path=kernel/misc/agpmaster group=sys mode=0755 $(i386_ONLY)file path=kernel/misc/bignum group=sys mode=0755 $(i386_ONLY)file path=kernel/misc/bootdev group=sys mode=0755 $(i386_ONLY)file path=kernel/misc/busra group=sys mode=0755 -- cgit v1.2.3