illumos-gate-1681 Udiff usr/src/pkg/manifests/system-zones-brand-s10.mf

Print this page

1681 support for BUILD64=# no longer works

@@ -19,10 +19,11 @@
 # CDDL HEADER END
 #
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2014 Andrew Stormont.
 #
 
 set name=pkg.fmri value=pkg:/system/zones/brand/s10@$(PKGVERS)
 set name=pkg.description value="Support for the 'Solaris10' Brand"
 set name=pkg.summary value="Solaris 10 Containers: solaris10 brand support"

@@ -45,14 +46,14 @@
 dir path=usr group=sys
 $(i386_ONLY)dir path=usr/kernel group=sys
 $(i386_ONLY)dir path=usr/kernel/brand group=sys
 $(i386_ONLY)dir path=usr/kernel/brand/$(ARCH64) group=sys
 dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
+$(BUILD64)dir path=usr/lib/$(ARCH64)
 dir path=usr/lib/brand
 dir path=usr/lib/brand/solaris10 group=sys
-dir path=usr/lib/brand/solaris10/$(ARCH64)
+$(BUILD64)dir path=usr/lib/brand/solaris10/$(ARCH64)
 file path=etc/brand/solaris10/pkgrm.conf group=sys \
     original_name=SUNWs10brand:etc/brand/solaris10/pkgrm.conf preserve=true
 file path=etc/brand/solaris10/smf_disable.conf group=sys \
     original_name=SUNWs10brand:etc/brand/solaris10/smf_disable.conf \
     preserve=true

@@ -61,13 +62,14 @@
     group=sys mode=0755
 $(sparc_ONLY)file path=platform/sun4v/kernel/brand/$(ARCH64)/s10_brand \
     group=sys mode=0755
 $(i386_ONLY)file path=usr/kernel/brand/$(ARCH64)/s10_brand group=sys mode=0755
 $(i386_ONLY)file path=usr/kernel/brand/s10_brand group=sys mode=0755
-file path=usr/lib/$(ARCH64)/s10_brand.so.1
-file path=usr/lib/$(ARCH64)/s10_npreload.so.1
-file path=usr/lib/brand/solaris10/$(ARCH64)/solaris10_librtld_db.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/s10_brand.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/s10_npreload.so.1
+$(BUILD64)file \
+    path=usr/lib/brand/solaris10/$(ARCH64)/solaris10_librtld_db.so.1
 file path=usr/lib/brand/solaris10/attach mode=0755
 file path=usr/lib/brand/solaris10/clone mode=0755
 file path=usr/lib/brand/solaris10/common.ksh mode=0444
 file path=usr/lib/brand/solaris10/config.xml mode=0444
 file path=usr/lib/brand/solaris10/detach mode=0755

@@ -96,6 +98,6 @@
     name="Solaris 10 Containers: solaris10 brand support (Root)"
 legacy pkg=SUNWs10brandu desc="Support for the 'solaris10' Brand" \
     name="Solaris 10 Containers: solaris10 brand support (Usr)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-link path=usr/lib/brand/solaris10/64 target=$(ARCH64)
+$(BUILD64)link path=usr/lib/brand/solaris10/64 target=$(ARCH64)