All pastes #1812249 Raw Edit

Unnamed

public text v1 · immutable
#1812249 ·published 2010-02-26 19:30 UTC
rendered paste body
14841 final code review: mjnelson: osnet-*.mf manifests don't need multivalued variant.arch

diff --git a/usr/src/pkg/osnet-extra.mf b/usr/src/pkg/osnet-extra.mf
--- a/usr/src/pkg/osnet-extra.mf
+++ b/usr/src/pkg/osnet-extra.mf
@@ -25,7 +25,7 @@
 #
 
 set name=pkg.fmri value=pkg:/consolidation/osnet/osnet-extra@$(PKGVERS)
-set name=variant.arch value=i386 value=sparc
+set name=variant.arch value=$(ARCH)
 set name=org.opensolaris.redist value=nonredist
 set name=pkg.description value="This group package installs all packages from the OS/Net consolidation."
 set name=pkg.summary value="OS/Net consolidation group package"
diff --git a/usr/src/pkg/osnet-incorporation.mf b/usr/src/pkg/osnet-incorporation.mf
--- a/usr/src/pkg/osnet-incorporation.mf
+++ b/usr/src/pkg/osnet-incorporation.mf
@@ -25,7 +25,7 @@
 #
 
 set name=pkg.fmri value=pkg:/consolidation/osnet/osnet-incorporation@$(PKGVERS)
-set name=variant.arch value=i386 value=sparc
+set name=variant.arch value=$(ARCH)
 set name=pkg.description value="This incorporation constrains packages from the OS/Net consolidation."
 set name=pkg.summary value="OS/Net consolidation incorporation"
 set name=pkg.depend.install-hold value=core-os.osnet
diff --git a/usr/src/pkg/osnet-redist.mf b/usr/src/pkg/osnet-redist.mf
--- a/usr/src/pkg/osnet-redist.mf
+++ b/usr/src/pkg/osnet-redist.mf
@@ -25,7 +25,7 @@
 #
 
 set name=pkg.fmri value=pkg:/consolidation/osnet/osnet-redistributable@$(PKGVERS)
-set name=variant.arch value=i386 value=sparc
+set name=variant.arch value=$(ARCH)
 set name=pkg.description value="This group package installs all packages from the OS/Net consolidation."
 set name=pkg.summary value="OS/Net consolidation group package"
 <include packages.redist.current>