summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Mustacchi <rm@joyent.com>2016-05-03 12:04:17 -0700
committerRobert Mustacchi <rm@joyent.com>2016-05-20 19:01:51 -0700
commit591fabec62bd160b1db9b1f20972c9bca1d8a0b6 (patch)
treecfc06c1e0468bb3cef6216e192225719f113c3b9
parent64d07b7cd791cb277b72edd9f8c4373ca6477850 (diff)
downloadillumos-joyent-591fabec62bd160b1db9b1f20972c9bca1d8a0b6.tar.gz
6977 ixgb package should not refer to ixgbe's license
6976 ixgb package should not ship ixgbe's manual page Reviewed by: Dan McDonald <danmcd@omniti.com> Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Dale Ghent <daleg@elemental.org>
-rw-r--r--usr/src/pkg/manifests/driver-network-ixgb.mf5
-rw-r--r--usr/src/pkg/manifests/driver-network-ixgbe.mf3
2 files changed, 3 insertions, 5 deletions
diff --git a/usr/src/pkg/manifests/driver-network-ixgb.mf b/usr/src/pkg/manifests/driver-network-ixgb.mf
index f491b22876..5db8ec7249 100644
--- a/usr/src/pkg/manifests/driver-network-ixgb.mf
+++ b/usr/src/pkg/manifests/driver-network-ixgb.mf
@@ -38,8 +38,6 @@ set name=variant.arch value=$(ARCH)
dir path=kernel group=sys
dir path=kernel/drv group=sys
dir path=kernel/drv/$(ARCH64) group=sys
-dir path=usr/share/man
-dir path=usr/share/man/man7d
driver name=ixgb perms="* 0666 root root" \
alias=pci8086,1048 \
alias=pci8086,109e \
@@ -47,12 +45,9 @@ driver name=ixgb perms="* 0666 root root" \
alias=pci8086,a11f
file path=kernel/drv/$(ARCH64)/ixgb group=sys
$(i386_ONLY)file path=kernel/drv/ixgb group=sys
-file path=usr/share/man/man7d/ixgbe.7d
legacy pkg=SUNWixgb desc="Intel(R) PRO/10G Server Adapter Driver" \
name="Intel(R) PRO/10G Server Adapter Driver"
license cr_Sun license=cr_Sun
license lic_CDDL license=lic_CDDL
license lic_OSBL license=lic_OSBL
license lic_OSBL_preamble license=lic_OSBL_preamble
-license usr/src/uts/common/io/ixgbe/THIRDPARTYLICENSE \
- license=usr/src/uts/common/io/ixgbe/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/driver-network-ixgbe.mf b/usr/src/pkg/manifests/driver-network-ixgbe.mf
index 3d99b2f0da..01db9dbff8 100644
--- a/usr/src/pkg/manifests/driver-network-ixgbe.mf
+++ b/usr/src/pkg/manifests/driver-network-ixgbe.mf
@@ -40,6 +40,8 @@ set name=variant.arch value=$(ARCH)
dir path=kernel group=sys
dir path=kernel/drv group=sys
dir path=kernel/drv/$(ARCH64) group=sys
+dir path=usr/share/man
+dir path=usr/share/man/man7d
driver name=ixgbe clone_perms="ixgbe 0666 root sys" perms="* 0666 root sys" \
alias=pciex8086,10b6 \
alias=pciex8086,10c6 \
@@ -69,6 +71,7 @@ file path=kernel/drv/$(ARCH64)/ixgbe group=sys
$(i386_ONLY)file path=kernel/drv/ixgbe group=sys
file path=kernel/drv/ixgbe.conf group=sys \
original_name=SUNWixgbe:kernel/drv/ixgbe.conf preserve=renamenew
+file path=usr/share/man/man7d/ixgbe.7d
legacy pkg=SUNWixgbe desc="Intel 10GbE PCIE NIC Driver" \
name="Intel 10GbE PCIE NIC Driver"
license cr_Sun license=cr_Sun