diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-08-16 11:15:20 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-08-16 11:15:20 +0000 |
| commit | 0833839f60181af6fcf14de327d3ba2b30da8ed2 (patch) | |
| tree | af7f3254e70fb8ad910d460648f9af42c0210457 /usr/src/pkg/manifests/service-picl.mf | |
| parent | adf665b5e735d87cf7d6b4e8932fb7dce88e42ad (diff) | |
| parent | d3b5f56344d8bfcdd6cfb82446af0e5e55ad9ebe (diff) | |
| download | illumos-joyent-0833839f60181af6fcf14de327d3ba2b30da8ed2.tar.gz | |
[illumos-gate merge]
commit d3b5f56344d8bfcdd6cfb82446af0e5e55ad9ebe
11528 Makefile.noget can get gone
11529 Use -Wno-maybe-initialized
commit c4ccc1f9004b70b07e4cdb57641c38ab607306c9
11226 Remove NetraCT support
commit dcfeff93f67a1188722a358e0fbfcd604993e573
11561 loader script needs to place .eh_frame after .text
commit a8ffe4975d219124d53dcd9de30126f3a595d28f
11555 gptzfsboot: boot prompt is not refreshed on device change
commit 79940ff6ac581ff9431c474dcfa18c78f1cb7a50
11556 ip_attr.c functions need to not dereference conn_ixa directly after lock drop
commit fe949611d4f0a0f42a6923a31cd3073e5b2bc97c
10540 wsdiff much slower under python3 than python2
commit c1064fd7ce62fe763a4475e9988ffea3b22137de
11541 allocation_classes feature must be enabled to add log device
Conflicts:
usr/src/uts/sparc/Makefile.sparc
usr/src/uts/intel/dev/Makefile
usr/src/uts/i86pc/pcie/Makefile
usr/src/cmd/zoneadmd/Makefile
Diffstat (limited to 'usr/src/pkg/manifests/service-picl.mf')
| -rw-r--r-- | usr/src/pkg/manifests/service-picl.mf | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/usr/src/pkg/manifests/service-picl.mf b/usr/src/pkg/manifests/service-picl.mf index 7c15402da5..65e45e1d4a 100644 --- a/usr/src/pkg/manifests/service-picl.mf +++ b/usr/src/pkg/manifests/service-picl.mf @@ -23,6 +23,7 @@ # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2012 Nexenta Systems, Inc. All rights reserved. # Copyright 2019 OmniOS Community Edition (OmniOSce) Association. +# Copyright 2019 Peter Tribble. # set name=pkg.fmri value=pkg:/service/picl@$(PKGVERS) @@ -46,11 +47,6 @@ $(sparc_ONLY)dir path=usr/platform/SUNW,A70 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,A70/lib $(sparc_ONLY)dir path=usr/platform/SUNW,A70/lib/picl group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,A70/lib/picl/plugins group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300 group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300/lib -$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300/lib/picl group=sys -$(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins \ - group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010 group=sys $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib $(sparc_ONLY)dir path=usr/platform/SUNW,Netra-CP3010/lib/picl group=sys @@ -171,27 +167,6 @@ $(sparc_ONLY)file path=usr/platform/SUNW,A70/lib/picl/plugins/libpiclenvd.so.1 \ group=sys $(sparc_ONLY)file path=usr/platform/SUNW,A70/lib/picl/plugins/piclfrutree.conf \ group=sys -$(sparc_ONLY)file path=usr/platform/SUNW,Netra-CP2300/lib/libctsmc.so.1 \ - group=sys -$(sparc_ONLY)file path=usr/platform/SUNW,Netra-CP2300/lib/libprtdiag_psr.so.1 -$(sparc_ONLY)file \ - path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/SUNW,Netra-CP2300.RTM.conf \ - group=sys -$(sparc_ONLY)file \ - path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/SUNW,Netra-CP2300.conf \ - group=sys -$(sparc_ONLY)file \ - path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/envmond.conf \ - group=sys -$(sparc_ONLY)file \ - path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/libpiclenvmond.so.1 \ - group=sys -$(sparc_ONLY)file \ - path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/libpiclfrutree.so.1 \ - group=sys -$(sparc_ONLY)file \ - path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/libpiclwd.so.1 \ - group=sys $(sparc_ONLY)file \ path=usr/platform/SUNW,Netra-CP3010/lib/picl/plugins/piclfrutree.conf \ group=sys @@ -713,17 +688,6 @@ $(sparc_ONLY)link path=usr/platform/SUNW,A70/lib/libprtdiag_psr.so.1 \ target=../../SUNW,Sun-Blade-100/lib/libprtdiag_psr.so.1 $(sparc_ONLY)link path=usr/platform/SUNW,A70/lib/picl/plugins/libpiclenvd.so \ target=./libpiclenvd.so.1 -$(sparc_ONLY)link path=usr/platform/SUNW,Netra-CP2300/lib/libctsmc.so \ - target=libctsmc.so.1 -$(sparc_ONLY)link \ - path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/libpiclenvmond.so \ - target=libpiclenvmond.so.1 -$(sparc_ONLY)link \ - path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/libpiclfrutree.so \ - target=libpiclfrutree.so.1 -$(sparc_ONLY)link \ - path=usr/platform/SUNW,Netra-CP2300/lib/picl/plugins/libpiclwd.so \ - target=libpiclwd.so.1 $(sparc_ONLY)link \ path=usr/platform/SUNW,Netra-T12/lib/picl/plugins/libpiclfrutree.so \ target=libpiclfrutree.so.1 |