summaryrefslogtreecommitdiff
path: root/usr/src/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/pkg')
-rw-r--r--usr/src/pkg/manifests/system-microcode-intel.mf4
-rw-r--r--usr/src/pkg/manifests/system-test-nettest.mf16
2 files changed, 12 insertions, 8 deletions
diff --git a/usr/src/pkg/manifests/system-microcode-intel.mf b/usr/src/pkg/manifests/system-microcode-intel.mf
index cafafa2448..bac6419d24 100644
--- a/usr/src/pkg/manifests/system-microcode-intel.mf
+++ b/usr/src/pkg/manifests/system-microcode-intel.mf
@@ -25,7 +25,7 @@
# Copyright 2014 Gary Mills
# Copyright 2019 Peter Tribble.
# Copyright 2019 Joyent, Inc.
-# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
#
#
@@ -35,7 +35,7 @@
#
<include global_zone_only_component>
set name=pkg.fmri \
- value=pkg:/system/microcode/intel@20191115,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
+ value=pkg:/system/microcode/intel@20200508,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH)
set name=pkg.description value="Microcode for Intel CPUs"
set name=org.opensolaris.incorp-facet value=true
set name=variant.arch value=i386
diff --git a/usr/src/pkg/manifests/system-test-nettest.mf b/usr/src/pkg/manifests/system-test-nettest.mf
index acc4cab0c6..0d938e4fd3 100644
--- a/usr/src/pkg/manifests/system-test-nettest.mf
+++ b/usr/src/pkg/manifests/system-test-nettest.mf
@@ -11,11 +11,12 @@
#
# Copyright 2019 Joyent, Inc.
+# Copyright 2020 Oxide Computer Company
#
set name=pkg.fmri value=pkg:/system/test/nettest@$(PKGVERS)
-set name=pkg.description value="net-tests"
-set name=pkg.summary value="net-tests execution"
+set name=pkg.description value="Miscellaneous Network Unit Tests"
+set name=pkg.summary value="Network Unit Test Suite"
set name=info.classification \
value=org.opensolaris.category.2008:Development/System
set name=variant.arch value=$(ARCH)
@@ -26,8 +27,10 @@ dir path=opt/net-tests/runfiles
dir path=opt/net-tests/tests
dir path=opt/net-tests/tests/forwarding
file path=opt/net-tests/bin/nettest mode=0555
-file path=opt/net-tests/config/ip_forwarding.config
-file path=opt/net-tests/runfiles/default.run
+file path=opt/net-tests/config/ip_forwarding.config mode=0644 \
+ preserve=renamenew
+file path=opt/net-tests/runfiles/default.run mode=0444
+file path=opt/net-tests/tests/forwarding/README mode=0444
file path=opt/net-tests/tests/forwarding/ip_forwarding mode=0555
file path=opt/net-tests/tests/forwarding/ip_fwd_001 mode=0555
file path=opt/net-tests/tests/forwarding/ip_fwd_002 mode=0555
@@ -50,5 +53,6 @@ file path=opt/net-tests/tests/forwarding/ip_fwd_018 mode=0555
file path=opt/net-tests/tests/forwarding/ip_fwd_019 mode=0555
file path=opt/net-tests/tests/forwarding/ip_fwd_020 mode=0555
file path=opt/net-tests/tests/forwarding/ip_fwd_suite mode=0555
-file path=opt/net-tests/tests/forwarding/README
-file path=opt/net-tests/tests/net_common
+file path=opt/net-tests/tests/net_common mode=0555
+license lic_CDDL license=lic_CDDL
+depend fmri=system/test/testrunner type=require