illumos-omnios parent dependencies

parent-deps.diff

From 98228b1d6f9ef21a63cb81fc15d285b6797ac892 Mon Sep 17 00:00:00 2001
From: Richard Lowe <richlowe@richlowe.net>
Date: Thu, 18 Dec 2014 14:32:23 -0500
Subject: [PATCH] pkg: Add parent dependencies to (some) packages which need
 them

---
 usr/src/pkg/manifests/SUNWcs.mf                  | 6 ++++++
 usr/src/pkg/manifests/developer-dtrace.mf        | 4 ++++
 usr/src/pkg/manifests/diagnostic-cpu-counters.mf | 4 ++++
 usr/src/pkg/manifests/install-beadm.mf           | 4 ++++
 usr/src/pkg/manifests/network-ipfilter.mf        | 4 ++++
 usr/src/pkg/manifests/service-picl.mf            | 4 ++++
 usr/src/pkg/manifests/system-file-system-nfs.mf  | 4 ++++
 usr/src/pkg/manifests/system-file-system-zfs.mf  | 4 ++++
 usr/src/pkg/manifests/system-library-libfcoe.mf  | 4 ++++
 usr/src/pkg/manifests/system-library.mf          | 4 ++++
 usr/src/pkg/manifests/system-network-routing.mf  | 4 ++++
 usr/src/pkg/manifests/system-tnf.mf              | 3 +++
 12 files changed, 49 insertions(+)

diff --git a/usr/src/pkg/manifests/SUNWcs.mf b/usr/src/pkg/manifests/SUNWcs.mf
index cb9f67f..2496cdd 100644
--- a/usr/src/pkg/manifests/SUNWcs.mf
+++ b/usr/src/pkg/manifests/SUNWcs.mf
@@ -1848,6 +1848,12 @@ link path=usr/tmp target=../var/tmp
 link path=var/ld/32 target=.
 link path=var/ld/64 target=$(ARCH64)
 #
+# cross zone dependency on linked image metadata
+# ifconfig, etc, dependencies on running kernel version
+#
+depend fmri=feature/package/dependency/self type=parent \
+    variant.opensolaris.zone=nonglobal
+#
 # The bootadm binary needs the etc/release file.
 #
 depend fmri=release/name type=require
diff --git a/usr/src/pkg/manifests/developer-dtrace.mf b/usr/src/pkg/manifests/developer-dtrace.mf
index dad7a39..052adfe 100644
--- a/usr/src/pkg/manifests/developer-dtrace.mf
+++ b/usr/src/pkg/manifests/developer-dtrace.mf
@@ -664,3 +664,7 @@ link path=usr/lib/$(ARCH64)/libdtrace.so target=libdtrace.so.1
 link path=usr/lib/$(ARCH64)/libdtrace_jni.so target=libdtrace_jni.so.1
 link path=usr/lib/libdtrace.so target=libdtrace.so.1
 link path=usr/lib/libdtrace_jni.so target=libdtrace_jni.so.1
+# cross zone dependency on linked image metadata
+# libdtrace depends on running kernel version
+depend fmri=feature/package/dependency/self type=parent \
+    variant.opensolaris.zone=nonglobal
diff --git a/usr/src/pkg/manifests/diagnostic-cpu-counters.mf b/usr/src/pkg/manifests/diagnostic-cpu-counters.mf
index 4000a9f..8e8e597 100644
--- a/usr/src/pkg/manifests/diagnostic-cpu-counters.mf
+++ b/usr/src/pkg/manifests/diagnostic-cpu-counters.mf
@@ -227,3 +227,7 @@ link path=usr/share/man/man3cpc/cpc_walk_requests.3cpc \
 link path=usr/share/man/man3cpc/pctx_create.3cpc target=pctx_capture.3cpc
 link path=usr/share/man/man3cpc/pctx_release.3cpc target=pctx_capture.3cpc
 link path=usr/share/man/man3cpc/pctx_run.3cpc target=pctx_capture.3cpc
+# cross zone dependency on linked image metadata
+# libcpc dependency on running kernel version
+depend fmri=feature/package/dependency/self type=parent \
+    variant.opensolaris.zone=nonglobal
diff --git a/usr/src/pkg/manifests/install-beadm.mf b/usr/src/pkg/manifests/install-beadm.mf
index 2a94f50..2494bcf 100644
--- a/usr/src/pkg/manifests/install-beadm.mf
+++ b/usr/src/pkg/manifests/install-beadm.mf
@@ -57,3 +57,7 @@ license lic_CDDL license=lic_CDDL
 link path=usr/lib/$(ARCH64)/libbe.so target=./libbe.so.1
 link path=usr/lib/libbe.so target=./libbe.so.1
 link path=usr/sbin/beadm target=../../sbin/beadm
+# cross zone dependency on linked image metadata
+# beadm needs to agree with state of GZ
+depend fmri=feature/package/dependency/self type=parent \
+    variant.opensolaris.zone=nonglobal
diff --git a/usr/src/pkg/manifests/network-ipfilter.mf b/usr/src/pkg/manifests/network-ipfilter.mf
index 2af86b9..2e867c7 100644
--- a/usr/src/pkg/manifests/network-ipfilter.mf
+++ b/usr/src/pkg/manifests/network-ipfilter.mf
@@ -131,3 +131,7 @@ legacy pkg=SUNWipfu desc="IP Filter Utilities" \
 license cr_Sun license=cr_Sun
 license usr/src/cmd/ipf/tools/IPFILTER.LICENCE \
     license=usr/src/cmd/ipf/tools/IPFILTER.LICENCE
+# cross zone dependency on linked image metadata
+# ipfilter needs to match running kernel
+depend fmri=feature/package/dependency/self type=parent \
+    variant.opensolaris.zone=nonglobal
diff --git a/usr/src/pkg/manifests/service-picl.mf b/usr/src/pkg/manifests/service-picl.mf
index b727a16..e2e165f 100644
--- a/usr/src/pkg/manifests/service-picl.mf
+++ b/usr/src/pkg/manifests/service-picl.mf
@@ -947,3 +947,7 @@ link path=usr/share/man/man3picltree/ptree_get_propval_by_name.3picltree \
     target=ptree_get_propval.3picltree
 link path=usr/share/man/man3picltree/ptree_update_propval_by_name.3picltree \
     target=ptree_update_propval.3picltree
+# cross zone dependency on linked image metadata
+# needs to match running kernel
+depend fmri=feature/package/dependency/self type=parent \
+    variant.opensolaris.zone=nonglobal
diff --git a/usr/src/pkg/manifests/system-file-system-nfs.mf b/usr/src/pkg/manifests/system-file-system-nfs.mf
index 9eb169e..7962fe6 100644
--- a/usr/src/pkg/manifests/system-file-system-nfs.mf
+++ b/usr/src/pkg/manifests/system-file-system-nfs.mf
@@ -124,4 +124,8 @@ link path=usr/lib/nfs/libmapid.so target=libmapid.so.1
 link path=usr/sbin/showmount target=../lib/fs/nfs/showmount
 user username=unknown ftpuser=false gcos-field="Unknown Remote UID" \
     group=unknown uid=96
+# cross zone dependency on linked image metadata
+# needs to match running kernel
+depend fmri=feature/package/dependency/self type=parent \
+    variant.opensolaris.zone=nonglobal
 depend fmri=system/kernel/secure-rpc type=require
diff --git a/usr/src/pkg/manifests/system-file-system-zfs.mf b/usr/src/pkg/manifests/system-file-system-zfs.mf
index 2b63229..2984ab0 100644
--- a/usr/src/pkg/manifests/system-file-system-zfs.mf
+++ b/usr/src/pkg/manifests/system-file-system-zfs.mf
@@ -185,4 +185,8 @@ link path=usr/lib/llib-lzfs_core target=../../lib/llib-lzfs_core
 link path=usr/lib/llib-lzfs_core.ln target=../../lib/llib-lzfs_core.ln
 link path=usr/sbin/zfs target=../../sbin/zfs
 link path=usr/sbin/zpool target=../../sbin/zpool
+# cross zone dependency on linked image metadata
+# due to libzfs dependency on running kernel version
+depend fmri=feature/package/dependency/self type=parent \
+    variant.opensolaris.zone=nonglobal
 depend fmri=runtime/python-26 type=require
diff --git a/usr/src/pkg/manifests/system-library-libfcoe.mf b/usr/src/pkg/manifests/system-library-libfcoe.mf
index 94e8c8e..3edebc6 100644
--- a/usr/src/pkg/manifests/system-library-libfcoe.mf
+++ b/usr/src/pkg/manifests/system-library-libfcoe.mf
@@ -53,3 +53,7 @@ license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 link path=usr/lib/$(ARCH64)/libfcoe.so target=libfcoe.so.1
 link path=usr/lib/libfcoe.so target=libfcoe.so.1
+# cross zone dependency on linked image metadata
+# needs to match running kernel.
+depend fmri=feature/package/dependency/self type=parent \
+    variant.opensolaris.zone=nonglobal
diff --git a/usr/src/pkg/manifests/system-library.mf b/usr/src/pkg/manifests/system-library.mf
index 089d9bc..4964530 100644
--- a/usr/src/pkg/manifests/system-library.mf
+++ b/usr/src/pkg/manifests/system-library.mf
@@ -1284,6 +1284,10 @@ link path=usr/lib/straddr.so target=./straddr.so.2
 link path=usr/xpg4/lib/$(ARCH64)/libcurses.so target=libcurses.so.2
 link path=usr/xpg4/lib/64 target=$(ARCH64)
 link path=usr/xpg4/lib/libcurses.so target=./libcurses.so.2
+# cross zone dependency on linked image metadata
+# due to libc, libdlpi, libdladm, etc, dependency on running kernel version
+depend fmri=feature/package/dependency/self type=parent \
+    variant.opensolaris.zone=nonglobal
 #
 # libses.so needs to dlopen(3C) plugins from usr/lib/scsi/plugins/ses/vendor/,
 # a dependency which cannot be automatically derived
diff --git a/usr/src/pkg/manifests/system-network-routing.mf b/usr/src/pkg/manifests/system-network-routing.mf
index 2005eb2..dd682f9 100644
--- a/usr/src/pkg/manifests/system-network-routing.mf
+++ b/usr/src/pkg/manifests/system-network-routing.mf
@@ -75,3 +75,7 @@ license usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.freebsd \
     license=usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.freebsd
 link path=usr/share/man/man1m/rdisc.1m target=in.rdisc.1m
 link path=usr/share/man/man1m/routed.1m target=in.routed.1m
+# cross zone dependency on linked image metadata
+# needs to match running kernel
+depend fmri=feature/package/dependency/self type=parent \
+    variant.opensolaris.zone=nonglobal
diff --git a/usr/src/pkg/manifests/system-tnf.mf b/usr/src/pkg/manifests/system-tnf.mf
index a7a46ef..04da106 100644
--- a/usr/src/pkg/manifests/system-tnf.mf
+++ b/usr/src/pkg/manifests/system-tnf.mf
@@ -70,3 +70,6 @@ link path=usr/lib/$(ARCH64)/libtnfctl.so target=libtnfctl.so.1
 link path=usr/lib/$(ARCH64)/libtnfprobe.so target=libtnfprobe.so.1
 link path=usr/lib/libtnfctl.so target=./libtnfctl.so.1
 link path=usr/lib/libtnfprobe.so target=./libtnfprobe.so.1
+# cross zone dependency on linked image metadata
+depend fmri=feature/package/dependency/self type=parent \
+    variant.opensolaris.zone=nonglobal
-- 
2.2.0