summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr/src/pkg/manifests/service-picl.mf23
-rw-r--r--usr/src/pkg/manifests/system-kernel-platform.mf42
-rw-r--r--usr/src/pkg/manifests/system-storage-luxadm.mf2
3 files changed, 42 insertions, 25 deletions
diff --git a/usr/src/pkg/manifests/service-picl.mf b/usr/src/pkg/manifests/service-picl.mf
index 3600b02c78..72268296f0 100644
--- a/usr/src/pkg/manifests/service-picl.mf
+++ b/usr/src/pkg/manifests/service-picl.mf
@@ -221,7 +221,8 @@ $(sparc_ONLY)file \
path=usr/platform/SUNW,Sun-Blade-2500/lib/picl/plugins/piclfrutree.conf \
group=sys
$(sparc_ONLY)file \
- path=usr/platform/SUNW,Sun-Fire-280R/lib/libpsvcpolicy_psr.so.1 group=sys
+ path=usr/platform/SUNW,Sun-Fire-280R/lib/libpsvcpolicy_psr.so.1 group=sys \
+ pkg.depend.runpath=$PKGDEPEND_RUNPATH:usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins
$(sparc_ONLY)file \
path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/libpiclfrutree.so.1 \
group=sys
@@ -230,7 +231,8 @@ $(sparc_ONLY)file \
group=sys
$(sparc_ONLY)file \
path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/libpsvcplugin_psr.so.1 \
- group=sys
+ group=sys \
+ pkg.depend.runpath=$PKGDEPEND_RUNPATH:usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins
$(sparc_ONLY)file \
path=usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins/picldevtree.conf \
group=sys mode=0444
@@ -242,13 +244,15 @@ $(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-280R/lib/platsvcd.conf \
$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-280R/lib/psvcobj.conf \
group=sys mode=0444
$(sparc_ONLY)file \
- path=usr/platform/SUNW,Sun-Fire-480R/lib/libpsvcpolicy_psr.so.1 group=sys
+ path=usr/platform/SUNW,Sun-Fire-480R/lib/libpsvcpolicy_psr.so.1 group=sys \
+ pkg.depend.runpath=$PKGDEPEND_RUNPATH:usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins:usr/platform/sun4u/lib
$(sparc_ONLY)file \
path=usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/libpiclfrutree.so.1 \
group=sys
$(sparc_ONLY)file \
path=usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/libpsvcplugin_psr.so.1 \
- group=sys
+ group=sys \
+ pkg.depend.runpath=$PKGDEPEND_RUNPATH:usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins
$(sparc_ONLY)file \
path=usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins/picldevtree.conf \
group=sys mode=0444
@@ -260,13 +264,15 @@ $(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-480R/lib/platsvcd.conf \
$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-480R/lib/psvcobj.conf \
group=sys mode=0444
$(sparc_ONLY)file \
- path=usr/platform/SUNW,Sun-Fire-880/lib/libpsvcpolicy_psr.so.1 group=sys
+ path=usr/platform/SUNW,Sun-Fire-880/lib/libpsvcpolicy_psr.so.1 group=sys \
+ pkg.depend.runpath=$PKGDEPEND_RUNPATH:usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins:usr/platform/sun4u/lib
$(sparc_ONLY)file \
path=usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/libpiclfrutree.so.1 \
group=sys
$(sparc_ONLY)file \
path=usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/libpsvcplugin_psr.so.1 \
- group=sys
+ group=sys \
+ pkg.depend.runpath=$PKGDEPEND_RUNPATH:usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins
$(sparc_ONLY)file \
path=usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins/picldevtree.conf \
group=sys mode=0444
@@ -592,7 +598,8 @@ $(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-V890/lib/platsvcd.conf \
$(sparc_ONLY)file path=usr/platform/SUNW,Sun-Fire-V890/lib/psvcobj.conf \
group=sys mode=0444
$(sparc_ONLY)file path=usr/platform/sun4u/lib/libpsvcobj.so.1 group=sys
-$(sparc_ONLY)file path=usr/platform/sun4u/lib/libpsvcpolicy.so.1 group=sys
+$(sparc_ONLY)file path=usr/platform/sun4u/lib/libpsvcpolicy.so.1 group=sys \
+ pkg.depend.runpath=$PKGDEPEND_RUNPATH:usr/platform/SUNW,Sun-Fire-V490/lib/picl/plugins:usr/platform/SUNW,Sun-Fire-280R/lib/picl/plugins:usr/platform/SUNW,Sun-Fire-V890/lib/picl/plugins:usr/platform/SUNW,Sun-Fire-880/lib/picl/plugins:usr/platform/SUNW,Sun-Fire-480R/lib/picl/plugins
$(sparc_ONLY)file path=usr/platform/sun4u/lib/picl/plugins/libpiclenvmon.so.1 \
group=sys
$(sparc_ONLY)file path=usr/platform/sun4v/lib/libpiclsnmp.so.1 group=sys
@@ -601,7 +608,7 @@ $(sparc_ONLY)file path=usr/platform/sun4v/lib/picl/plugins/libmdescplugin.so.1 \
$(sparc_ONLY)file path=usr/platform/sun4v/lib/picl/plugins/libpiclsbl.so.1 \
group=sys
$(sparc_ONLY)file path=usr/platform/sun4v/lib/picl/plugins/libpriplugin.so.1 \
- group=sys
+ group=sys variant.opensolaris.zone=global
$(sparc_ONLY)file path=usr/platform/sun4v/lib/picl/plugins/libsnmpplugin.so.1 \
group=sys
file path=usr/sbin/prtpicl mode=0755
diff --git a/usr/src/pkg/manifests/system-kernel-platform.mf b/usr/src/pkg/manifests/system-kernel-platform.mf
index 29538ccd9b..5cec8a4125 100644
--- a/usr/src/pkg/manifests/system-kernel-platform.mf
+++ b/usr/src/pkg/manifests/system-kernel-platform.mf
@@ -528,7 +528,8 @@ $(sparc_ONLY)file path=platform/SUNW,Netra-T4/kernel/drv/$(ARCH64)/lombus \
group=sys
$(sparc_ONLY)file path=platform/SUNW,Netra-T4/kernel/drv/lombus.conf group=sys
$(sparc_ONLY)file path=platform/SUNW,SPARC-Enterprise/kernel/$(ARCH64)/unix \
- group=sys mode=0755
+ group=sys mode=0755 pkg.depend.bypass-generate=\$CPU \
+ pkg.depend.bypass-generate=dtracestubs pkg.depend.bypass-generate=genunix
$(sparc_ONLY)file \
path=platform/SUNW,SPARC-Enterprise/kernel/cpu/$(ARCH64)/FJSV,SPARC64-VI \
group=sys mode=0755
@@ -537,7 +538,8 @@ $(sparc_ONLY)file path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/dr \
$(sparc_ONLY)file \
path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/mc-opl group=sys
$(sparc_ONLY)file \
- path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/oplmsu group=sys
+ path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/oplmsu group=sys \
+ pkg.depend.bypass-generate=su
$(sparc_ONLY)file \
path=platform/SUNW,SPARC-Enterprise/kernel/drv/$(ARCH64)/oplpanel \
group=sys
@@ -557,7 +559,7 @@ $(sparc_ONLY)file path=platform/SUNW,SPARC-Enterprise/kernel/drv/scfd.conf \
group=sys
$(sparc_ONLY)file \
path=platform/SUNW,SPARC-Enterprise/kernel/misc/$(ARCH64)/drmach \
- group=sys mode=0755
+ group=sys mode=0755 pkg.depend.bypass-generate=opl_cfg
$(sparc_ONLY)file \
path=platform/SUNW,SPARC-Enterprise/kernel/misc/$(ARCH64)/platmod \
group=sys mode=0755
@@ -571,7 +573,8 @@ $(sparc_ONLY)file \
path=platform/SUNW,Sun-Blade-100/kernel/misc/$(ARCH64)/platmod group=sys \
mode=0755
$(sparc_ONLY)file \
- path=platform/SUNW,Sun-Blade-1000/kernel/drv/$(ARCH64)/xcalppm group=sys
+ path=platform/SUNW,Sun-Blade-1000/kernel/drv/$(ARCH64)/xcalppm group=sys \
+ pkg.depend.bypass-generate=schppm
$(sparc_ONLY)file \
path=platform/SUNW,Sun-Blade-1000/kernel/drv/$(ARCH64)/xcalwd group=sys
$(sparc_ONLY)file path=platform/SUNW,Sun-Blade-1000/kernel/drv/xcalppm.conf \
@@ -592,7 +595,8 @@ $(sparc_ONLY)file \
path=platform/SUNW,Sun-Blade-2500/kernel/misc/$(ARCH64)/platmod group=sys \
mode=0755
$(sparc_ONLY)file \
- path=platform/SUNW,Sun-Fire-280R/kernel/drv/$(ARCH64)/pcf8574 group=sys
+ path=platform/SUNW,Sun-Fire-280R/kernel/drv/$(ARCH64)/pcf8574 group=sys \
+ pkg.depend.bypass-generate=i2c_svc
$(sparc_ONLY)file \
path=platform/SUNW,Sun-Fire-280R/kernel/misc/$(ARCH64)/platmod group=sys \
mode=0755
@@ -600,14 +604,15 @@ $(sparc_ONLY)file \
path=platform/SUNW,Sun-Fire-480R/kernel/misc/$(ARCH64)/platmod group=sys \
mode=0755
$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-880/kernel/drv/$(ARCH64)/hpc3130 \
- group=sys
+ group=sys pkg.depend.bypass-generate=i2c_svc
$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-880/kernel/drv/hpc3130.conf \
group=sys
$(sparc_ONLY)file \
path=platform/SUNW,Sun-Fire-880/kernel/misc/$(ARCH64)/platmod group=sys \
mode=0755
$(sparc_ONLY)file \
- path=platform/SUNW,Sun-Fire-T200/kernel/drv/$(ARCH64)/tsalarm group=sys
+ path=platform/SUNW,Sun-Fire-T200/kernel/drv/$(ARCH64)/tsalarm group=sys \
+ pkg.depend.bypass-generate=rmclomv
$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-T200/kernel/drv/tsalarm.conf \
group=sys
$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V215/kernel/drv/su.conf \
@@ -616,9 +621,11 @@ $(sparc_ONLY)file \
path=platform/SUNW,Sun-Fire-V215/kernel/misc/$(ARCH64)/platmod group=sys \
mode=0755
$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V240/kernel/drv/$(ARCH64)/ntwdt \
- group=sys
+ group=sys pkg.depend.bypass-generate=pmugpio \
+ pkg.depend.bypass-generate=rmc_comm pkg.depend.bypass-generate=rmclomv
$(sparc_ONLY)file \
- path=platform/SUNW,Sun-Fire-V240/kernel/drv/$(ARCH64)/tsalarm group=sys
+ path=platform/SUNW,Sun-Fire-V240/kernel/drv/$(ARCH64)/tsalarm group=sys \
+ pkg.depend.bypass-generate=rmclomv
$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V240/kernel/drv/ntwdt.conf \
group=sys
$(sparc_ONLY)file path=platform/SUNW,Sun-Fire-V240/kernel/drv/tsalarm.conf \
@@ -636,7 +643,8 @@ $(sparc_ONLY)file \
path=platform/SUNW,Sun-Fire-V445/kernel/misc/$(ARCH64)/platmod group=sys \
mode=0755
$(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/$(ARCH64)/unix group=sys \
- mode=0755
+ mode=0755 pkg.depend.bypass-generate=\$CPU \
+ pkg.depend.bypass-generate=dtracestubs pkg.depend.bypass-generate=genunix
$(sparc_ONLY)file \
path=platform/SUNW,Sun-Fire/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-III \
group=sys mode=0755
@@ -657,11 +665,11 @@ $(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/misc/$(ARCH64)/platmod \
$(sparc_ONLY)file path=platform/SUNW,Sun-Fire/kernel/misc/$(ARCH64)/sbdp \
group=sys mode=0755
$(sparc_ONLY)file path=platform/SUNW,Ultra-250/kernel/drv/$(ARCH64)/envctrltwo \
- group=sys
+ group=sys pkg.depend.bypass-generate=pcipsy
$(sparc_ONLY)file path=platform/SUNW,Ultra-250/kernel/misc/$(ARCH64)/platmod \
group=sys mode=0755
$(sparc_ONLY)file path=platform/SUNW,Ultra-4/kernel/drv/$(ARCH64)/envctrl \
- group=sys
+ group=sys pkg.depend.bypass-generate=pcipsy
$(sparc_ONLY)file path=platform/SUNW,Ultra-4/kernel/misc/$(ARCH64)/platmod \
group=sys mode=0755
$(sparc_ONLY)file path=platform/SUNW,Ultra-5_10/kernel/misc/$(ARCH64)/platmod \
@@ -784,7 +792,8 @@ $(sparc_ONLY)file path=platform/sun4u/bootlst group=sys reboot-needed=true
$(sparc_ONLY)file path=platform/sun4u/kernel/$(ARCH64)/genunix group=sys \
mode=0755
$(sparc_ONLY)file path=platform/sun4u/kernel/$(ARCH64)/unix group=sys \
- mode=0755
+ mode=0755 pkg.depend.bypass-generate=\$CPU \
+ pkg.depend.bypass-generate=dtracestubs
$(sparc_ONLY)file path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-II \
group=sys mode=0755
$(sparc_ONLY)file path=platform/sun4u/kernel/cpu/$(ARCH64)/SUNW,UltraSPARC-III \
@@ -889,7 +898,7 @@ $(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/pcie group=sys \
$(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/platmod group=sys \
mode=0755
$(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/sbd group=sys \
- mode=0755
+ mode=0755 pkg.depend.bypass-generate=sbdp
$(sparc_ONLY)file path=platform/sun4u/kernel/misc/$(ARCH64)/vis group=sys \
mode=0755
$(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todbq4802 group=sys \
@@ -909,12 +918,13 @@ $(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todmostek group=sys \
$(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todopl group=sys \
mode=0755
$(sparc_ONLY)file path=platform/sun4u/kernel/tod/$(ARCH64)/todsg group=sys \
- mode=0755
+ mode=0755 pkg.depend.bypass-generate=sgsbbc
$(sparc_ONLY)file path=platform/sun4v/bootlst group=sys reboot-needed=true
$(sparc_ONLY)file path=platform/sun4v/kernel/$(ARCH64)/genunix group=sys \
mode=0755
$(sparc_ONLY)file path=platform/sun4v/kernel/$(ARCH64)/unix group=sys \
- mode=0755
+ mode=0755 pkg.depend.bypass-generate=\$CPU \
+ pkg.depend.bypass-generate=dtracestubs
$(sparc_ONLY)file path=platform/sun4v/kernel/cpu/$(ARCH64)/generic group=sys \
mode=0755
$(sparc_ONLY)file path=platform/sun4v/kernel/crypto/$(ARCH64)/arcfour \
diff --git a/usr/src/pkg/manifests/system-storage-luxadm.mf b/usr/src/pkg/manifests/system-storage-luxadm.mf
index 3e7c81439f..bfd2e18ca9 100644
--- a/usr/src/pkg/manifests/system-storage-luxadm.mf
+++ b/usr/src/pkg/manifests/system-storage-luxadm.mf
@@ -40,7 +40,7 @@ dir path=usr/sbin
dir path=usr/share/man/man1m
$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/a5k_g_fc_i18n_cat
$(sparc_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/ibfirmware
-file path=usr/sbin/luxadm mode=0555
+file path=usr/sbin/luxadm mode=0555 variant.opensolaris.zone=global
file path=usr/share/man/man1m/luxadm.1m
legacy pkg=SUNWluxop \
desc="Sun Enterprise Network Array firmware and utilities" \