illumos-gate-1681 Udiff usr/src/pkg/manifests/system-embedded-fcode-interpreter.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.
 #
 
 #
 # The default for payload-bearing actions in this package is to appear in the
 # global zone only.  See the include file for greater detail, as well as

@@ -55,11 +56,11 @@
 dir path=platform/sun4u/kernel/misc group=sys
 dir path=platform/sun4u/kernel/misc/$(ARCH64) group=sys
 dir path=usr group=sys
 dir path=usr/lib
 dir path=usr/lib/efcode
-dir path=usr/lib/efcode/$(ARCH64)
+$(BUILD64)dir path=usr/lib/efcode/$(ARCH64)
 dir path=usr/share/man/man1m
 driver name=fcode
 file path=etc/flash/postdeployment/efcode.cleanup group=sys mode=0744
 file path=kernel/drv/$(ARCH64)/fcode group=sys
 file path=kernel/drv/fcode.conf group=sys

@@ -68,20 +69,20 @@
 file path=kernel/misc/$(ARCH64)/pcicfg group=sys mode=0755
 file path=lib/svc/manifest/platform/sun4u/efdaemon.xml group=sys mode=0444
 file path=lib/svc/manifest/platform/sun4v/efdaemon.xml group=sys mode=0444
 file path=platform/sun4u/kernel/misc/$(ARCH64)/gptwo_cpu group=sys mode=0755
 file path=platform/sun4u/kernel/misc/$(ARCH64)/gptwocfg group=sys mode=0755
-file path=usr/lib/efcode/$(ARCH64)/efdaemon mode=0555
-file path=usr/lib/efcode/$(ARCH64)/fcdriver.so
-file path=usr/lib/efcode/$(ARCH64)/fcode.so
-file path=usr/lib/efcode/$(ARCH64)/fcpackage.so
-file path=usr/lib/efcode/$(ARCH64)/fcthread.so
-file path=usr/lib/efcode/$(ARCH64)/interpreter mode=0555
-file path=usr/lib/efcode/$(ARCH64)/lfc_gptwo.so
-file path=usr/lib/efcode/$(ARCH64)/lfc_jupiter.so
-file path=usr/lib/efcode/$(ARCH64)/lfc_upa.so
-file path=usr/lib/efcode/$(ARCH64)/lfc_upa_pci.so
+$(BUILD64)file path=usr/lib/efcode/$(ARCH64)/efdaemon mode=0555
+$(BUILD64)file path=usr/lib/efcode/$(ARCH64)/fcdriver.so
+$(BUILD64)file path=usr/lib/efcode/$(ARCH64)/fcode.so
+$(BUILD64)file path=usr/lib/efcode/$(ARCH64)/fcpackage.so
+$(BUILD64)file path=usr/lib/efcode/$(ARCH64)/fcthread.so
+$(BUILD64)file path=usr/lib/efcode/$(ARCH64)/interpreter mode=0555
+$(BUILD64)file path=usr/lib/efcode/$(ARCH64)/lfc_gptwo.so
+$(BUILD64)file path=usr/lib/efcode/$(ARCH64)/lfc_jupiter.so
+$(BUILD64)file path=usr/lib/efcode/$(ARCH64)/lfc_upa.so
+$(BUILD64)file path=usr/lib/efcode/$(ARCH64)/lfc_upa_pci.so
 file path=usr/lib/efcode/efcode.sh mode=0555
 file path=usr/share/man/man1m/efdaemon.1m
 legacy pkg=SUNWefc.u arch=$(ARCH).sun4u \
     desc="Embedded FCode Interpreter Drivers" \
     name="Embedded FCode Interpreter Drivers"

@@ -93,16 +94,24 @@
     name="Embedded FCode Interpreter (Root)"
 legacy pkg=SUNWefcu desc="Embedded FCode Interpreter" \
     name="Embedded FCode Interpreter"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-link path=usr/lib/efcode/$(ARCH64)/lfc_gptwo_gptwo.so target=lfc_gptwo.so
-link path=usr/lib/efcode/$(ARCH64)/lfc_gptwo_pci.so target=lfc_upa_pci.so
-link path=usr/lib/efcode/$(ARCH64)/lfc_jupiter_jupiter.so \
+$(BUILD64)link path=usr/lib/efcode/$(ARCH64)/lfc_gptwo_gptwo.so \
+    target=lfc_gptwo.so
+$(BUILD64)link path=usr/lib/efcode/$(ARCH64)/lfc_gptwo_pci.so \
+    target=lfc_upa_pci.so
+$(BUILD64)link path=usr/lib/efcode/$(ARCH64)/lfc_jupiter_jupiter.so \
     target=lfc_jupiter.so
-link path=usr/lib/efcode/$(ARCH64)/lfc_jupiter_pciex.so target=lfc_upa_pci.so
-link path=usr/lib/efcode/$(ARCH64)/lfc_pci_pci.so target=lfc_upa_pci.so
-link path=usr/lib/efcode/$(ARCH64)/lfc_pci_pciex.so target=lfc_upa_pci.so
-link path=usr/lib/efcode/$(ARCH64)/lfc_pciex_pci.so target=lfc_upa_pci.so
-link path=usr/lib/efcode/$(ARCH64)/lfc_pciex_pciex.so target=lfc_upa_pci.so
-link path=usr/lib/efcode/$(ARCH64)/lfc_sun4v.so target=lfc_upa.so
-link path=usr/lib/efcode/$(ARCH64)/lfc_sun4v_pciex.so target=lfc_upa_pci.so
+$(BUILD64)link path=usr/lib/efcode/$(ARCH64)/lfc_jupiter_pciex.so \
+    target=lfc_upa_pci.so
+$(BUILD64)link path=usr/lib/efcode/$(ARCH64)/lfc_pci_pci.so \
+    target=lfc_upa_pci.so
+$(BUILD64)link path=usr/lib/efcode/$(ARCH64)/lfc_pci_pciex.so \
+    target=lfc_upa_pci.so
+$(BUILD64)link path=usr/lib/efcode/$(ARCH64)/lfc_pciex_pci.so \
+    target=lfc_upa_pci.so
+$(BUILD64)link path=usr/lib/efcode/$(ARCH64)/lfc_pciex_pciex.so \
+    target=lfc_upa_pci.so
+$(BUILD64)link path=usr/lib/efcode/$(ARCH64)/lfc_sun4v.so target=lfc_upa.so
+$(BUILD64)link path=usr/lib/efcode/$(ARCH64)/lfc_sun4v_pciex.so \
+    target=lfc_upa_pci.so