diff options
| author | Dan McDonald <danmcd@joyent.com> | 2022-02-18 14:26:58 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2022-02-18 14:26:58 -0500 |
| commit | 6c5a782db588047b641eaac2971cdd95add02bdf (patch) | |
| tree | 483a44da347ac8ec1f256591389ad5cb09556dee /usr/src/pkg | |
| parent | c14dafef3b7615cc4991d02e1a9cdf506fdbc735 (diff) | |
| parent | 59b827862fcc03b4da50df402eeb6288a75ac015 (diff) | |
| download | illumos-joyent-6c5a782db588047b641eaac2971cdd95add02bdf.tar.gz | |
[illumos-gate merge]
commit c2cd3a449cfa117e3a164f66931fa6c26c762945
14022 zpool online -e breaks access to pool
commit 957246c9e6c47389c40079995d73eebcc659fb29
14456 bhyve needs fpu import/export
commit 4dde95dacc64b35aa9882fcbd0a847355d130734
14501 pcieadm could decode rcld
commit b302a2007db5ab3847583f9a046d41c11789c092
14512 iwn: suspicious concatenation of string literals
commit 6f0e4dc91b854250fff5c24de2d27aed3375ac69
14469 nvme could raise dynamic lun expansion sysevents
commit cd0d4b4073e62fa22997078b1595f399434a1047
14450 Want PCI platform resource discovery module
commit 55855f50d61b53851853bf1fdcdb04d4b63a1734
14488 lex: clean up warnings
Conflicts:
manifest
Diffstat (limited to 'usr/src/pkg')
| -rw-r--r-- | usr/src/pkg/manifests/system-bhyve-tests.p5m | 1 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/system-kernel-platform.p5m | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/usr/src/pkg/manifests/system-bhyve-tests.p5m b/usr/src/pkg/manifests/system-bhyve-tests.p5m index 5b4a7351c4..823ed69a60 100644 --- a/usr/src/pkg/manifests/system-bhyve-tests.p5m +++ b/usr/src/pkg/manifests/system-bhyve-tests.p5m @@ -38,6 +38,7 @@ file path=opt/bhyve-tests/tests/mevent/read_requeue mode=0555 file path=opt/bhyve-tests/tests/mevent/vnode_file mode=0555 file path=opt/bhyve-tests/tests/mevent/vnode_zvol mode=0555 dir path=opt/bhyve-tests/tests/vmm +file path=opt/bhyve-tests/tests/vmm/fpu_getset mode=0555 file path=opt/bhyve-tests/tests/vmm/mem_partial mode=0555 file path=opt/bhyve-tests/tests/vmm/mem_seg_map mode=0555 license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-kernel-platform.p5m b/usr/src/pkg/manifests/system-kernel-platform.p5m index a7318e04e4..094eb360db 100644 --- a/usr/src/pkg/manifests/system-kernel-platform.p5m +++ b/usr/src/pkg/manifests/system-kernel-platform.p5m @@ -559,6 +559,8 @@ $(i386_ONLY)file path=platform/i86pc/kernel/misc/$(ARCH64)/acpidev group=sys \ mode=0755 $(i386_ONLY)file path=platform/i86pc/kernel/misc/$(ARCH64)/gfx_private \ group=sys mode=0755 +$(i386_ONLY)file path=platform/i86pc/kernel/misc/$(ARCH64)/pci_prd group=sys \ + mode=0755 $(i386_ONLY)dir path=platform/i86pc/ucode group=sys $(i386_ONLY)dir path=platform/i86xpv group=sys $(i386_ONLY)dir path=platform/i86xpv/kernel group=sys |