From ff31dd4357baa93da7d98149b197dd7c1eb9b997 Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Tue, 2 Oct 2018 16:40:22 -0400 Subject: [PATCH] pkg: remove $(i386_ONLY) All our files are i386_ONLY so having it is redundant. --- usr/src/pkg/Makefile | 1 - usr/src/pkg/README.pkg | 1 - usr/src/pkg/manifests/developer-build-onbld.mf | 6 +- usr/src/pkg/manifests/developer-debug-mdb.mf | 51 ++--- usr/src/pkg/manifests/developer-dtrace.inc | 6 +- usr/src/pkg/manifests/developer-linker.mf | 2 +- .../pkg/manifests/developer-opensolaris-osnet.mf | 2 +- usr/src/pkg/manifests/diagnostic-cpu-counters.mf | 43 ++-- usr/src/pkg/manifests/diagnostic-latencytop.mf | 4 +- usr/src/pkg/manifests/diagnostic-powertop.mf | 4 +- usr/src/pkg/manifests/driver-network-bge.inc | 2 +- usr/src/pkg/manifests/driver-network-hme.inc | 2 +- usr/src/pkg/manifests/driver-network-hxge.inc | 2 +- usr/src/pkg/manifests/driver-network-nxge.inc | 10 +- usr/src/pkg/manifests/driver-storage-mr_sas.inc | 2 +- ...r-network-hme.inc => driver-storage-sdcard.inc} | 11 +- usr/src/pkg/manifests/driver-usb.inc | 16 +- usr/src/pkg/manifests/network-ipfilter.mf | 18 +- usr/src/pkg/manifests/service-fault-management.mf | 77 +++---- usr/src/pkg/manifests/system-boot-loader.mf | 206 +++++++++--------- usr/src/pkg/manifests/system-boot-real-mode.mf | 28 +-- usr/src/pkg/manifests/system-core-os.mf | 32 +-- usr/src/pkg/manifests/system-dtrace-tests.mf | 35 ++- .../manifests/system-extended-system-utilities.mf | 44 ++-- .../pkg/manifests/system-file-system-zfs-tests.mf | 12 +- usr/src/pkg/manifests/system-file-system-zfs.inc | 10 +- usr/src/pkg/manifests/system-fru-id-platform.mf | 8 +- usr/src/pkg/manifests/system-header.mf | 212 +++++++++--------- .../pkg/manifests/system-kernel-cpu-counters.inc | 14 +- usr/src/pkg/manifests/system-kernel-platform.inc | 236 ++++++++++----------- .../pkg/manifests/system-kernel-suspend-resume.inc | 18 +- usr/src/pkg/manifests/system-kernel.mf | 122 ++++++----- usr/src/pkg/manifests/system-library-c-runtime.mf | 4 +- usr/src/pkg/manifests/system-library-math.inc | 4 +- usr/src/pkg/manifests/system-library-platform.mf | 4 +- usr/src/pkg/manifests/system-library.inc | 40 ++-- usr/src/pkg/manifests/system-test-ostest.mf | 6 +- usr/src/pkg/manifests/system-test-zfstest.mf | 18 +- usr/src/pkg/manifests/system-zones-brand-sn1.mf | 6 +- 39 files changed, 640 insertions(+), 679 deletions(-) copy usr/src/pkg/manifests/{driver-network-hme.inc => driver-storage-sdcard.inc} (81%) rewrite usr/src/pkg/manifests/system-boot-loader.mf (71%) rewrite usr/src/pkg/manifests/system-kernel-platform.inc (64%) diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile index 6d20527c37..f5fc240601 100644 --- a/usr/src/pkg/Makefile +++ b/usr/src/pkg/Makefile @@ -174,7 +174,6 @@ PM_TRANSFORMS= common_actions publish restart_fmri facets defaults \ PM_INC= transforms manifests PKGMOG_DEFINES= \ - i386_ONLY=$(POUND_SIGN) \ i86pc_ONLY=$(POUND_SIGN) \ $(PKGMACH)_ONLY= \ $(CONFIG_PLATFORM)_ONLY= \ diff --git a/usr/src/pkg/README.pkg b/usr/src/pkg/README.pkg index dcfa0cad76..b19bcbec64 100644 --- a/usr/src/pkg/README.pkg +++ b/usr/src/pkg/README.pkg @@ -206,7 +206,6 @@ order to make the manifests themselves easier to maintain. We supply a set of commonly-used macros for use in package manifests. These are the PKGMOG_DEFINES in usr/src/pkg/Makefile. - $(i386_ONLY) $(ARCH) $(ARCH32) $(ARCH64) diff --git a/usr/src/pkg/manifests/developer-build-onbld.mf b/usr/src/pkg/manifests/developer-build-onbld.mf index 6711a00d40..7139c4a012 100644 --- a/usr/src/pkg/manifests/developer-build-onbld.mf +++ b/usr/src/pkg/manifests/developer-build-onbld.mf @@ -55,7 +55,7 @@ dir path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Checks dir path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Scm dir path=opt/onbld/man dir path=opt/onbld/man/man1 -$(i386_ONLY)file path=opt/onbld/bin/$(ARCH)/btxld mode=0555 +file path=opt/onbld/bin/$(ARCH)/btxld mode=0555 file path=opt/onbld/bin/$(ARCH)/codereview mode=0555 file path=opt/onbld/bin/$(ARCH)/ctfconvert mode=0555 file path=opt/onbld/bin/$(ARCH)/ctfdiff mode=0555 @@ -63,7 +63,7 @@ file path=opt/onbld/bin/$(ARCH)/ctfdump mode=0555 file path=opt/onbld/bin/$(ARCH)/ctfmerge mode=0555 file path=opt/onbld/bin/$(ARCH)/ctfstabs mode=0555 file path=opt/onbld/bin/$(ARCH)/ctfstrip mode=0555 -$(i386_ONLY)file path=opt/onbld/bin/$(ARCH)/elfextract mode=0555 +file path=opt/onbld/bin/$(ARCH)/elfextract mode=0555 file path=opt/onbld/bin/$(ARCH)/ndrgen mode=0555 file path=opt/onbld/bin/$(ARCH)/ndrgen1 mode=0555 file path=opt/onbld/bin/$(ARCH)/protocmp mode=0555 @@ -160,7 +160,7 @@ file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/Scm/__init__.pyc \ file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/__init__.py mode=0444 file path=opt/onbld/lib/python$(PYTHON_VERSION)/onbld/__init__.pyc mode=0444 file path=opt/onbld/man/man1/Install.1 -$(i386_ONLY)file path=opt/onbld/man/man1/btxld.1 +file path=opt/onbld/man/man1/btxld.1 file path=opt/onbld/man/man1/cddlchk.1 file path=opt/onbld/man/man1/check_rtime.1 file path=opt/onbld/man/man1/checkpaths.1 diff --git a/usr/src/pkg/manifests/developer-debug-mdb.mf b/usr/src/pkg/manifests/developer-debug-mdb.mf index 8acccb7ac9..06ed41d4c2 100644 --- a/usr/src/pkg/manifests/developer-debug-mdb.mf +++ b/usr/src/pkg/manifests/developer-debug-mdb.mf @@ -47,7 +47,7 @@ dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys dir path=usr/lib/mdb/proc group=sys -$(i386_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) +dir path=usr/lib/mdb/proc/$(ARCH64) dir path=usr/lib/mdb/raw group=sys dir path=usr/platform group=sys dir path=usr/platform/$(CONFIG_PLATFORM) group=sys @@ -59,12 +59,12 @@ dir path=usr/share/man dir path=usr/share/man/man1 file path=kernel/kmdb/arp group=sys mode=0555 file path=kernel/kmdb/cpc group=sys mode=0555 -$(i386_ONLY)file path=kernel/kmdb/cpu.generic group=sys mode=0555 -$(i386_ONLY)file path=kernel/kmdb/cpu_ms.AuthenticAMD.15 group=sys mode=0555 +file path=kernel/kmdb/cpu.generic group=sys mode=0555 +file path=kernel/kmdb/cpu_ms.AuthenticAMD.15 group=sys mode=0555 file path=kernel/kmdb/crypto group=sys mode=0555 file path=kernel/kmdb/genunix group=sys mode=0555 file path=kernel/kmdb/hook group=sys mode=0555 -$(i386_ONLY)file path=kernel/kmdb/i40e group=sys mode=0555 +file path=kernel/kmdb/i40e group=sys mode=0555 file path=kernel/kmdb/ip group=sys mode=0555 file path=kernel/kmdb/ipc group=sys mode=0555 file path=kernel/kmdb/ipp group=sys mode=0555 @@ -80,7 +80,7 @@ file path=kernel/kmdb/neti group=sys mode=0555 file path=kernel/kmdb/ptm group=sys mode=0555 file path=kernel/kmdb/random group=sys mode=0555 file path=kernel/kmdb/s1394 group=sys mode=0555 -$(i386_ONLY)file path=kernel/kmdb/sata group=sys mode=0555 +file path=kernel/kmdb/sata group=sys mode=0555 file path=kernel/kmdb/scsi_vhci group=sys mode=0555 file path=kernel/kmdb/sctp group=sys mode=0555 file path=kernel/kmdb/sd group=sys mode=0555 @@ -88,29 +88,24 @@ file path=kernel/kmdb/sockfs group=sys mode=0555 file path=kernel/kmdb/specfs group=sys mode=0555 file path=kernel/kmdb/sppp group=sys mode=0555 file path=kernel/kmdb/ufs group=sys mode=0555 -$(i386_ONLY)file path=kernel/kmdb/uhci group=sys mode=0555 +file path=kernel/kmdb/uhci group=sys mode=0555 file path=kernel/kmdb/usba group=sys mode=0555 -$(i386_ONLY)file path=platform/$(CONFIG_PLATFORM)/kernel/kmdb/apix group=sys \ - mode=0555 -$(i386_ONLY)file path=platform/$(CONFIG_PLATFORM)/kernel/kmdb/pcplusmp \ - group=sys mode=0555 -$(i386_ONLY)file path=platform/$(CONFIG_PLATFORM)/kernel/kmdb/unix group=sys \ - mode=0555 -$(i386_ONLY)file path=platform/$(CONFIG_PLATFORM)/kernel/kmdb/uppc group=sys \ - mode=0555 +file path=platform/$(CONFIG_PLATFORM)/kernel/kmdb/apix group=sys mode=0555 +file path=platform/$(CONFIG_PLATFORM)/kernel/kmdb/pcplusmp group=sys mode=0555 +file path=platform/$(CONFIG_PLATFORM)/kernel/kmdb/unix group=sys mode=0555 +file path=platform/$(CONFIG_PLATFORM)/kernel/kmdb/uppc group=sys mode=0555 file path=usr/bin/$(ARCH32)/mdb mode=0555 file path=usr/bin/$(ARCH64)/mdb mode=0555 file path=usr/include/sys/mdb_modapi.h mode=0644 file path=usr/lib/mdb/kvm/$(ARCH64)/arp.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/cpc.so group=sys mode=0555 -$(i386_ONLY)file path=usr/lib/mdb/kvm/$(ARCH64)/cpu.generic.so group=sys \ +file path=usr/lib/mdb/kvm/$(ARCH64)/cpu.generic.so group=sys mode=0555 +file path=usr/lib/mdb/kvm/$(ARCH64)/cpu_ms.AuthenticAMD.15.so group=sys \ mode=0555 -$(i386_ONLY)file path=usr/lib/mdb/kvm/$(ARCH64)/cpu_ms.AuthenticAMD.15.so \ - group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/crypto.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/genunix.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/hook.so group=sys mode=0555 -$(i386_ONLY)file path=usr/lib/mdb/kvm/$(ARCH64)/i40e.so group=sys mode=0555 +file path=usr/lib/mdb/kvm/$(ARCH64)/i40e.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/ip.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/ipc.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/ipp.so group=sys mode=0555 @@ -126,7 +121,7 @@ file path=usr/lib/mdb/kvm/$(ARCH64)/neti.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/ptm.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/random.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/s1394.so group=sys mode=0555 -$(i386_ONLY)file path=usr/lib/mdb/kvm/$(ARCH64)/sata.so group=sys mode=0555 +file path=usr/lib/mdb/kvm/$(ARCH64)/sata.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/scsi_vhci.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/sctp.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/sd.so group=sys mode=0555 @@ -134,7 +129,7 @@ file path=usr/lib/mdb/kvm/$(ARCH64)/sockfs.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/specfs.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/sppp.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/ufs.so group=sys mode=0555 -$(i386_ONLY)file path=usr/lib/mdb/kvm/$(ARCH64)/uhci.so group=sys mode=0555 +file path=usr/lib/mdb/kvm/$(ARCH64)/uhci.so group=sys mode=0555 file path=usr/lib/mdb/kvm/$(ARCH64)/usba.so group=sys mode=0555 file path=usr/lib/mdb/proc/$(ARCH64)/ld.so group=sys mode=0555 file path=usr/lib/mdb/proc/$(ARCH64)/libavl.so group=sys mode=0555 @@ -149,8 +144,7 @@ file path=usr/lib/mdb/proc/$(ARCH64)/libtopo.so group=sys mode=0555 file path=usr/lib/mdb/proc/$(ARCH64)/libumem.so group=sys mode=0555 file path=usr/lib/mdb/proc/$(ARCH64)/libuutil.so group=sys mode=0555 file path=usr/lib/mdb/proc/$(ARCH64)/mdb_ds.so group=sys mode=0555 -$(i386_ONLY)file path=usr/lib/mdb/proc/$(ARCH64)/mdb_test.so group=sys \ - mode=0555 +file path=usr/lib/mdb/proc/$(ARCH64)/mdb_test.so group=sys mode=0555 file path=usr/lib/mdb/proc/ld.so group=sys mode=0555 file path=usr/lib/mdb/proc/libavl.so group=sys mode=0555 file path=usr/lib/mdb/proc/libc.so group=sys mode=0555 @@ -165,14 +159,11 @@ file path=usr/lib/mdb/proc/libuutil.so group=sys mode=0555 file path=usr/lib/mdb/proc/mdb_ds.so group=sys mode=0555 file path=usr/lib/mdb/proc/svc.configd.so group=sys mode=0555 file path=usr/lib/mdb/proc/svc.startd.so group=sys mode=0555 -$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/$(ARCH64)/apix.so \ - group=sys mode=0555 -$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/$(ARCH64)/pcplusmp.so \ - group=sys mode=0555 -$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/$(ARCH64)/unix.so \ - group=sys mode=0555 -$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/$(ARCH64)/uppc.so \ - group=sys mode=0555 +file path=usr/platform/i86pc/lib/mdb/kvm/$(ARCH64)/apix.so group=sys mode=0555 +file path=usr/platform/i86pc/lib/mdb/kvm/$(ARCH64)/pcplusmp.so group=sys \ + mode=0555 +file path=usr/platform/i86pc/lib/mdb/kvm/$(ARCH64)/unix.so group=sys mode=0555 +file path=usr/platform/i86pc/lib/mdb/kvm/$(ARCH64)/uppc.so group=sys mode=0555 file path=usr/share/man/man1/adb.1 file path=usr/share/man/man1/kmdb.1 file path=usr/share/man/man1/mdb.1 diff --git a/usr/src/pkg/manifests/developer-dtrace.inc b/usr/src/pkg/manifests/developer-dtrace.inc index efc52008ee..27e112fe05 100644 --- a/usr/src/pkg/manifests/developer-dtrace.inc +++ b/usr/src/pkg/manifests/developer-dtrace.inc @@ -85,9 +85,9 @@ file path=usr/lib/mdb/kvm/$(ARCH64)/dtrace.so group=sys mode=0555 file path=usr/lib/mdb/raw/$(ARCH64)/dof.so group=sys mode=0555 file path=usr/lib/mdb/raw/dof.so group=sys mode=0555 file path=usr/sbin/$(ARCH32)/dtrace mode=0555 -$(i386_ONLY)file path=usr/sbin/$(ARCH32)/intrstat mode=0555 -$(i386_ONLY)file path=usr/sbin/$(ARCH32)/lockstat mode=0555 -$(i386_ONLY)file path=usr/sbin/$(ARCH32)/plockstat mode=0555 +file path=usr/sbin/$(ARCH32)/intrstat mode=0555 +file path=usr/sbin/$(ARCH32)/lockstat mode=0555 +file path=usr/sbin/$(ARCH32)/plockstat mode=0555 file path=usr/sbin/$(ARCH64)/dtrace mode=0555 file path=usr/sbin/$(ARCH64)/intrstat mode=0555 file path=usr/sbin/$(ARCH64)/lockstat mode=0555 diff --git a/usr/src/pkg/manifests/developer-linker.mf b/usr/src/pkg/manifests/developer-linker.mf index b596e5b252..5a3c8f3ffb 100644 --- a/usr/src/pkg/manifests/developer-linker.mf +++ b/usr/src/pkg/manifests/developer-linker.mf @@ -45,7 +45,7 @@ dir path=usr/share/man dir path=usr/share/man/man1 dir path=usr/share/man/man4 file path=usr/bin/$(ARCH32)/gcore mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/plimit mode=0555 +file path=usr/bin/$(ARCH32)/plimit mode=0555 file path=usr/bin/$(ARCH32)/strings mode=0555 file path=usr/bin/$(ARCH32)/truss mode=0555 file path=usr/bin/$(ARCH64)/elfwrap mode=0555 diff --git a/usr/src/pkg/manifests/developer-opensolaris-osnet.mf b/usr/src/pkg/manifests/developer-opensolaris-osnet.mf index 8153dea7f6..d30477b339 100644 --- a/usr/src/pkg/manifests/developer-opensolaris-osnet.mf +++ b/usr/src/pkg/manifests/developer-opensolaris-osnet.mf @@ -33,7 +33,7 @@ set name=variant.arch value=$(ARCH) depend fmri=developer/astdev@0.5.11-0.133 type=require depend fmri=developer/build/make@0.5.11-0.133 type=require depend fmri=developer/build/onbld@0.5.11-0.133 type=require -$(i386_ONLY)depend fmri=developer/gnu-binutils@2.19-0.133 type=require +depend fmri=developer/gnu-binutils@2.19-0.133 type=require depend fmri=developer/object-file@0.5.11-0.133 type=require depend fmri=developer/parser/bison@2.3-0.133 type=require depend fmri=library/glib2@0.5.11-0.133 type=require diff --git a/usr/src/pkg/manifests/diagnostic-cpu-counters.mf b/usr/src/pkg/manifests/diagnostic-cpu-counters.mf index e6413b8619..cee0d80057 100644 --- a/usr/src/pkg/manifests/diagnostic-cpu-counters.mf +++ b/usr/src/pkg/manifests/diagnostic-cpu-counters.mf @@ -32,7 +32,7 @@ set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) dir path=usr group=sys dir path=usr/bin -$(i386_ONLY)dir path=usr/bin/$(ARCH32) +dir path=usr/bin/$(ARCH32) dir path=usr/bin/$(ARCH64) dir path=usr/include dir path=usr/include/sys @@ -45,14 +45,13 @@ dir path=usr/share/man/man1 dir path=usr/share/man/man3cpc dir path=usr/share/man/man3lib dir path=usr/share/man/man8 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/cputrack mode=0555 +file path=usr/bin/$(ARCH32)/cputrack mode=0555 file path=usr/bin/$(ARCH64)/cputrack mode=0555 file path=usr/include/libcpc.h file path=usr/include/libpctx.h -$(i386_ONLY)file path=usr/kernel/pcbe/pcbe.AuthenticAMD group=sys mode=0755 -$(i386_ONLY)file path=usr/kernel/pcbe/pcbe.GenuineIntel.15 group=sys mode=0755 -$(i386_ONLY)file path=usr/kernel/pcbe/pcbe.GenuineIntel.6.15 group=sys \ - mode=0755 +file path=usr/kernel/pcbe/pcbe.AuthenticAMD group=sys mode=0755 +file path=usr/kernel/pcbe/pcbe.GenuineIntel.15 group=sys mode=0755 +file path=usr/kernel/pcbe/pcbe.GenuineIntel.6.15 group=sys mode=0755 file path=usr/lib/$(ARCH64)/libcpc.so.1 file path=usr/lib/$(ARCH64)/libpctx.so.1 file path=usr/lib/libcpc.so.1 @@ -87,28 +86,18 @@ file path=usr/share/man/man8/cpustat.8 hardlink path=usr/bin/cputrack target=../lib/isaexec license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -$(i386_ONLY)license usr/src/uts/intel/pcbe/THIRDPARTYLICENSE \ +license usr/src/uts/intel/pcbe/THIRDPARTYLICENSE \ license=usr/src/uts/intel/pcbe/THIRDPARTYLICENSE -$(i386_ONLY)link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.23 \ - target=pcbe.GenuineIntel.6.15 -$(i386_ONLY)link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.26 \ - target=pcbe.GenuineIntel.6.15 -$(i386_ONLY)link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.28 \ - target=pcbe.GenuineIntel.6.15 -$(i386_ONLY)link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.29 \ - target=pcbe.GenuineIntel.6.15 -$(i386_ONLY)link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.30 \ - target=pcbe.GenuineIntel.6.15 -$(i386_ONLY)link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.31 \ - target=pcbe.GenuineIntel.6.15 -$(i386_ONLY)link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.37 \ - target=pcbe.GenuineIntel.6.15 -$(i386_ONLY)link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.44 \ - target=pcbe.GenuineIntel.6.15 -$(i386_ONLY)link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.46 \ - target=pcbe.GenuineIntel.6.15 -$(i386_ONLY)link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.47 \ - target=pcbe.GenuineIntel.6.15 +link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.23 target=pcbe.GenuineIntel.6.15 +link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.26 target=pcbe.GenuineIntel.6.15 +link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.28 target=pcbe.GenuineIntel.6.15 +link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.29 target=pcbe.GenuineIntel.6.15 +link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.30 target=pcbe.GenuineIntel.6.15 +link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.31 target=pcbe.GenuineIntel.6.15 +link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.37 target=pcbe.GenuineIntel.6.15 +link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.44 target=pcbe.GenuineIntel.6.15 +link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.46 target=pcbe.GenuineIntel.6.15 +link path=usr/kernel/pcbe/pcbe.GenuineIntel.6.47 target=pcbe.GenuineIntel.6.15 link path=usr/lib/$(ARCH64)/libcpc.so target=./libcpc.so.1 link path=usr/lib/$(ARCH64)/libpctx.so target=./libpctx.so.1 link path=usr/lib/libcpc.so target=./libcpc.so.1 diff --git a/usr/src/pkg/manifests/diagnostic-latencytop.mf b/usr/src/pkg/manifests/diagnostic-latencytop.mf index 908f7c6482..347ccfbbf6 100644 --- a/usr/src/pkg/manifests/diagnostic-latencytop.mf +++ b/usr/src/pkg/manifests/diagnostic-latencytop.mf @@ -31,10 +31,10 @@ set name=info.classification \ set name=variant.arch value=$(ARCH) dir path=usr group=sys dir path=usr/bin -$(i386_ONLY)dir path=usr/bin/$(ARCH32) +dir path=usr/bin/$(ARCH32) dir path=usr/bin/$(ARCH64) dir path=usr/share/man/man8 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/latencytop mode=0555 +file path=usr/bin/$(ARCH32)/latencytop mode=0555 file path=usr/bin/$(ARCH64)/latencytop mode=0555 file path=usr/share/man/man8/latencytop.8 hardlink path=usr/bin/latencytop target=../../usr/lib/isaexec diff --git a/usr/src/pkg/manifests/diagnostic-powertop.mf b/usr/src/pkg/manifests/diagnostic-powertop.mf index f304bb6a0d..d9cdbc35f3 100644 --- a/usr/src/pkg/manifests/diagnostic-powertop.mf +++ b/usr/src/pkg/manifests/diagnostic-powertop.mf @@ -31,10 +31,10 @@ set name=info.classification \ set name=variant.arch value=$(ARCH) dir path=usr group=sys dir path=usr/bin -$(i386_ONLY)dir path=usr/bin/$(ARCH32) +dir path=usr/bin/$(ARCH32) dir path=usr/bin/$(ARCH64) dir path=usr/share/man/man8 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/powertop mode=0555 +file path=usr/bin/$(ARCH32)/powertop mode=0555 file path=usr/bin/$(ARCH64)/powertop mode=0555 file path=usr/share/man/man8/powertop.8 hardlink path=usr/bin/powertop target=../../usr/lib/isaexec diff --git a/usr/src/pkg/manifests/driver-network-bge.inc b/usr/src/pkg/manifests/driver-network-bge.inc index 3f1c46f706..3dcd21b65d 100644 --- a/usr/src/pkg/manifests/driver-network-bge.inc +++ b/usr/src/pkg/manifests/driver-network-bge.inc @@ -32,7 +32,7 @@ dir path=kernel group=sys dir path=kernel/drv group=sys dir path=usr/share/man dir path=usr/share/man/man7d -$(i386_ONLY)driver name=bge clone_perms="bge 0666 root sys" \ +driver name=bge clone_perms="bge 0666 root sys" \ perms="* 0666 root sys" \ alias=SUNW,bge \ alias=pci108e,1647 \ diff --git a/usr/src/pkg/manifests/driver-network-hme.inc b/usr/src/pkg/manifests/driver-network-hme.inc index 8832f387dc..7282607600 100644 --- a/usr/src/pkg/manifests/driver-network-hme.inc +++ b/usr/src/pkg/manifests/driver-network-hme.inc @@ -32,7 +32,7 @@ dir path=kernel group=sys dir path=kernel/drv group=sys dir path=usr/share/man dir path=usr/share/man/man7d -$(i386_ONLY)driver name=hme alias=pci108e,1001 +driver name=hme alias=pci108e,1001 file path=kernel/drv/hme group=sys file path=usr/share/man/man7d/hme.7d license cr_Sun license=cr_Sun diff --git a/usr/src/pkg/manifests/driver-network-hxge.inc b/usr/src/pkg/manifests/driver-network-hxge.inc index e54d862005..c27a460ff4 100644 --- a/usr/src/pkg/manifests/driver-network-hxge.inc +++ b/usr/src/pkg/manifests/driver-network-hxge.inc @@ -32,7 +32,7 @@ dir path=kernel group=sys dir path=kernel/drv group=sys dir path=usr/share/man dir path=usr/share/man/man7d -$(i386_ONLY)driver name=hxge alias=pci108e,aaaa perms="* 0600 root sys" +driver name=hxge alias=pci108e,aaaa perms="* 0600 root sys" file path=kernel/drv/hxge group=sys file path=kernel/drv/hxge.conf group=sys preserve=renamenew file path=usr/share/man/man7d/hxge.7d diff --git a/usr/src/pkg/manifests/driver-network-nxge.inc b/usr/src/pkg/manifests/driver-network-nxge.inc index db3d58415d..7497fa0279 100644 --- a/usr/src/pkg/manifests/driver-network-nxge.inc +++ b/usr/src/pkg/manifests/driver-network-nxge.inc @@ -28,15 +28,15 @@ # global zone only. See the include file for greater detail, as well as # information about overriding the defaults. # -$(i386_ONLY)dir path=kernel group=sys -$(i386_ONLY)dir path=kernel/drv group=sys +dir path=kernel group=sys +dir path=kernel/drv group=sys dir path=usr/share/man dir path=usr/share/man/man7d -$(i386_ONLY)driver name=nxge perms="* 0600 root sys" \ +driver name=nxge perms="* 0600 root sys" \ alias=SUNW,niusl \ alias=pciex108e,abcd -$(i386_ONLY)file path=kernel/drv/nxge group=sys -$(i386_ONLY)file path=kernel/drv/nxge.conf group=sys preserve=renamenew +file path=kernel/drv/nxge group=sys +file path=kernel/drv/nxge.conf group=sys preserve=renamenew file path=usr/share/man/man7d/nxge.7d license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-storage-mr_sas.inc b/usr/src/pkg/manifests/driver-storage-mr_sas.inc index 86cd23a48e..5516ca78bf 100644 --- a/usr/src/pkg/manifests/driver-storage-mr_sas.inc +++ b/usr/src/pkg/manifests/driver-storage-mr_sas.inc @@ -35,7 +35,7 @@ dir path=kernel group=sys dir path=kernel/drv group=sys dir path=usr/share/man dir path=usr/share/man/man7d -$(i386_ONLY)driver name=mr_sas class=scsi-self-identifying \ +driver name=mr_sas class=scsi-self-identifying \ alias=pciex1000,52 \ alias=pciex1000,53 \ alias=pciex1000,5b \ diff --git a/usr/src/pkg/manifests/driver-network-hme.inc b/usr/src/pkg/manifests/driver-storage-sdcard.inc similarity index 81% copy from usr/src/pkg/manifests/driver-network-hme.inc copy to usr/src/pkg/manifests/driver-storage-sdcard.inc index 8832f387dc..6e25ee61b8 100644 --- a/usr/src/pkg/manifests/driver-network-hme.inc +++ b/usr/src/pkg/manifests/driver-storage-sdcard.inc @@ -30,10 +30,15 @@ # dir path=kernel group=sys dir path=kernel/drv group=sys +dir path=kernel/misc group=sys dir path=usr/share/man dir path=usr/share/man/man7d -$(i386_ONLY)driver name=hme alias=pci108e,1001 -file path=kernel/drv/hme group=sys -file path=usr/share/man/man7d/hme.7d +driver name=sdhost perms="* 0644 root root" \ + alias=pciclass,080500 \ + alias=pciclass,080501 +file path=kernel/drv/sdhost group=sys +file path=kernel/misc/sda group=sys mode=0755 +file path=usr/share/man/man7d/sda.7d +file path=usr/share/man/man7d/sdhost.7d license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/driver-usb.inc b/usr/src/pkg/manifests/driver-usb.inc index b5730ad635..2c8e511632 100644 --- a/usr/src/pkg/manifests/driver-usb.inc +++ b/usr/src/pkg/manifests/driver-usb.inc @@ -49,7 +49,7 @@ dir path=usr group=sys dir path=usr/lib dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys -$(i386_ONLY)dir path=usr/lib/xhci group=sys +dir path=usr/lib/xhci group=sys dir path=usr/share dir path=usr/share/man dir path=usr/share/man/man7m @@ -69,7 +69,7 @@ driver name=usb_as alias=usbif,class1.2 perms="* 0600 root sys" driver name=usb_ia alias=usb,ia driver name=usb_mid alias=usb,device driver name=usbprn alias=usbif,class7.1 perms="* 0666 root sys" -$(i386_ONLY)driver name=xhci alias=pciclass,0c0330 perms="* 0644 root sys" +driver name=xhci alias=pciclass,0c0330 perms="* 0644 root sys" file path=etc/usb/config_map.conf group=sys preserve=true file path=kernel/drv/ehci group=sys file path=kernel/drv/ehci.conf group=sys @@ -87,9 +87,9 @@ file path=kernel/drv/usb_as group=sys file path=kernel/drv/usb_ia group=sys file path=kernel/drv/usb_mid group=sys file path=kernel/drv/usbprn group=sys -$(i386_ONLY)file path=kernel/drv/xhci group=sys -$(i386_ONLY)file path=kernel/drv/xhci.conf group=sys -$(i386_ONLY)file path=kernel/kmdb/xhci group=sys mode=0555 +file path=kernel/drv/xhci group=sys +file path=kernel/drv/xhci.conf group=sys +file path=kernel/kmdb/xhci group=sys mode=0555 file path=kernel/misc/hidparser group=sys mode=0755 file path=kernel/misc/usba group=sys mode=0755 file path=kernel/misc/usba10 group=sys mode=0755 @@ -97,8 +97,8 @@ file path=kernel/strmod/usb_ah group=sys mode=0755 file path=kernel/strmod/usbkbm group=sys mode=0755 file path=kernel/strmod/usbms group=sys mode=0755 file path=kernel/strmod/usbwcm group=sys mode=0755 -$(i386_ONLY)file path=usr/lib/mdb/kvm/$(ARCH64)/xhci.so group=sys mode=0555 -$(i386_ONLY)file path=usr/lib/xhci/xhci_portsc group=sys mode=0555 +file path=usr/lib/mdb/kvm/$(ARCH64)/xhci.so group=sys mode=0555 +file path=usr/lib/xhci/xhci_portsc group=sys mode=0555 file path=usr/share/man/man7d/ehci.7d file path=usr/share/man/man7d/hid.7d file path=usr/share/man/man7d/hubd.7d @@ -111,7 +111,7 @@ file path=usr/share/man/man7d/usb_ia.7d file path=usr/share/man/man7d/usb_mid.7d file path=usr/share/man/man7d/usba.7d file path=usr/share/man/man7d/usbprn.7d -$(i386_ONLY)file path=usr/share/man/man7d/xhci.7d +file path=usr/share/man/man7d/xhci.7d file path=usr/share/man/man7m/usb_ah.7m file path=usr/share/man/man7m/usbkbm.7m file path=usr/share/man/man7m/usbms.7m diff --git a/usr/src/pkg/manifests/network-ipfilter.mf b/usr/src/pkg/manifests/network-ipfilter.mf index 76874ade51..6fd276d24c 100644 --- a/usr/src/pkg/manifests/network-ipfilter.mf +++ b/usr/src/pkg/manifests/network-ipfilter.mf @@ -41,10 +41,10 @@ dir path=usr/kernel group=sys dir path=usr/kernel/drv group=sys dir path=usr/lib dir path=usr/lib/ipf -$(i386_ONLY)dir path=usr/lib/ipf/$(ARCH32) group=sys +dir path=usr/lib/ipf/$(ARCH32) group=sys dir path=usr/lib/ipf/$(ARCH64) group=sys dir path=usr/sbin -$(i386_ONLY)dir path=usr/sbin/$(ARCH32) +dir path=usr/sbin/$(ARCH32) dir path=usr/sbin/$(ARCH64) dir path=usr/share dir path=usr/share/ipfilter @@ -63,16 +63,16 @@ file path=lib/svc/manifest/network/ipfilter.xml group=sys mode=0444 file path=lib/svc/method/ipfilter mode=0555 file path=usr/kernel/drv/ipf group=sys file path=usr/kernel/drv/ipf.conf group=sys -$(i386_ONLY)file path=usr/lib/ipf/$(ARCH32)/ipftest mode=0555 +file path=usr/lib/ipf/$(ARCH32)/ipftest mode=0555 file path=usr/lib/ipf/$(ARCH64)/ipftest mode=0555 file path=usr/lib/ipf/IPFILTER.LICENCE file path=usr/lib/servinfo mode=0555 -$(i386_ONLY)file path=usr/sbin/$(ARCH32)/ipf mode=0555 -$(i386_ONLY)file path=usr/sbin/$(ARCH32)/ipfs mode=0555 -$(i386_ONLY)file path=usr/sbin/$(ARCH32)/ipfstat mode=0555 -$(i386_ONLY)file path=usr/sbin/$(ARCH32)/ipmon mode=0555 -$(i386_ONLY)file path=usr/sbin/$(ARCH32)/ipnat mode=0555 -$(i386_ONLY)file path=usr/sbin/$(ARCH32)/ippool mode=0555 +file path=usr/sbin/$(ARCH32)/ipf mode=0555 +file path=usr/sbin/$(ARCH32)/ipfs mode=0555 +file path=usr/sbin/$(ARCH32)/ipfstat mode=0555 +file path=usr/sbin/$(ARCH32)/ipmon mode=0555 +file path=usr/sbin/$(ARCH32)/ipnat mode=0555 +file path=usr/sbin/$(ARCH32)/ippool mode=0555 file path=usr/sbin/$(ARCH64)/ipf mode=0555 file path=usr/sbin/$(ARCH64)/ipfs mode=0555 file path=usr/sbin/$(ARCH64)/ipfstat mode=0555 diff --git a/usr/src/pkg/manifests/service-fault-management.mf b/usr/src/pkg/manifests/service-fault-management.mf index 060dd443fc..e5f6f21db1 100644 --- a/usr/src/pkg/manifests/service-fault-management.mf +++ b/usr/src/pkg/manifests/service-fault-management.mf @@ -104,13 +104,13 @@ dir path=usr/lib/locale/C/LC_MESSAGES variant.opensolaris.zone=__NODEFAULT dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/proc group=sys dir path=usr/platform group=sys -$(i386_ONLY)dir path=usr/platform/i86pc group=sys -$(i386_ONLY)dir path=usr/platform/i86pc/lib -$(i386_ONLY)dir path=usr/platform/i86pc/lib/fm -$(i386_ONLY)dir path=usr/platform/i86pc/lib/fm/eft -$(i386_ONLY)dir path=usr/platform/i86pc/lib/fm/topo -$(i386_ONLY)dir path=usr/platform/i86pc/lib/fm/topo/maps -$(i386_ONLY)dir path=usr/platform/i86pc/lib/fm/topo/plugins +dir path=usr/platform/i86pc group=sys +dir path=usr/platform/i86pc/lib +dir path=usr/platform/i86pc/lib/fm +dir path=usr/platform/i86pc/lib/fm/eft +dir path=usr/platform/i86pc/lib/fm/topo +dir path=usr/platform/i86pc/lib/fm/topo/maps +dir path=usr/platform/i86pc/lib/fm/topo/plugins # # Some directories common to both global and non-global zones: # @@ -211,7 +211,7 @@ file path=usr/lib/fm/$(ARCH64)/libtopo.so.1 \ # Dictionaries, whether they are hardware-specific or not, are # common to both global and non-global zones. # -$(i386_ONLY)file path=usr/lib/fm/dict/AMD.dict mode=0444 \ +file path=usr/lib/fm/dict/AMD.dict mode=0444 \ variant.opensolaris.zone=__NODEFAULT file path=usr/lib/fm/dict/DISK.dict mode=0444 \ variant.opensolaris.zone=__NODEFAULT @@ -219,9 +219,9 @@ file path=usr/lib/fm/dict/FMD.dict mode=0444 \ variant.opensolaris.zone=__NODEFAULT file path=usr/lib/fm/dict/FMNOTIFY.dict mode=0444 \ variant.opensolaris.zone=__NODEFAULT -$(i386_ONLY)file path=usr/lib/fm/dict/GMCA.dict mode=0444 \ +file path=usr/lib/fm/dict/GMCA.dict mode=0444 \ variant.opensolaris.zone=__NODEFAULT -$(i386_ONLY)file path=usr/lib/fm/dict/INTEL.dict mode=0444 \ +file path=usr/lib/fm/dict/INTEL.dict mode=0444 \ variant.opensolaris.zone=__NODEFAULT file path=usr/lib/fm/dict/NXGE.dict mode=0444 \ variant.opensolaris.zone=__NODEFAULT @@ -395,7 +395,7 @@ file path=usr/lib/fm/topo/plugins/xfp.so mode=0555 # Dictionaries, whether they are hardware-specific or not, are # common to both global and non-global zones. # -$(i386_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/AMD.mo mode=0444 \ +file path=usr/lib/locale/C/LC_MESSAGES/AMD.mo mode=0444 \ variant.opensolaris.zone=__NODEFAULT file path=usr/lib/locale/C/LC_MESSAGES/DISK.mo mode=0444 \ variant.opensolaris.zone=__NODEFAULT @@ -403,9 +403,9 @@ file path=usr/lib/locale/C/LC_MESSAGES/FMD.mo mode=0444 \ variant.opensolaris.zone=__NODEFAULT file path=usr/lib/locale/C/LC_MESSAGES/FMNOTIFY.mo mode=0444 \ variant.opensolaris.zone=__NODEFAULT -$(i386_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/GMCA.mo mode=0444 \ +file path=usr/lib/locale/C/LC_MESSAGES/GMCA.mo mode=0444 \ variant.opensolaris.zone=__NODEFAULT -$(i386_ONLY)file path=usr/lib/locale/C/LC_MESSAGES/INTEL.mo mode=0444 \ +file path=usr/lib/locale/C/LC_MESSAGES/INTEL.mo mode=0444 \ variant.opensolaris.zone=__NODEFAULT file path=usr/lib/locale/C/LC_MESSAGES/NXGE.mo mode=0444 \ variant.opensolaris.zone=__NODEFAULT @@ -433,52 +433,43 @@ file path=usr/lib/mdb/proc/fmd.so group=sys mode=0555 # # Platform-specific fmd plugins are global zone only # -$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/eft/$(ARCH64).eft mode=0444 -$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/eft/gcpu.eft mode=0444 -$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/eft/gcpu_amd.eft mode=0444 -$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/eft/intel.eft mode=0444 -$(i386_ONLY)file \ +file path=usr/platform/i86pc/lib/fm/eft/$(ARCH64).eft mode=0444 +file path=usr/platform/i86pc/lib/fm/eft/gcpu.eft mode=0444 +file path=usr/platform/i86pc/lib/fm/eft/gcpu_amd.eft mode=0444 +file path=usr/platform/i86pc/lib/fm/eft/intel.eft mode=0444 +file \ path=usr/platform/i86pc/lib/fm/topo/maps/Joyent-Compute-Platform-1101-disk-hc-topology.xml \ mode=0444 -$(i386_ONLY)file \ +file \ path=usr/platform/i86pc/lib/fm/topo/maps/Netra-X4200-M2-disk-hc-topology.xml \ mode=0444 -$(i386_ONLY)file \ +file \ path=usr/platform/i86pc/lib/fm/topo/maps/Sun-Fire-X4200-M2-disk-hc-topology.xml \ mode=0444 -$(i386_ONLY)file \ +file \ path=usr/platform/i86pc/lib/fm/topo/maps/Sun-Fire-X4200-Server-disk-hc-topology.xml \ mode=0444 -$(i386_ONLY)file \ +file \ path=usr/platform/i86pc/lib/fm/topo/maps/Sun-Fire-X4500-disk-hc-topology.xml \ mode=0444 -$(i386_ONLY)file \ +file \ path=usr/platform/i86pc/lib/fm/topo/maps/Sun-Fire-X4540-disk-hc-topology.xml \ mode=0444 -$(i386_ONLY)file \ +file \ path=usr/platform/i86pc/lib/fm/topo/maps/Sun-Fire-X4600-M2-disk-hc-topology.xml \ mode=0444 -$(i386_ONLY)file \ - path=usr/platform/i86pc/lib/fm/topo/maps/chassis-hc-topology.xml \ +file path=usr/platform/i86pc/lib/fm/topo/maps/chassis-hc-topology.xml \ mode=0444 -$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/maps/chip-hc-topology.xml \ +file path=usr/platform/i86pc/lib/fm/topo/maps/chip-hc-topology.xml mode=0444 +file path=usr/platform/i86pc/lib/fm/topo/maps/fan-hc-topology.xml mode=0444 +file path=usr/platform/i86pc/lib/fm/topo/maps/i86pc-hc-topology.xml mode=0444 +file path=usr/platform/i86pc/lib/fm/topo/maps/i86pc-legacy-hc-topology.xml \ mode=0444 -$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/maps/fan-hc-topology.xml \ - mode=0444 -$(i386_ONLY)file \ - path=usr/platform/i86pc/lib/fm/topo/maps/i86pc-hc-topology.xml mode=0444 -$(i386_ONLY)file \ - path=usr/platform/i86pc/lib/fm/topo/maps/i86pc-legacy-hc-topology.xml \ - mode=0444 -$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/maps/psu-hc-topology.xml \ - mode=0444 -$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/plugins/chip.so mode=0555 -$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/plugins/hostbridge.so \ - mode=0555 -$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/plugins/pcibus.so \ - mode=0555 -$(i386_ONLY)file path=usr/platform/i86pc/lib/fm/topo/plugins/x86pi.so \ - mode=0555 +file path=usr/platform/i86pc/lib/fm/topo/maps/psu-hc-topology.xml mode=0444 +file path=usr/platform/i86pc/lib/fm/topo/plugins/chip.so mode=0555 +file path=usr/platform/i86pc/lib/fm/topo/plugins/hostbridge.so mode=0555 +file path=usr/platform/i86pc/lib/fm/topo/plugins/pcibus.so mode=0555 +file path=usr/platform/i86pc/lib/fm/topo/plugins/x86pi.so mode=0555 # # Administrative utilities are common to both contexts # diff --git a/usr/src/pkg/manifests/system-boot-loader.mf b/usr/src/pkg/manifests/system-boot-loader.mf dissimilarity index 71% index 37f8cef5e7..3665536304 100644 --- a/usr/src/pkg/manifests/system-boot-loader.mf +++ b/usr/src/pkg/manifests/system-boot-loader.mf @@ -1,103 +1,103 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2016, Toomas Soome -# - -# -# 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 -# information about overriding the defaults. -# - -set name=pkg.fmri \ - value=pkg:/system/boot/loader@1.1,$(PKGVERS_BUILTON)$(PKGVERS_BRANCH) -$(i386_ONLY)set name=pkg.description value="Boot Loader" -$(i386_ONLY)set name=pkg.summary value="BootForth Boot Loader" -set name=info.classification value=org.opensolaris.category.2008:System/Core -set name=variant.arch value=$(ARCH) -$(i386_ONLY)dir path=boot group=sys -$(i386_ONLY)dir path=boot/conf.d group=sys -$(i386_ONLY)dir path=boot/defaults group=sys -$(i386_ONLY)dir path=boot/forth group=sys -$(i386_ONLY)dir path=usr/share/man -$(i386_ONLY)dir path=usr/share/man/man3 -$(i386_ONLY)dir path=usr/share/man/man4 -$(i386_ONLY)dir path=usr/share/man/man5 -$(i386_ONLY)file path=boot/bootia32.efi group=sys mode=0555 -$(i386_ONLY)file path=boot/bootx64.efi group=sys mode=0555 -$(i386_ONLY)file path=boot/cdboot group=sys mode=0444 -$(i386_ONLY)file path=boot/defaults/loader.conf group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/beadm.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/beastie.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/brand-dilos.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/brand-hipster.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/brand-illumos.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/brand-omnios.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/brand-unleashed.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/brand.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/check-password.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/color.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/delay.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/efi.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/frames.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/loader.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/logo-beastie.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/logo-beastiebw.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/logo-fbsdbw.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/logo-illumos.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/logo-orb.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/logo-orbbw.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/logo-unleashed.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/menu-commands.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/menu.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/menu.rc group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/menusets.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/pcibios.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/screen.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/shortcuts.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/support.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/forth/version.4th group=sys mode=0444 -$(i386_ONLY)file path=boot/gptzfsboot group=sys mode=0444 -$(i386_ONLY)file path=boot/loader group=sys mode=0444 -$(i386_ONLY)file path=boot/loader.help group=sys mode=0444 -$(i386_ONLY)file path=boot/loader.rc group=sys mode=0444 -$(i386_ONLY)file path=boot/loader32.efi group=sys mode=0555 -$(i386_ONLY)file path=boot/loader64.efi group=sys mode=0555 -$(i386_ONLY)file path=boot/pmbr group=sys mode=0444 -$(i386_ONLY)file path=boot/pxeboot group=sys mode=0444 -$(i386_ONLY)file path=usr/share/man/man4/loader.conf.4 -$(i386_ONLY)file path=usr/share/man/man5/brand.4th.5 -$(i386_ONLY)file path=usr/share/man/man5/check-password.4th.5 -$(i386_ONLY)file path=usr/share/man/man5/color.4th.5 -$(i386_ONLY)file path=usr/share/man/man5/delay.4th.5 -$(i386_ONLY)file path=usr/share/man/man5/gptzfsboot.5 -$(i386_ONLY)file path=usr/share/man/man5/loader.4th.5 -$(i386_ONLY)file path=usr/share/man/man5/loader.5 -$(i386_ONLY)file path=usr/share/man/man5/menu.4th.5 -$(i386_ONLY)file path=usr/share/man/man5/menusets.4th.5 -$(i386_ONLY)file path=usr/share/man/man5/pxeboot.5 -$(i386_ONLY)file path=usr/share/man/man5/version.4th.5 -license lic_CDDL license=lic_CDDL -license usr/src/boot/COPYRIGHT license=usr/src/boot/COPYRIGHT -license usr/src/boot/sys/boot/common/linenoise/LICENSE \ - license=usr/src/boot/sys/boot/common/linenoise/LICENSE +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright 2016, Toomas Soome +# + +# +# 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 +# information about overriding the defaults. +# + +set name=pkg.fmri \ + value=pkg:/system/boot/loader@1.1,$(PKGVERS_BUILTON)$(PKGVERS_BRANCH) +set name=pkg.description value="Boot Loader" +set name=pkg.summary value="BootForth Boot Loader" +set name=info.classification value=org.opensolaris.category.2008:System/Core +set name=variant.arch value=$(ARCH) +dir path=boot group=sys +dir path=boot/conf.d group=sys +dir path=boot/defaults group=sys +dir path=boot/forth group=sys +dir path=usr/share/man +dir path=usr/share/man/man3 +dir path=usr/share/man/man4 +dir path=usr/share/man/man5 +file path=boot/bootia32.efi group=sys mode=0555 +file path=boot/bootx64.efi group=sys mode=0555 +file path=boot/cdboot group=sys mode=0444 +file path=boot/defaults/loader.conf group=sys mode=0444 +file path=boot/forth/beadm.4th group=sys mode=0444 +file path=boot/forth/beastie.4th group=sys mode=0444 +file path=boot/forth/brand-dilos.4th group=sys mode=0444 +file path=boot/forth/brand-hipster.4th group=sys mode=0444 +file path=boot/forth/brand-illumos.4th group=sys mode=0444 +file path=boot/forth/brand-omnios.4th group=sys mode=0444 +file path=boot/forth/brand-unleashed.4th group=sys mode=0444 +file path=boot/forth/brand.4th group=sys mode=0444 +file path=boot/forth/check-password.4th group=sys mode=0444 +file path=boot/forth/color.4th group=sys mode=0444 +file path=boot/forth/delay.4th group=sys mode=0444 +file path=boot/forth/efi.4th group=sys mode=0444 +file path=boot/forth/frames.4th group=sys mode=0444 +file path=boot/forth/loader.4th group=sys mode=0444 +file path=boot/forth/logo-beastie.4th group=sys mode=0444 +file path=boot/forth/logo-beastiebw.4th group=sys mode=0444 +file path=boot/forth/logo-fbsdbw.4th group=sys mode=0444 +file path=boot/forth/logo-illumos.4th group=sys mode=0444 +file path=boot/forth/logo-orb.4th group=sys mode=0444 +file path=boot/forth/logo-orbbw.4th group=sys mode=0444 +file path=boot/forth/logo-unleashed.4th group=sys mode=0444 +file path=boot/forth/menu-commands.4th group=sys mode=0444 +file path=boot/forth/menu.4th group=sys mode=0444 +file path=boot/forth/menu.rc group=sys mode=0444 +file path=boot/forth/menusets.4th group=sys mode=0444 +file path=boot/forth/pcibios.4th group=sys mode=0444 +file path=boot/forth/screen.4th group=sys mode=0444 +file path=boot/forth/shortcuts.4th group=sys mode=0444 +file path=boot/forth/support.4th group=sys mode=0444 +file path=boot/forth/version.4th group=sys mode=0444 +file path=boot/gptzfsboot group=sys mode=0444 +file path=boot/loader group=sys mode=0444 +file path=boot/loader.help group=sys mode=0444 +file path=boot/loader.rc group=sys mode=0444 +file path=boot/loader32.efi group=sys mode=0555 +file path=boot/loader64.efi group=sys mode=0555 +file path=boot/pmbr group=sys mode=0444 +file path=boot/pxeboot group=sys mode=0444 +file path=usr/share/man/man4/loader.conf.4 +file path=usr/share/man/man5/brand.4th.5 +file path=usr/share/man/man5/check-password.4th.5 +file path=usr/share/man/man5/color.4th.5 +file path=usr/share/man/man5/delay.4th.5 +file path=usr/share/man/man5/gptzfsboot.5 +file path=usr/share/man/man5/loader.4th.5 +file path=usr/share/man/man5/loader.5 +file path=usr/share/man/man5/menu.4th.5 +file path=usr/share/man/man5/menusets.4th.5 +file path=usr/share/man/man5/pxeboot.5 +file path=usr/share/man/man5/version.4th.5 +license lic_CDDL license=lic_CDDL +license usr/src/boot/COPYRIGHT license=usr/src/boot/COPYRIGHT +license usr/src/boot/sys/boot/common/linenoise/LICENSE \ + license=usr/src/boot/sys/boot/common/linenoise/LICENSE diff --git a/usr/src/pkg/manifests/system-boot-real-mode.mf b/usr/src/pkg/manifests/system-boot-real-mode.mf index 679b2c069f..b882043c7a 100644 --- a/usr/src/pkg/manifests/system-boot-real-mode.mf +++ b/usr/src/pkg/manifests/system-boot-real-mode.mf @@ -29,17 +29,17 @@ set name=pkg.description value="Realmode Modules" set name=pkg.summary value="Realmode Modules" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) -$(i386_ONLY)dir path=boot group=sys -$(i386_ONLY)dir path=boot/solaris group=sys -$(i386_ONLY)dir path=boot/solaris/devicedb group=sys -$(i386_ONLY)dir path=usr group=sys -$(i386_ONLY)dir path=usr/lib -$(i386_ONLY)dir path=usr/lib/fs group=sys -$(i386_ONLY)dir path=usr/lib/fs/ufs group=sys -$(i386_ONLY)file path=boot/solaris/bootenv.rc group=sys preserve=renamenew -$(i386_ONLY)file path=boot/solaris/devicedb/master group=sys preserve=true -$(i386_ONLY)file path=boot/splashimage.xpm group=sys -$(i386_ONLY)file path=usr/lib/fs/ufs/mboot mode=0444 -$(i386_ONLY)hardlink path=boot/solaris.xpm target=splashimage.xpm -$(i386_ONLY)license cr_Sun license=cr_Sun -$(i386_ONLY)license lic_CDDL license=lic_CDDL +dir path=boot group=sys +dir path=boot/solaris group=sys +dir path=boot/solaris/devicedb group=sys +dir path=usr group=sys +dir path=usr/lib +dir path=usr/lib/fs group=sys +dir path=usr/lib/fs/ufs group=sys +file path=boot/solaris/bootenv.rc group=sys preserve=renamenew +file path=boot/solaris/devicedb/master group=sys preserve=true +file path=boot/splashimage.xpm group=sys +file path=usr/lib/fs/ufs/mboot mode=0444 +hardlink path=boot/solaris.xpm target=splashimage.xpm +license cr_Sun license=cr_Sun +license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-core-os.mf b/usr/src/pkg/manifests/system-core-os.mf index 5e24cff33d..f660de293c 100644 --- a/usr/src/pkg/manifests/system-core-os.mf +++ b/usr/src/pkg/manifests/system-core-os.mf @@ -224,7 +224,7 @@ dir path=usr/net/servers group=sys dir path=usr/old dir path=usr/platform group=sys dir path=usr/sbin -$(i386_ONLY)dir path=usr/sbin/$(ARCH32) +dir path=usr/sbin/$(ARCH32) dir path=usr/sbin/$(ARCH64) dir path=usr/share dir path=usr/share/lib @@ -496,7 +496,7 @@ file path=lib/svc/manifest/system/filesystem/minimal-fs.xml group=sys \ mode=0444 file path=lib/svc/manifest/system/filesystem/root-fs.xml group=sys mode=0444 file path=lib/svc/manifest/system/filesystem/usr-fs.xml group=sys mode=0444 -$(i386_ONLY)file path=lib/svc/manifest/system/hostid.xml group=sys mode=0444 +file path=lib/svc/manifest/system/hostid.xml group=sys mode=0444 file path=lib/svc/manifest/system/hotplug.xml group=sys mode=0444 file path=lib/svc/manifest/system/identity.xml group=sys mode=0444 file path=lib/svc/manifest/system/idmap.xml group=sys mode=0444 @@ -552,7 +552,7 @@ file path=lib/svc/method/svc-boot-config mode=0555 file path=lib/svc/method/svc-consadm mode=0555 file path=lib/svc/method/svc-cron mode=0555 file path=lib/svc/method/svc-dlmgmtd mode=0555 -$(i386_ONLY)file path=lib/svc/method/svc-hostid mode=0555 +file path=lib/svc/method/svc-hostid mode=0555 file path=lib/svc/method/svc-hotplug mode=0555 file path=lib/svc/method/svc-nscd mode=0555 file path=lib/svc/method/svc-sockfilter mode=0555 @@ -575,7 +575,7 @@ file path=lib/svc/share/smf_include.sh mode=0444 file path=root/.bashrc group=root preserve=true file path=root/.profile group=root preserve=true file path=sbin/autopush mode=0555 -$(i386_ONLY)file path=sbin/biosdev mode=0555 +file path=sbin/biosdev mode=0555 file path=sbin/bootadm mode=0555 file path=sbin/cryptoadm mode=0555 file path=sbin/devprop mode=0555 @@ -608,16 +608,16 @@ file path=sbin/uadmin group=sys mode=0555 file path=sbin/umount mode=0555 file path=sbin/umountall group=sys mode=0555 file path=sbin/zonename mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/amt mode=0555 +file path=usr/bin/$(ARCH32)/amt mode=0555 file path=usr/bin/$(ARCH32)/decrypt mode=0555 file path=usr/bin/$(ARCH32)/digest mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/newtask group=sys mode=4555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/nohup mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/prctl mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/prstat mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/ps mode=0555 +file path=usr/bin/$(ARCH32)/newtask group=sys mode=4555 +file path=usr/bin/$(ARCH32)/nohup mode=0555 +file path=usr/bin/$(ARCH32)/prctl mode=0555 +file path=usr/bin/$(ARCH32)/prstat mode=0555 +file path=usr/bin/$(ARCH32)/ps mode=0555 file path=usr/bin/$(ARCH32)/savecore mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/uptime mode=4555 +file path=usr/bin/$(ARCH32)/uptime mode=4555 file path=usr/bin/$(ARCH64)/amt mode=0555 file path=usr/bin/$(ARCH64)/crle mode=0555 file path=usr/bin/$(ARCH64)/decrypt mode=0555 @@ -660,7 +660,7 @@ file path=usr/bin/devattr mode=0555 file path=usr/bin/devfree mode=0555 file path=usr/bin/devreserv mode=0555 file path=usr/bin/dirname mode=0555 -$(i386_ONLY)file path=usr/bin/diskscan mode=0555 +file path=usr/bin/diskscan mode=0555 file path=usr/bin/domainname mode=0555 file path=usr/bin/du mode=0555 file path=usr/bin/dumpcs mode=0555 @@ -1169,7 +1169,7 @@ file path=usr/sbin/ping mode=4555 file path=usr/sbin/pmadm group=sys mode=0555 file path=usr/sbin/praudit mode=0555 file path=usr/sbin/prtconf group=sys mode=2555 -$(i386_ONLY)file path=usr/sbin/prtdiag group=sys mode=2755 +file path=usr/sbin/prtdiag group=sys mode=2755 file path=usr/sbin/prtvtoc group=sys mode=0555 file path=usr/sbin/psradm group=sys mode=0555 file path=usr/sbin/psrinfo group=sys mode=0555 @@ -1181,7 +1181,7 @@ file path=usr/sbin/rctladm mode=0555 file path=usr/sbin/rem_drv group=sys mode=0555 file path=usr/sbin/root_archive group=sys mode=0555 file path=usr/sbin/rpcbind mode=0555 -$(i386_ONLY)file path=usr/sbin/rtc mode=0555 +file path=usr/sbin/rtc mode=0555 file path=usr/sbin/sacadm group=sys mode=4755 file path=usr/sbin/setmnt mode=0555 file path=usr/sbin/shareall mode=0555 @@ -1207,7 +1207,7 @@ file path=usr/sbin/tar mode=0555 file path=usr/sbin/traceroute mode=4555 file path=usr/sbin/trapstat mode=0555 file path=usr/sbin/ttyadm group=sys mode=0755 -$(i386_ONLY)file path=usr/sbin/ucodeadm mode=0555 +file path=usr/sbin/ucodeadm mode=0555 file path=usr/sbin/umountall group=sys mode=0555 file path=usr/sbin/unlink mode=0555 file path=usr/sbin/unshareall mode=0555 @@ -1243,7 +1243,7 @@ hardlink path=sbin/rc5 target=../sbin/rc0 hardlink path=sbin/rc6 target=../sbin/rc0 hardlink path=usr/bin/$(ARCH32)/encrypt target=decrypt hardlink path=usr/bin/$(ARCH32)/mac target=digest -$(i386_ONLY)hardlink path=usr/bin/$(ARCH32)/w target=uptime +hardlink path=usr/bin/$(ARCH32)/w target=uptime hardlink path=usr/bin/$(ARCH64)/encrypt target=decrypt hardlink path=usr/bin/$(ARCH64)/mac target=digest hardlink path=usr/bin/$(ARCH64)/w target=uptime diff --git a/usr/src/pkg/manifests/system-dtrace-tests.mf b/usr/src/pkg/manifests/system-dtrace-tests.mf index 0702cf1f71..ee232da36f 100644 --- a/usr/src/pkg/manifests/system-dtrace-tests.mf +++ b/usr/src/pkg/manifests/system-dtrace-tests.mf @@ -37,8 +37,8 @@ dir path=opt/SUNWdtrt/bin/$(ARCH64) dir path=opt/SUNWdtrt/tst dir path=opt/SUNWdtrt/tst/$(ARCH) dir path=opt/SUNWdtrt/tst/$(ARCH)/arrays -$(i386_ONLY)dir path=opt/SUNWdtrt/tst/$(ARCH)/error -$(i386_ONLY)dir path=opt/SUNWdtrt/tst/$(ARCH)/funcs +dir path=opt/SUNWdtrt/tst/$(ARCH)/error +dir path=opt/SUNWdtrt/tst/$(ARCH)/funcs dir path=opt/SUNWdtrt/tst/$(ARCH)/pid dir path=opt/SUNWdtrt/tst/$(ARCH)/ustack dir path=opt/SUNWdtrt/tst/common @@ -133,28 +133,23 @@ file path=opt/SUNWdtrt/bin/dstyle mode=0555 file path=opt/SUNWdtrt/bin/dtest mode=0555 file path=opt/SUNWdtrt/bin/dtfailures mode=0555 file path=opt/SUNWdtrt/tst/$(ARCH)/arrays/tst.uregsarray.d mode=0444 -$(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/error/tst.DTRACEFLT_DIVZERO.d \ - mode=0444 -$(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/funcs/tst.badcopyin.d mode=0444 -$(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/funcs/tst.badcopyinstr.d \ - mode=0444 -$(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/funcs/tst.badcopyout.d \ - mode=0444 -$(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/funcs/tst.badcopyoutstr.d \ - mode=0444 -$(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.badinstr.d mode=0444 -$(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.badinstr.exe mode=0555 +file path=opt/SUNWdtrt/tst/$(ARCH)/error/tst.DTRACEFLT_DIVZERO.d mode=0444 +file path=opt/SUNWdtrt/tst/$(ARCH)/funcs/tst.badcopyin.d mode=0444 +file path=opt/SUNWdtrt/tst/$(ARCH)/funcs/tst.badcopyinstr.d mode=0444 +file path=opt/SUNWdtrt/tst/$(ARCH)/funcs/tst.badcopyout.d mode=0444 +file path=opt/SUNWdtrt/tst/$(ARCH)/funcs/tst.badcopyoutstr.d mode=0444 +file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.badinstr.d mode=0444 +file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.badinstr.exe mode=0555 file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.branch.d mode=0444 file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.branch.exe mode=0555 file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.embedded.d mode=0444 file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.embedded.exe mode=0555 -$(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.ret.d mode=0444 -$(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.ret.exe mode=0555 -$(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.retlist.exe mode=0555 -$(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.retlist.ksh mode=0444 -$(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.uregswrite.d mode=0444 -$(i386_ONLY)file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.uregswrite.exe \ - mode=0555 +file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.ret.d mode=0444 +file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.ret.exe mode=0555 +file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.retlist.exe mode=0555 +file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.retlist.ksh mode=0444 +file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.uregswrite.d mode=0444 +file path=opt/SUNWdtrt/tst/$(ARCH)/pid/tst.uregswrite.exe mode=0555 file path=opt/SUNWdtrt/tst/$(ARCH)/ustack/tst.annotated.d mode=0444 file path=opt/SUNWdtrt/tst/$(ARCH)/ustack/tst.annotated.d.out mode=0444 file path=opt/SUNWdtrt/tst/$(ARCH)/ustack/tst.annotated.exe mode=0555 diff --git a/usr/src/pkg/manifests/system-extended-system-utilities.mf b/usr/src/pkg/manifests/system-extended-system-utilities.mf index 07b6c8fc7f..b1e3dc6cbf 100644 --- a/usr/src/pkg/manifests/system-extended-system-utilities.mf +++ b/usr/src/pkg/manifests/system-extended-system-utilities.mf @@ -33,7 +33,7 @@ set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) dir path=usr group=sys dir path=usr/bin -$(i386_ONLY)dir path=usr/bin/$(ARCH32) +dir path=usr/bin/$(ARCH32) dir path=usr/bin/$(ARCH64) dir path=usr/lib dir path=usr/lib/$(ARCH64) @@ -50,27 +50,27 @@ dir path=usr/share/lib/dict dir path=usr/share/man/man1 dir path=usr/share/man/man5 dir path=usr/share/man/man8 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/pargs mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/pcred mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/pfiles mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/pflags mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/pldd mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/plgrp mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/pmadvise mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/pmap mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/ppgsz mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/ppriv mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/preap mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/prun mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/psecflags mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/psig mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/pstack mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/pstop mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/ptime mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/ptree mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/pwait mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/pwdx mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/sort mode=0555 +file path=usr/bin/$(ARCH32)/pargs mode=0555 +file path=usr/bin/$(ARCH32)/pcred mode=0555 +file path=usr/bin/$(ARCH32)/pfiles mode=0555 +file path=usr/bin/$(ARCH32)/pflags mode=0555 +file path=usr/bin/$(ARCH32)/pldd mode=0555 +file path=usr/bin/$(ARCH32)/plgrp mode=0555 +file path=usr/bin/$(ARCH32)/pmadvise mode=0555 +file path=usr/bin/$(ARCH32)/pmap mode=0555 +file path=usr/bin/$(ARCH32)/ppgsz mode=0555 +file path=usr/bin/$(ARCH32)/ppriv mode=0555 +file path=usr/bin/$(ARCH32)/preap mode=0555 +file path=usr/bin/$(ARCH32)/prun mode=0555 +file path=usr/bin/$(ARCH32)/psecflags mode=0555 +file path=usr/bin/$(ARCH32)/psig mode=0555 +file path=usr/bin/$(ARCH32)/pstack mode=0555 +file path=usr/bin/$(ARCH32)/pstop mode=0555 +file path=usr/bin/$(ARCH32)/ptime mode=0555 +file path=usr/bin/$(ARCH32)/ptree mode=0555 +file path=usr/bin/$(ARCH32)/pwait mode=0555 +file path=usr/bin/$(ARCH32)/pwdx mode=0555 +file path=usr/bin/$(ARCH32)/sort mode=0555 file path=usr/bin/$(ARCH64)/pargs mode=0555 file path=usr/bin/$(ARCH64)/pcred mode=0555 file path=usr/bin/$(ARCH64)/pfiles mode=0555 diff --git a/usr/src/pkg/manifests/system-file-system-zfs-tests.mf b/usr/src/pkg/manifests/system-file-system-zfs-tests.mf index 41e10d1c72..45c187257e 100644 --- a/usr/src/pkg/manifests/system-file-system-zfs-tests.mf +++ b/usr/src/pkg/manifests/system-file-system-zfs-tests.mf @@ -34,7 +34,7 @@ dir path=kernel group=sys dir path=kernel/drv group=sys dir path=usr group=sys dir path=usr/bin -$(i386_ONLY)dir path=usr/bin/$(ARCH32) +dir path=usr/bin/$(ARCH32) dir path=usr/bin/$(ARCH64) dir path=usr/include dir path=usr/include/sys @@ -43,20 +43,20 @@ dir path=usr/lib dir path=usr/lib/devfsadm group=sys dir path=usr/lib/devfsadm/linkmod group=sys dir path=usr/sbin -$(i386_ONLY)dir path=usr/sbin/$(ARCH32) +dir path=usr/sbin/$(ARCH32) dir path=usr/sbin/$(ARCH64) driver name=zut perms="* 0666 root sys" file path=kernel/drv/zut group=sys file path=kernel/drv/zut.conf group=sys -$(i386_ONLY)file path=usr/bin/$(ARCH32)/zlook mode=0555 -$(i386_ONLY)file path=usr/bin/$(ARCH32)/ztest mode=0555 +file path=usr/bin/$(ARCH32)/zlook mode=0555 +file path=usr/bin/$(ARCH32)/ztest mode=0555 file path=usr/bin/$(ARCH64)/zlook mode=0555 file path=usr/bin/$(ARCH64)/ztest mode=0555 file path=usr/bin/zloop mode=0555 file path=usr/include/sys/fs/zut.h file path=usr/lib/devfsadm/linkmod/SUNW_zut_link.so group=sys -$(i386_ONLY)file path=usr/sbin/$(ARCH32)/zhack mode=0555 -$(i386_ONLY)file path=usr/sbin/$(ARCH32)/zinject mode=0555 +file path=usr/sbin/$(ARCH32)/zhack mode=0555 +file path=usr/sbin/$(ARCH32)/zinject mode=0555 file path=usr/sbin/$(ARCH64)/zhack mode=0555 file path=usr/sbin/$(ARCH64)/zinject mode=0555 hardlink path=usr/bin/zlook target=../../usr/lib/isaexec diff --git a/usr/src/pkg/manifests/system-file-system-zfs.inc b/usr/src/pkg/manifests/system-file-system-zfs.inc index d76cbd91bf..e32bc32bfc 100644 --- a/usr/src/pkg/manifests/system-file-system-zfs.inc +++ b/usr/src/pkg/manifests/system-file-system-zfs.inc @@ -53,12 +53,12 @@ dir path=usr/lib/mdb group=sys dir path=usr/lib/mdb/kvm group=sys dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys dir path=usr/lib/mdb/proc group=sys -$(i386_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) +dir path=usr/lib/mdb/proc/$(ARCH64) dir path=usr/lib/sysevent dir path=usr/lib/sysevent/modules dir path=usr/lib/zfs dir path=usr/sbin -$(i386_ONLY)dir path=usr/sbin/$(ARCH32) +dir path=usr/sbin/$(ARCH32) dir path=usr/sbin/$(ARCH64) dir path=usr/share/man/man8 driver name=zfs perms="* 0600 root sys" perms="zfs 0666 root sys" @@ -78,12 +78,12 @@ file path=usr/lib/$(ARCH64)/libzpool.so.1 file path=usr/lib/devfsadm/linkmod/SUNW_zfs_link.so group=sys file path=usr/lib/fs/zfs/bootinstall mode=0555 file path=usr/lib/fs/zfs/fstyp.so.1 mode=0555 -$(i386_ONLY)file path=usr/lib/libzpool.so.1 +file path=usr/lib/libzpool.so.1 file path=usr/lib/mdb/kvm/$(ARCH64)/zfs.so group=sys mode=0555 file path=usr/lib/mdb/proc/$(ARCH64)/libzpool.so group=sys mode=0555 file path=usr/lib/mdb/proc/libzpool.so group=sys mode=0555 file path=usr/lib/sysevent/modules/zfs_mod.so group=sys -$(i386_ONLY)file path=usr/sbin/$(ARCH32)/zdb mode=0555 +file path=usr/sbin/$(ARCH32)/zdb mode=0555 file path=usr/sbin/$(ARCH64)/zdb mode=0555 file path=usr/sbin/zstreamdump mode=0555 file path=usr/share/man/man8/zdb.8 @@ -122,6 +122,6 @@ link path=usr/lib/libzfs.so target=../../lib/libzfs.so.1 link path=usr/lib/libzfs.so.1 target=../../lib/libzfs.so.1 link path=usr/lib/libzfs_core.so target=../../lib/libzfs_core.so.1 link path=usr/lib/libzfs_core.so.1 target=../../lib/libzfs_core.so.1 -$(i386_ONLY)link path=usr/lib/libzpool.so target=libzpool.so.1 +link path=usr/lib/libzpool.so target=libzpool.so.1 link path=usr/sbin/zfs target=../../sbin/zfs link path=usr/sbin/zpool target=../../sbin/zpool diff --git a/usr/src/pkg/manifests/system-fru-id-platform.mf b/usr/src/pkg/manifests/system-fru-id-platform.mf index 8de4e85664..c755cdc138 100644 --- a/usr/src/pkg/manifests/system-fru-id-platform.mf +++ b/usr/src/pkg/manifests/system-fru-id-platform.mf @@ -31,11 +31,11 @@ set name=info.classification \ value="org.opensolaris.category.2008:System/Administration and Configuration" set name=variant.arch value=$(ARCH) dir path=usr group=sys -$(i386_ONLY)dir path=usr/lib -$(i386_ONLY)dir path=usr/lib/picl group=sys -$(i386_ONLY)dir path=usr/lib/picl/plugins group=sys +dir path=usr/lib +dir path=usr/lib/picl group=sys +dir path=usr/lib/picl/plugins group=sys dir path=usr/share/man/man8 -$(i386_ONLY)file path=usr/lib/picl/plugins/fru_container.conf group=sys +file path=usr/lib/picl/plugins/fru_container.conf group=sys file path=usr/share/man/man8/fruadm.8 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-header.mf b/usr/src/pkg/manifests/system-header.mf index 7b94bd530d..58abfce40a 100644 --- a/usr/src/pkg/manifests/system-header.mf +++ b/usr/src/pkg/manifests/system-header.mf @@ -36,8 +36,8 @@ set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) dir path=usr group=sys dir path=usr/include -$(i386_ONLY)dir path=usr/include/$(ARCH64) -$(i386_ONLY)dir path=usr/include/$(ARCH64)/sys +dir path=usr/include/$(ARCH64) +dir path=usr/include/$(ARCH64)/sys dir path=usr/include/ads dir path=usr/include/arpa dir path=usr/include/asm @@ -46,8 +46,8 @@ dir path=usr/include/dat dir path=usr/include/des dir path=usr/include/gssapi dir path=usr/include/hal -$(i386_ONLY)dir path=usr/include/ia32 -$(i386_ONLY)dir path=usr/include/ia32/sys +dir path=usr/include/ia32 +dir path=usr/include/ia32/sys dir path=usr/include/inet dir path=usr/include/ipp dir path=usr/include/ipp/ipgpc @@ -103,7 +103,7 @@ dir path=usr/include/sys/ib/mgt/ibmf dir path=usr/include/sys/iso dir path=usr/include/sys/proc dir path=usr/include/sys/rsm -$(i386_ONLY)dir path=usr/include/sys/sata group=sys +dir path=usr/include/sys/sata group=sys dir path=usr/include/sys/scsi dir path=usr/include/sys/scsi/adapters dir path=usr/include/sys/scsi/conf @@ -114,19 +114,19 @@ dir path=usr/include/sys/sysevent dir path=usr/include/uuid dir path=usr/include/vm dir path=usr/platform group=sys -$(i386_ONLY)dir path=usr/platform/$(CONFIG_PLATFORM) group=sys -$(i386_ONLY)dir path=usr/platform/$(CONFIG_PLATFORM)/include -$(i386_ONLY)dir path=usr/platform/$(CONFIG_PLATFORM)/include/sys -$(i386_ONLY)dir path=usr/platform/$(CONFIG_PLATFORM)/include/vm +dir path=usr/platform/$(CONFIG_PLATFORM) group=sys +dir path=usr/platform/$(CONFIG_PLATFORM)/include +dir path=usr/platform/$(CONFIG_PLATFORM)/include/sys +dir path=usr/platform/$(CONFIG_PLATFORM)/include/vm dir path=usr/share dir path=usr/share/man dir path=usr/share/man/man3head dir path=usr/share/man/man4 dir path=usr/share/man/man5 dir path=usr/share/man/man7i -$(i386_ONLY)file path=usr/include/$(ARCH64)/sys/kdi_regs.h mode=0644 -$(i386_ONLY)file path=usr/include/$(ARCH64)/sys/privmregs.h mode=0644 -$(i386_ONLY)file path=usr/include/$(ARCH64)/sys/privregs.h mode=0644 +file path=usr/include/$(ARCH64)/sys/kdi_regs.h mode=0644 +file path=usr/include/$(ARCH64)/sys/privmregs.h mode=0644 +file path=usr/include/$(ARCH64)/sys/privregs.h mode=0644 file path=usr/include/ads/dsgetdc.h file path=usr/include/aio.h file path=usr/include/alloca.h @@ -140,14 +140,14 @@ file path=usr/include/arpa/nameser.h file path=usr/include/arpa/nameser_compat.h file path=usr/include/arpa/telnet.h file path=usr/include/arpa/tftp.h -$(i386_ONLY)file path=usr/include/asm/atomic.h mode=0644 -$(i386_ONLY)file path=usr/include/asm/bitmap.h mode=0644 -$(i386_ONLY)file path=usr/include/asm/byteorder.h mode=0644 -$(i386_ONLY)file path=usr/include/asm/clock.h mode=0644 -$(i386_ONLY)file path=usr/include/asm/cpu.h mode=0644 -$(i386_ONLY)file path=usr/include/asm/cpuvar.h mode=0644 -$(i386_ONLY)file path=usr/include/asm/htable.h mode=0644 -$(i386_ONLY)file path=usr/include/asm/mmu.h mode=0644 +file path=usr/include/asm/atomic.h mode=0644 +file path=usr/include/asm/bitmap.h mode=0644 +file path=usr/include/asm/byteorder.h mode=0644 +file path=usr/include/asm/clock.h mode=0644 +file path=usr/include/asm/cpu.h mode=0644 +file path=usr/include/asm/cpuvar.h mode=0644 +file path=usr/include/asm/htable.h mode=0644 +file path=usr/include/asm/mmu.h mode=0644 file path=usr/include/asm/sunddi.h mode=0644 file path=usr/include/asm/thread.h mode=0644 file path=usr/include/assert.h @@ -215,17 +215,17 @@ file path=usr/include/gssapi/gssapi.h mode=0644 file path=usr/include/gssapi/gssapi_ext.h mode=0644 file path=usr/include/hal/libhal-storage.h file path=usr/include/hal/libhal.h -$(i386_ONLY)file path=usr/include/ia32/sys/asm_linkage.h mode=0644 -$(i386_ONLY)file path=usr/include/ia32/sys/kdi_regs.h mode=0644 -$(i386_ONLY)file path=usr/include/ia32/sys/machtypes.h mode=0644 -$(i386_ONLY)file path=usr/include/ia32/sys/privmregs.h mode=0644 -$(i386_ONLY)file path=usr/include/ia32/sys/privregs.h mode=0644 -$(i386_ONLY)file path=usr/include/ia32/sys/psw.h mode=0644 -$(i386_ONLY)file path=usr/include/ia32/sys/pte.h mode=0644 -$(i386_ONLY)file path=usr/include/ia32/sys/reg.h mode=0644 -$(i386_ONLY)file path=usr/include/ia32/sys/stack.h mode=0644 -$(i386_ONLY)file path=usr/include/ia32/sys/trap.h mode=0644 -$(i386_ONLY)file path=usr/include/ia32/sys/traptrace.h mode=0644 +file path=usr/include/ia32/sys/asm_linkage.h mode=0644 +file path=usr/include/ia32/sys/kdi_regs.h mode=0644 +file path=usr/include/ia32/sys/machtypes.h mode=0644 +file path=usr/include/ia32/sys/privmregs.h mode=0644 +file path=usr/include/ia32/sys/privregs.h mode=0644 +file path=usr/include/ia32/sys/psw.h mode=0644 +file path=usr/include/ia32/sys/pte.h mode=0644 +file path=usr/include/ia32/sys/reg.h mode=0644 +file path=usr/include/ia32/sys/stack.h mode=0644 +file path=usr/include/ia32/sys/trap.h mode=0644 +file path=usr/include/ia32/sys/traptrace.h mode=0644 file path=usr/include/iconv.h file path=usr/include/idmap.h file path=usr/include/ieeefp.h @@ -313,7 +313,7 @@ file path=usr/include/libdllink.h file path=usr/include/libdlpi.h file path=usr/include/libdlvlan.h file path=usr/include/libelf.h -$(i386_ONLY)file path=usr/include/libfdisk.h +file path=usr/include/libfdisk.h file path=usr/include/libfstyp.h file path=usr/include/libfstyp_module.h file path=usr/include/libgen.h @@ -573,7 +573,7 @@ file path=usr/include/sip.h file path=usr/include/skein.h file path=usr/include/smbios.h file path=usr/include/spawn.h -$(i386_ONLY)file path=usr/include/stack_unwind.h +file path=usr/include/stack_unwind.h file path=usr/include/stdalign.h file path=usr/include/stdarg.h file path=usr/include/stdbool.h @@ -621,9 +621,9 @@ file path=usr/include/sys/blkdev.h file path=usr/include/sys/bofi.h file path=usr/include/sys/bofi_impl.h file path=usr/include/sys/bootconf.h -$(i386_ONLY)file path=usr/include/sys/bootregs.h +file path=usr/include/sys/bootregs.h file path=usr/include/sys/bootstat.h -$(i386_ONLY)file path=usr/include/sys/bootsvcs.h +file path=usr/include/sys/bootsvcs.h file path=usr/include/sys/bpp_io.h file path=usr/include/sys/brand.h file path=usr/include/sys/buf.h @@ -652,7 +652,7 @@ file path=usr/include/sys/contract/device_impl.h file path=usr/include/sys/contract/process.h file path=usr/include/sys/contract/process_impl.h file path=usr/include/sys/contract_impl.h -$(i386_ONLY)file path=usr/include/sys/controlregs.h +file path=usr/include/sys/controlregs.h file path=usr/include/sys/copyops.h file path=usr/include/sys/core.h file path=usr/include/sys/corectl.h @@ -703,7 +703,7 @@ file path=usr/include/sys/ddimapreq.h file path=usr/include/sys/ddipropdefs.h file path=usr/include/sys/dditypes.h file path=usr/include/sys/debug.h -$(i386_ONLY)file path=usr/include/sys/debugreg.h +file path=usr/include/sys/debugreg.h file path=usr/include/sys/des.h file path=usr/include/sys/devcache.h file path=usr/include/sys/devcache_impl.h @@ -720,15 +720,15 @@ file path=usr/include/sys/dkbad.h file path=usr/include/sys/dkio.h file path=usr/include/sys/dkioc_free_util.h file path=usr/include/sys/dklabel.h -$(i386_ONLY)file path=usr/include/sys/dktp/altsctr.h -$(i386_ONLY)file path=usr/include/sys/dktp/cmpkt.h +file path=usr/include/sys/dktp/altsctr.h +file path=usr/include/sys/dktp/cmpkt.h file path=usr/include/sys/dktp/dadkio.h file path=usr/include/sys/dktp/fdisk.h file path=usr/include/sys/dl.h file path=usr/include/sys/dld.h file path=usr/include/sys/dlpi.h file path=usr/include/sys/dls_mgmt.h -$(i386_ONLY)file path=usr/include/sys/dma_engine.h +file path=usr/include/sys/dma_engine.h file path=usr/include/sys/dma_i8237A.h file path=usr/include/sys/dnlc.h file path=usr/include/sys/door.h @@ -780,7 +780,7 @@ file path=usr/include/sys/feature_tests.h file path=usr/include/sys/fem.h file path=usr/include/sys/file.h file path=usr/include/sys/filio.h -$(i386_ONLY)file path=usr/include/sys/firmload.h +file path=usr/include/sys/firmload.h file path=usr/include/sys/flock.h file path=usr/include/sys/flock_impl.h file path=usr/include/sys/fm/fs/zfs.h @@ -793,7 +793,7 @@ file path=usr/include/sys/fm/io/sun4upci.h file path=usr/include/sys/fm/protocol.h file path=usr/include/sys/fm/util.h file path=usr/include/sys/fork.h -$(i386_ONLY)file path=usr/include/sys/fp.h +file path=usr/include/sys/fp.h file path=usr/include/sys/frame.h file path=usr/include/sys/fs/autofs.h file path=usr/include/sys/fs/decomp.h @@ -846,7 +846,7 @@ file path=usr/include/sys/ftrace.h file path=usr/include/sys/fx.h file path=usr/include/sys/fxpriocntl.h file path=usr/include/sys/gfs.h -$(i386_ONLY)file path=usr/include/sys/gfx_private.h +file path=usr/include/sys/gfx_private.h file path=usr/include/sys/gld.h file path=usr/include/sys/gldpriv.h file path=usr/include/sys/group.h @@ -859,8 +859,8 @@ file path=usr/include/sys/hotplug/hpctrl.h file path=usr/include/sys/hotplug/pci/pcicfg.h file path=usr/include/sys/hotplug/pci/pcihp.h file path=usr/include/sys/hwconf.h -$(i386_ONLY)file path=usr/include/sys/hypervisor.h -$(i386_ONLY)file path=usr/include/sys/i8272A.h +file path=usr/include/sys/hypervisor.h +file path=usr/include/sys/i8272A.h file path=usr/include/sys/ia.h file path=usr/include/sys/iapriocntl.h file path=usr/include/sys/ib/adapters/hermon/hermon_ioctl.h @@ -922,7 +922,7 @@ file path=usr/include/sys/int_types.h file path=usr/include/sys/inttypes.h file path=usr/include/sys/ioccom.h file path=usr/include/sys/ioctl.h -$(i386_ONLY)file path=usr/include/sys/iommulib.h +file path=usr/include/sys/iommulib.h file path=usr/include/sys/ipc.h file path=usr/include/sys/ipc_impl.h file path=usr/include/sys/ipc_rctl.h @@ -937,7 +937,7 @@ file path=usr/include/sys/kd.h file path=usr/include/sys/kdi.h file path=usr/include/sys/kdi_impl.h file path=usr/include/sys/kdi_machimpl.h -$(i386_ONLY)file path=usr/include/sys/kdi_regs.h +file path=usr/include/sys/kdi_regs.h file path=usr/include/sys/kiconv.h file path=usr/include/sys/kidmap.h file path=usr/include/sys/klpd.h @@ -977,11 +977,11 @@ file path=usr/include/sys/machlock.h file path=usr/include/sys/machsig.h file path=usr/include/sys/machtypes.h file path=usr/include/sys/map.h -$(i386_ONLY)file path=usr/include/sys/mc.h -$(i386_ONLY)file path=usr/include/sys/mc_amd.h -$(i386_ONLY)file path=usr/include/sys/mc_intel.h -$(i386_ONLY)file path=usr/include/sys/mca_amd.h -$(i386_ONLY)file path=usr/include/sys/mca_x86.h +file path=usr/include/sys/mc.h +file path=usr/include/sys/mc_amd.h +file path=usr/include/sys/mc_intel.h +file path=usr/include/sys/mca_amd.h +file path=usr/include/sys/mca_x86.h file path=usr/include/sys/mcontext.h file path=usr/include/sys/md4.h file path=usr/include/sys/md5.h @@ -1014,7 +1014,7 @@ file path=usr/include/sys/msreg.h file path=usr/include/sys/mtio.h file path=usr/include/sys/multidata.h file path=usr/include/sys/mutex.h -$(i386_ONLY)file path=usr/include/sys/mutex_impl.h +file path=usr/include/sys/mutex_impl.h file path=usr/include/sys/nbmlock.h file path=usr/include/sys/ndi_impldefs.h file path=usr/include/sys/ndifm.h @@ -1046,11 +1046,11 @@ file path=usr/include/sys/pfmod.h file path=usr/include/sys/pg.h file path=usr/include/sys/pghw.h file path=usr/include/sys/physmem.h -$(i386_ONLY)file path=usr/include/sys/pic.h -$(i386_ONLY)file path=usr/include/sys/pit.h +file path=usr/include/sys/pic.h +file path=usr/include/sys/pit.h file path=usr/include/sys/pkp_hash.h file path=usr/include/sys/pm.h -$(i386_ONLY)file path=usr/include/sys/pmem.h +file path=usr/include/sys/pmem.h file path=usr/include/sys/policy.h file path=usr/include/sys/poll.h file path=usr/include/sys/poll_impl.h @@ -1066,8 +1066,8 @@ file path=usr/include/sys/priv.h file path=usr/include/sys/priv_const.h file path=usr/include/sys/priv_impl.h file path=usr/include/sys/priv_names.h -$(i386_ONLY)file path=usr/include/sys/privmregs.h -$(i386_ONLY)file path=usr/include/sys/privregs.h +file path=usr/include/sys/privmregs.h +file path=usr/include/sys/privregs.h file path=usr/include/sys/prnio.h file path=usr/include/sys/proc.h file path=usr/include/sys/proc/prdata.h @@ -1076,16 +1076,16 @@ file path=usr/include/sys/procfs.h file path=usr/include/sys/procfs_isa.h file path=usr/include/sys/procset.h file path=usr/include/sys/project.h -$(i386_ONLY)file path=usr/include/sys/prom_emul.h -$(i386_ONLY)file path=usr/include/sys/prom_isa.h -$(i386_ONLY)file path=usr/include/sys/prom_plat.h +file path=usr/include/sys/prom_emul.h +file path=usr/include/sys/prom_isa.h +file path=usr/include/sys/prom_plat.h file path=usr/include/sys/promif.h file path=usr/include/sys/promimpl.h file path=usr/include/sys/protosw.h file path=usr/include/sys/prsystm.h file path=usr/include/sys/pset.h file path=usr/include/sys/psw.h -$(i386_ONLY)file path=usr/include/sys/pte.h +file path=usr/include/sys/pte.h file path=usr/include/sys/ptem.h file path=usr/include/sys/ptms.h file path=usr/include/sys/ptyvar.h @@ -1111,14 +1111,14 @@ file path=usr/include/sys/rsm/rsmndi.h mode=0644 file path=usr/include/sys/rsm/rsmpi.h file path=usr/include/sys/rsm/rsmpi_driver.h file path=usr/include/sys/rt.h -$(i386_ONLY)file path=usr/include/sys/rtc.h +file path=usr/include/sys/rtc.h file path=usr/include/sys/rtpriocntl.h file path=usr/include/sys/rwlock.h file path=usr/include/sys/rwlock_impl.h file path=usr/include/sys/rwstlock.h file path=usr/include/sys/sad.h -$(i386_ONLY)file path=usr/include/sys/sata/sata_defs.h -$(i386_ONLY)file path=usr/include/sys/sata/sata_hba.h +file path=usr/include/sys/sata/sata_defs.h +file path=usr/include/sys/sata/sata_hba.h file path=usr/include/sys/schedctl.h file path=usr/include/sys/scsi/adapters/scsi_vhci.h file path=usr/include/sys/scsi/conf/autoconf.h @@ -1164,8 +1164,8 @@ file path=usr/include/sys/scsi/targets/sgendef.h file path=usr/include/sys/scsi/targets/smp.h file path=usr/include/sys/scsi/targets/stdef.h file path=usr/include/sys/secflags.h -$(i386_ONLY)file path=usr/include/sys/segment.h -$(i386_ONLY)file path=usr/include/sys/segments.h +file path=usr/include/sys/segment.h +file path=usr/include/sys/segments.h file path=usr/include/sys/select.h file path=usr/include/sys/sem.h file path=usr/include/sys/sem_impl.h @@ -1244,7 +1244,7 @@ file path=usr/include/sys/sysevent/ipmp.h file path=usr/include/sys/sysevent/pwrctl.h file path=usr/include/sys/sysevent/vrrp.h file path=usr/include/sys/sysevent_impl.h -$(i386_ONLY)file path=usr/include/sys/sysi86.h +file path=usr/include/sys/sysi86.h file path=usr/include/sys/sysinfo.h file path=usr/include/sys/syslog.h file path=usr/include/sys/sysmacros.h @@ -1279,10 +1279,10 @@ file path=usr/include/sys/tl.h file path=usr/include/sys/todio.h file path=usr/include/sys/tpicommon.h file path=usr/include/sys/trap.h -$(i386_ONLY)file path=usr/include/sys/traptrace.h +file path=usr/include/sys/traptrace.h file path=usr/include/sys/ts.h file path=usr/include/sys/tspriocntl.h -$(i386_ONLY)file path=usr/include/sys/tss.h +file path=usr/include/sys/tss.h file path=usr/include/sys/ttcompat.h file path=usr/include/sys/ttold.h file path=usr/include/sys/tty.h @@ -1295,7 +1295,7 @@ file path=usr/include/sys/types32.h file path=usr/include/sys/tzfile.h file path=usr/include/sys/u8_textprep.h file path=usr/include/sys/uadmin.h -$(i386_ONLY)file path=usr/include/sys/ucode.h +file path=usr/include/sys/ucode.h file path=usr/include/sys/ucontext.h file path=usr/include/sys/uio.h file path=usr/include/sys/ulimit.h @@ -1336,8 +1336,8 @@ file path=usr/include/sys/vuid_wheel.h file path=usr/include/sys/wait.h file path=usr/include/sys/waitq.h file path=usr/include/sys/watchpoint.h -$(i386_ONLY)file path=usr/include/sys/x86_archext.h -$(i386_ONLY)file path=usr/include/sys/xen_errno.h +file path=usr/include/sys/x86_archext.h +file path=usr/include/sys/xen_errno.h file path=usr/include/sys/xti_inet.h file path=usr/include/sys/xti_osi.h file path=usr/include/sys/xti_xtiopt.h @@ -1406,39 +1406,39 @@ file path=usr/include/xti.h file path=usr/include/xti_inet.h file path=usr/include/zone.h file path=usr/include/zonestat.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/acpidev.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/amd_iommu.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/asm_misc.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/clock.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/cram.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/ddi_subrdefs.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/debug_info.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/fastboot.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/mach_mmu.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/machclock.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/machcpuvar.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/machparam.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/machprivregs.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/machsystm.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/machthread.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/memnode.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/pc_mmu.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/psm.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/psm_defs.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/psm_modctl.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/psm_types.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/rm_platter.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/sbd_ioctl.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/smp_impldefs.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/vm_machparam.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/x_call.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/xc_levels.h -$(i386_ONLY)file path=usr/platform/i86pc/include/sys/xsvc.h -$(i386_ONLY)file path=usr/platform/i86pc/include/vm/hat_i86.h -$(i386_ONLY)file path=usr/platform/i86pc/include/vm/hat_pte.h -$(i386_ONLY)file path=usr/platform/i86pc/include/vm/hment.h -$(i386_ONLY)file path=usr/platform/i86pc/include/vm/htable.h -$(i386_ONLY)file path=usr/platform/i86pc/include/vm/kboot_mmu.h +file path=usr/platform/i86pc/include/sys/acpidev.h +file path=usr/platform/i86pc/include/sys/amd_iommu.h +file path=usr/platform/i86pc/include/sys/asm_misc.h +file path=usr/platform/i86pc/include/sys/clock.h +file path=usr/platform/i86pc/include/sys/cram.h +file path=usr/platform/i86pc/include/sys/ddi_subrdefs.h +file path=usr/platform/i86pc/include/sys/debug_info.h +file path=usr/platform/i86pc/include/sys/fastboot.h +file path=usr/platform/i86pc/include/sys/mach_mmu.h +file path=usr/platform/i86pc/include/sys/machclock.h +file path=usr/platform/i86pc/include/sys/machcpuvar.h +file path=usr/platform/i86pc/include/sys/machparam.h +file path=usr/platform/i86pc/include/sys/machprivregs.h +file path=usr/platform/i86pc/include/sys/machsystm.h +file path=usr/platform/i86pc/include/sys/machthread.h +file path=usr/platform/i86pc/include/sys/memnode.h +file path=usr/platform/i86pc/include/sys/pc_mmu.h +file path=usr/platform/i86pc/include/sys/psm.h +file path=usr/platform/i86pc/include/sys/psm_defs.h +file path=usr/platform/i86pc/include/sys/psm_modctl.h +file path=usr/platform/i86pc/include/sys/psm_types.h +file path=usr/platform/i86pc/include/sys/rm_platter.h +file path=usr/platform/i86pc/include/sys/sbd_ioctl.h +file path=usr/platform/i86pc/include/sys/smp_impldefs.h +file path=usr/platform/i86pc/include/sys/vm_machparam.h +file path=usr/platform/i86pc/include/sys/x_call.h +file path=usr/platform/i86pc/include/sys/xc_levels.h +file path=usr/platform/i86pc/include/sys/xsvc.h +file path=usr/platform/i86pc/include/vm/hat_i86.h +file path=usr/platform/i86pc/include/vm/hat_pte.h +file path=usr/platform/i86pc/include/vm/hment.h +file path=usr/platform/i86pc/include/vm/htable.h +file path=usr/platform/i86pc/include/vm/kboot_mmu.h file path=usr/share/man/man3head/acct.h.3head file path=usr/share/man/man3head/aio.h.3head file path=usr/share/man/man3head/ar.h.3head diff --git a/usr/src/pkg/manifests/system-kernel-cpu-counters.inc b/usr/src/pkg/manifests/system-kernel-cpu-counters.inc index 3dcce2c457..6dd55c0758 100644 --- a/usr/src/pkg/manifests/system-kernel-cpu-counters.inc +++ b/usr/src/pkg/manifests/system-kernel-cpu-counters.inc @@ -29,13 +29,13 @@ # information about overriding the defaults. # dir path=platform group=sys -$(i386_ONLY)dir path=platform/i86pc group=sys -$(i386_ONLY)dir path=platform/i86pc/kernel group=sys -$(i386_ONLY)dir path=platform/i86pc/kernel/drv group=sys -$(i386_ONLY)dir path=platform/i86pc/kernel/sys group=sys +dir path=platform/i86pc group=sys +dir path=platform/i86pc/kernel group=sys +dir path=platform/i86pc/kernel/drv group=sys +dir path=platform/i86pc/kernel/sys group=sys driver name=cpc perms="shared 0666 root sys" -$(i386_ONLY)file path=platform/i86pc/kernel/drv/cpc group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/cpc.conf group=sys -$(i386_ONLY)hardlink path=platform/i86pc/kernel/sys/cpc target=../drv/cpc +file path=platform/i86pc/kernel/drv/cpc group=sys +file path=platform/i86pc/kernel/drv/cpc.conf group=sys +hardlink path=platform/i86pc/kernel/sys/cpc target=../drv/cpc license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-kernel-platform.inc b/usr/src/pkg/manifests/system-kernel-platform.inc dissimilarity index 64% index 3bc7108644..e98bf6e103 100644 --- a/usr/src/pkg/manifests/system-kernel-platform.inc +++ b/usr/src/pkg/manifests/system-kernel-platform.inc @@ -1,118 +1,118 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. -# Copyright 2012 Nexenta Systems, Inc. All rights reserved. -# Copyright 2014 Gary Mills -# - -# -# 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 -# information about overriding the defaults. -# -dir path=platform group=sys -$(i386_ONLY)dir path=platform/$(CONFIG_PLATFORM) group=sys -$(i386_ONLY)dir path=platform/$(CONFIG_PLATFORM)/$(ARCH64) group=sys -$(i386_ONLY)dir path=platform/$(CONFIG_PLATFORM)/kernel group=sys -$(i386_ONLY)dir path=platform/$(CONFIG_PLATFORM)/kernel/cpu group=sys -$(i386_ONLY)dir path=platform/$(CONFIG_PLATFORM)/kernel/dacf group=sys -$(i386_ONLY)dir path=platform/$(CONFIG_PLATFORM)/kernel/drv group=sys -$(i386_ONLY)dir path=platform/$(CONFIG_PLATFORM)/kernel/mach group=sys -$(i386_ONLY)dir path=platform/$(CONFIG_PLATFORM)/kernel/misc group=sys -$(i386_ONLY)dir path=platform/$(CONFIG_PLATFORM)/ucode group=sys -dir path=usr/share/man/man4 -$(i386_ONLY)driver name=acpinex alias=acpivirtnex -$(i386_ONLY)driver name=acpippm -$(i386_ONLY)driver name=amd_iommu perms="* 0644 root sys" \ - alias=pci1002,5a23 \ - alias=pci1022,11ff -$(i386_ONLY)driver name=balloon perms="* 0444 root sys" -$(i386_ONLY)driver name=cpudrv alias=cpu -$(i386_ONLY)driver name=domcaps perms="* 0444 root sys" -$(i386_ONLY)driver name=evtchn perms="* 0666 root sys" -$(i386_ONLY)driver name=isa alias=pciclass,060100 class=sysbus -$(i386_ONLY)driver name=npe alias=pciex_root_complex -$(i386_ONLY)driver name=pci class=pci -$(i386_ONLY)driver name=pit_beep alias=SUNW,pit_beep -driver name=ppm -$(i386_ONLY)driver name=privcmd perms="* 0666 root sys" -$(i386_ONLY)driver name=rootnex -$(i386_ONLY)driver name=xdb -$(i386_ONLY)driver name=xdf -$(i386_ONLY)driver name=xenbus perms="* 0666 root sys" -$(i386_ONLY)driver name=xencons -$(i386_ONLY)driver name=xnbe alias=xnb,ioemu -$(i386_ONLY)driver name=xnbo \ - alias=xnb \ - alias=xnb,SUNW_mac -$(i386_ONLY)driver name=xnbu alias=xnb,netfront -$(i386_ONLY)driver name=xnf -$(i386_ONLY)file path=platform/$(CONFIG_PLATFORM)/kernel/unix group=sys \ - mode=0755 pkg.depend.bypass-generate=dtracestubs -$(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu.generic group=sys \ - mode=0755 -$(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu_ms.AuthenticAMD group=sys \ - mode=0755 -$(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu_ms.AuthenticAMD.15 \ - group=sys mode=0755 -$(i386_ONLY)file path=platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel group=sys \ - mode=0755 -$(i386_ONLY)file path=platform/i86pc/kernel/dacf/consconfig_dacf group=sys \ - mode=0755 -$(i386_ONLY)file path=platform/i86pc/kernel/drv/acpinex group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/acpippm group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/acpippm.conf group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/amd_iommu group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/amd_iommu.conf group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/cpudrv group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/isa group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/npe group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/pci group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/pit_beep group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/pit_beep.conf group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/ppm group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/ppm.conf group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/rootnex group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/drv/rootnex.conf group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/mach/apix group=sys mode=0755 -$(i386_ONLY)file path=platform/i86pc/kernel/mach/pcplusmp group=sys mode=0755 -$(i386_ONLY)file path=platform/i86pc/kernel/mach/uppc group=sys mode=0755 -$(i386_ONLY)file path=platform/i86pc/kernel/misc/acpidev group=sys mode=0755 -$(i386_ONLY)file path=platform/i86pc/kernel/misc/gfx_private group=sys \ - mode=0755 -$(i386_ONLY)file path=platform/i86pc/ucode/amd-ucode.bin group=sys mode=0444 \ - preserve=true reboot-needed=true -$(i386_ONLY)file path=platform/i86pc/ucode/intel-ucode.txt group=sys mode=0444 \ - preserve=true reboot-needed=true -$(i386_ONLY)file path=usr/share/man/man4/sysbus.4 -$(i386_ONLY)file path=usr/share/man/man7d/npe.7d -license cr_Sun license=cr_Sun -license include/sys/THIRDPARTYLICENSE.unicode \ - license=include/sys/THIRDPARTYLICENSE.unicode -license kernel/zmod/THIRDPARTYLICENSE license=kernel/zmod/THIRDPARTYLICENSE -license lic_CDDL license=lic_CDDL -license usr/src/cmd/mdb/common/libstand/THIRDPARTYLICENSE \ - license=usr/src/cmd/mdb/common/libstand/THIRDPARTYLICENSE -license usr/src/common/bzip2/LICENSE license=usr/src/common/bzip2/LICENSE -$(i386_ONLY)license usr/src/uts/intel/THIRDPARTYLICENSE \ - license=usr/src/uts/intel/THIRDPARTYLICENSE +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright 2012 Nexenta Systems, Inc. All rights reserved. +# Copyright 2014 Gary Mills +# + +# +# 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 +# information about overriding the defaults. +# +dir path=platform group=sys +dir path=platform/$(CONFIG_PLATFORM) group=sys +dir path=platform/$(CONFIG_PLATFORM)/$(ARCH64) group=sys +dir path=platform/$(CONFIG_PLATFORM)/kernel group=sys +dir path=platform/$(CONFIG_PLATFORM)/kernel/cpu group=sys +dir path=platform/$(CONFIG_PLATFORM)/kernel/dacf group=sys +dir path=platform/$(CONFIG_PLATFORM)/kernel/drv group=sys +dir path=platform/$(CONFIG_PLATFORM)/kernel/mach group=sys +dir path=platform/$(CONFIG_PLATFORM)/kernel/misc group=sys +dir path=platform/$(CONFIG_PLATFORM)/ucode group=sys +dir path=usr/share/man/man4 +driver name=acpinex alias=acpivirtnex +driver name=acpippm +driver name=amd_iommu perms="* 0644 root sys" \ + alias=pci1002,5a23 \ + alias=pci1022,11ff +driver name=balloon perms="* 0444 root sys" +driver name=cpudrv alias=cpu +driver name=domcaps perms="* 0444 root sys" +driver name=evtchn perms="* 0666 root sys" +driver name=isa alias=pciclass,060100 class=sysbus +driver name=npe alias=pciex_root_complex +driver name=pci class=pci +driver name=pit_beep alias=SUNW,pit_beep +driver name=ppm +driver name=privcmd perms="* 0666 root sys" +driver name=rootnex +driver name=xdb +driver name=xdf +driver name=xenbus perms="* 0666 root sys" +driver name=xencons +driver name=xnbe alias=xnb,ioemu +driver name=xnbo \ + alias=xnb \ + alias=xnb,SUNW_mac +driver name=xnbu alias=xnb,netfront +driver name=xnf +file path=platform/$(CONFIG_PLATFORM)/kernel/unix group=sys \ + mode=0755 pkg.depend.bypass-generate=dtracestubs +file path=platform/i86pc/kernel/cpu/cpu.generic group=sys \ + mode=0755 +file path=platform/i86pc/kernel/cpu/cpu_ms.AuthenticAMD group=sys \ + mode=0755 +file path=platform/i86pc/kernel/cpu/cpu_ms.AuthenticAMD.15 \ + group=sys mode=0755 +file path=platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel group=sys \ + mode=0755 +file path=platform/i86pc/kernel/dacf/consconfig_dacf group=sys \ + mode=0755 +file path=platform/i86pc/kernel/drv/acpinex group=sys +file path=platform/i86pc/kernel/drv/acpippm group=sys +file path=platform/i86pc/kernel/drv/acpippm.conf group=sys +file path=platform/i86pc/kernel/drv/amd_iommu group=sys +file path=platform/i86pc/kernel/drv/amd_iommu.conf group=sys +file path=platform/i86pc/kernel/drv/cpudrv group=sys +file path=platform/i86pc/kernel/drv/isa group=sys +file path=platform/i86pc/kernel/drv/npe group=sys +file path=platform/i86pc/kernel/drv/pci group=sys +file path=platform/i86pc/kernel/drv/pit_beep group=sys +file path=platform/i86pc/kernel/drv/pit_beep.conf group=sys +file path=platform/i86pc/kernel/drv/ppm group=sys +file path=platform/i86pc/kernel/drv/ppm.conf group=sys +file path=platform/i86pc/kernel/drv/rootnex group=sys +file path=platform/i86pc/kernel/drv/rootnex.conf group=sys +file path=platform/i86pc/kernel/mach/apix group=sys mode=0755 +file path=platform/i86pc/kernel/mach/pcplusmp group=sys mode=0755 +file path=platform/i86pc/kernel/mach/uppc group=sys mode=0755 +file path=platform/i86pc/kernel/misc/acpidev group=sys mode=0755 +file path=platform/i86pc/kernel/misc/gfx_private group=sys \ + mode=0755 +file path=platform/i86pc/ucode/amd-ucode.bin group=sys mode=0444 \ + preserve=true reboot-needed=true +file path=platform/i86pc/ucode/intel-ucode.txt group=sys mode=0444 \ + preserve=true reboot-needed=true +file path=usr/share/man/man4/sysbus.4 +file path=usr/share/man/man7d/npe.7d +license cr_Sun license=cr_Sun +license include/sys/THIRDPARTYLICENSE.unicode \ + license=include/sys/THIRDPARTYLICENSE.unicode +license kernel/zmod/THIRDPARTYLICENSE license=kernel/zmod/THIRDPARTYLICENSE +license lic_CDDL license=lic_CDDL +license usr/src/cmd/mdb/common/libstand/THIRDPARTYLICENSE \ + license=usr/src/cmd/mdb/common/libstand/THIRDPARTYLICENSE +license usr/src/common/bzip2/LICENSE license=usr/src/common/bzip2/LICENSE +license usr/src/uts/intel/THIRDPARTYLICENSE \ + license=usr/src/uts/intel/THIRDPARTYLICENSE diff --git a/usr/src/pkg/manifests/system-kernel-suspend-resume.inc b/usr/src/pkg/manifests/system-kernel-suspend-resume.inc index 930364641e..5c1070dffb 100644 --- a/usr/src/pkg/manifests/system-kernel-suspend-resume.inc +++ b/usr/src/pkg/manifests/system-kernel-suspend-resume.inc @@ -28,18 +28,18 @@ # global zone only. See the include file for greater detail, as well as # information about overriding the defaults. # -$(i386_ONLY)dir path=kernel group=sys -$(i386_ONLY)dir path=kernel/drv group=sys +dir path=kernel group=sys +dir path=kernel/drv group=sys dir path=platform group=sys -$(i386_ONLY)dir path=platform/i86pc group=sys -$(i386_ONLY)dir path=platform/i86pc/kernel group=sys -$(i386_ONLY)dir path=platform/i86pc/kernel/misc group=sys +dir path=platform/i86pc group=sys +dir path=platform/i86pc/kernel group=sys +dir path=platform/i86pc/kernel/misc group=sys dir path=usr/share/man dir path=usr/share/man/man7 -$(i386_ONLY)driver name=srn -$(i386_ONLY)file path=kernel/drv/srn group=sys -$(i386_ONLY)file path=kernel/drv/srn.conf group=sys -$(i386_ONLY)file path=platform/i86pc/kernel/misc/cpr group=sys mode=0755 +driver name=srn +file path=kernel/drv/srn group=sys +file path=kernel/drv/srn.conf group=sys +file path=platform/i86pc/kernel/misc/cpr group=sys mode=0755 file path=usr/share/man/man7/cpr.7 license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL diff --git a/usr/src/pkg/manifests/system-kernel.mf b/usr/src/pkg/manifests/system-kernel.mf index 2086e8cfee..461b0caab8 100644 --- a/usr/src/pkg/manifests/system-kernel.mf +++ b/usr/src/pkg/manifests/system-kernel.mf @@ -207,8 +207,8 @@ set name=pkg.summary value="Core Kernel" set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) dir path=boot group=sys -$(i386_ONLY)dir path=boot/acpi group=sys -$(i386_ONLY)dir path=boot/acpi/tables group=sys +dir path=boot/acpi group=sys +dir path=boot/acpi/tables group=sys dir path=boot/solaris group=sys dir path=boot/solaris/bin group=sys dir path=dev group=sys @@ -275,32 +275,32 @@ dir path=usr/share/man/man9e dir path=usr/share/man/man9f dir path=usr/share/man/man9p dir path=usr/share/man/man9s -$(i386_ONLY)driver name=acpi_drv perms="* 0666 root sys" +driver name=acpi_drv perms="* 0666 root sys" driver name=aggr perms="* 0666 root sys" driver name=arp perms="arp 0666 root sys" driver name=bl perms="* 0666 root sys" driver name=bridge clone_perms="bridge 0666 root sys" \ policy="read_priv_set=net_rawaccess write_priv_set=net_rawaccess" -$(i386_ONLY)driver name=bscbus alias=SVI0101 -$(i386_ONLY)driver name=bscv +driver name=bscbus alias=SVI0101 +driver name=bscv driver name=clone driver name=cn perms="* 0620 root tty" driver name=conskbd perms="kbd 0666 root sys" driver name=consms perms="mouse 0666 root sys" driver name=cpuid perms="self 0644 root sys" -$(i386_ONLY)driver name=cpunex alias=cpus +driver name=cpunex alias=cpus driver name=crypto perms="crypto 0666 root sys" driver name=cryptoadm perms="cryptoadm 0644 root sys" driver name=devinfo perms="devinfo 0640 root sys" \ perms="devinfo,ro 0444 root sys" driver name=dld perms="* 0666 root sys" driver name=dlpistub perms="* 0666 root sys" -$(i386_ONLY)driver name=i8042 +driver name=i8042 driver name=icmp perms="icmp 0666 root sys" \ policy="read_priv_set=net_icmpaccess write_priv_set=net_icmpaccess" driver name=icmp6 perms="icmp6 0666 root sys" \ policy="read_priv_set=net_icmpaccess write_priv_set=net_icmpaccess" -$(i386_ONLY)driver name=intel_nb5000 \ +driver name=intel_nb5000 \ alias=pci8086,25c0 \ alias=pci8086,25d0 \ alias=pci8086,25d4 \ @@ -310,7 +310,7 @@ $(i386_ONLY)driver name=intel_nb5000 \ alias=pci8086,4001 \ alias=pci8086,4003 \ alias=pci8086,65c0 -$(i386_ONLY)driver name=intel_nhm \ +driver name=intel_nhm \ alias=pci8086,3423 \ alias=pci8086,372a driver name=ip perms="ip 0666 root sys" \ @@ -333,7 +333,7 @@ driver name=kmdb driver name=llc1 clone_perms="llc1 0666 root sys" driver name=lofi perms="* 0600 root sys" perms="ctl 0644 root sys" driver name=log perms="conslog 0666 root sys" perms="log 0640 root sys" -$(i386_ONLY)driver name=mc-amd \ +driver name=mc-amd \ alias=pci1022,1100 \ alias=pci1022,1101 \ alias=pci1022,1102 @@ -349,29 +349,28 @@ driver name=nulldriver \ alias=scsa,probe driver name=openeepr perms="openprom 0640 root sys" policy=write_priv_set=all driver name=options -$(i386_ONLY)driver name=pci_pci class=pci \ +driver name=pci_pci class=pci \ alias=pci1011,1 \ alias=pci1011,21 \ alias=pci1014,22 \ alias=pciclass,060400 \ alias=pciclass,060401 -$(i386_ONLY)driver name=pcieb \ +driver name=pcieb \ alias=pciexclass,060400 \ alias=pciexclass,060401 driver name=physmem perms="* 0600 root sys" driver name=poll perms="* 0666 root sys" -$(i386_ONLY)driver name=power +driver name=power driver name=pseudo alias=zconsnex driver name=ptc perms="* 0666 root sys" driver name=ptsl perms="* 0666 root sys" -$(i386_ONLY)driver name=ramdisk perms="* 0600 root sys" \ - perms="ctl 0644 root sys" +driver name=ramdisk perms="* 0600 root sys" perms="ctl 0644 root sys" driver name=random perms="* 0644 root sys" policy=write_priv_set=sys_devices driver name=rts perms="rts 0666 root sys" driver name=sad perms="admin 0666 root sys" perms="user 0666 root sys" driver name=scsi_vhci class=scsi-self-identifying perms="* 0666 root sys" \ policy="devctl write_priv_set=sys_devices" -$(i386_ONLY)driver name=sd perms="* 0640 root sys" \ +driver name=sd perms="* 0640 root sys" \ alias=scsiclass,00 \ alias=scsiclass,05 driver name=sgen perms="* 0600 root sys" \ @@ -379,7 +378,7 @@ driver name=sgen perms="* 0600 root sys" \ alias=scsa,08.bvhci driver name=signalfd perms="* 0666 root sys" driver name=simnet clone_perms="simnet 0666 root sys" perms="* 0666 root sys" -$(i386_ONLY)driver name=smbios perms="smbios 0444 root sys" +driver name=smbios perms="smbios 0444 root sys" driver name=softmac driver name=spdsock perms="spdsock 0666 root sys" \ policy="read_priv_set=sys_ip_config write_priv_set=sys_ip_config" @@ -391,11 +390,11 @@ driver name=tcp perms="tcp 0666 root sys" driver name=tcp6 perms="tcp6 0666 root sys" driver name=tl perms="* 0666 root sys" clone_perms="ticlts 0666 root sys" \ clone_perms="ticots 0666 root sys" clone_perms="ticotsord 0666 root sys" -$(i386_ONLY)driver name=tzmon -$(i386_ONLY)driver name=ucode perms="* 0644 root sys" +driver name=tzmon +driver name=ucode perms="* 0644 root sys" driver name=udp perms="udp 0666 root sys" driver name=udp6 perms="udp6 0666 root sys" -$(i386_ONLY)driver name=vgatext \ +driver name=vgatext \ alias=pciclass,000100 \ alias=pciclass,030000 \ alias=pciclass,030001 \ @@ -404,8 +403,8 @@ driver name=vnic clone_perms="vnic 0666 root sys" perms="* 0666 root sys" driver name=wc perms="* 0600 root sys" file path=boot/solaris/bin/create_ramdisk group=sys mode=0555 file path=boot/solaris/bin/extract_boot_filelist group=sys mode=0555 -$(i386_ONLY)file path=boot/solaris/bin/mbr group=sys mode=0555 -$(i386_ONLY)file path=boot/solaris/bin/symdef group=sys mode=0555 +file path=boot/solaris/bin/mbr group=sys mode=0555 +file path=boot/solaris/bin/symdef group=sys mode=0555 file path=boot/solaris/filelist.ramdisk group=sys file path=boot/solaris/filelist.safe group=sys file path=etc/crypto/kcf.conf group=sys preserve=true @@ -414,7 +413,7 @@ file path=etc/devlink.tab group=sys preserve=true file path=etc/driver_aliases group=sys preserve=true file path=etc/driver_classes group=sys preserve=true file path=etc/iu.ap group=sys preserve=true -$(i386_ONLY)file path=etc/mach group=sys preserve=true +file path=etc/mach group=sys preserve=true file path=etc/minor_perm group=sys preserve=true file path=etc/name_to_major group=sys preserve=true file path=etc/name_to_sysnum group=sys preserve=renameold @@ -437,8 +436,8 @@ file path=kernel/crypto/sha2 group=sys mode=0755 file path=kernel/crypto/skein group=sys mode=0755 file path=kernel/crypto/swrand group=sys mode=0755 file path=kernel/dacf/net_dacf group=sys mode=0755 -$(i386_ONLY)file path=kernel/drv/acpi_drv group=sys -$(i386_ONLY)file path=kernel/drv/acpi_drv.conf group=sys +file path=kernel/drv/acpi_drv group=sys +file path=kernel/drv/acpi_drv.conf group=sys file path=kernel/drv/aggr group=sys file path=kernel/drv/aggr.conf group=sys file path=kernel/drv/arp group=sys @@ -447,10 +446,10 @@ file path=kernel/drv/bl group=sys file path=kernel/drv/bl.conf group=sys file path=kernel/drv/bridge group=sys file path=kernel/drv/bridge.conf group=sys -$(i386_ONLY)file path=kernel/drv/bscbus group=sys -$(i386_ONLY)file path=kernel/drv/bscbus.conf group=sys -$(i386_ONLY)file path=kernel/drv/bscv group=sys -$(i386_ONLY)file path=kernel/drv/bscv.conf group=sys +file path=kernel/drv/bscbus group=sys +file path=kernel/drv/bscbus.conf group=sys +file path=kernel/drv/bscv group=sys +file path=kernel/drv/bscv.conf group=sys file path=kernel/drv/clone group=sys file path=kernel/drv/clone.conf group=sys file path=kernel/drv/cn group=sys @@ -461,7 +460,7 @@ file path=kernel/drv/consms group=sys file path=kernel/drv/consms.conf group=sys file path=kernel/drv/cpuid group=sys file path=kernel/drv/cpuid.conf group=sys -$(i386_ONLY)file path=kernel/drv/cpunex group=sys +file path=kernel/drv/cpunex group=sys file path=kernel/drv/crypto group=sys file path=kernel/drv/crypto.conf group=sys file path=kernel/drv/cryptoadm group=sys @@ -477,10 +476,10 @@ file path=kernel/drv/icmp group=sys file path=kernel/drv/icmp.conf group=sys file path=kernel/drv/icmp6 group=sys file path=kernel/drv/icmp6.conf group=sys -$(i386_ONLY)file path=kernel/drv/intel_nb5000 group=sys -$(i386_ONLY)file path=kernel/drv/intel_nb5000.conf group=sys -$(i386_ONLY)file path=kernel/drv/intel_nhm group=sys -$(i386_ONLY)file path=kernel/drv/intel_nhm.conf group=sys +file path=kernel/drv/intel_nb5000 group=sys +file path=kernel/drv/intel_nb5000.conf group=sys +file path=kernel/drv/intel_nhm group=sys +file path=kernel/drv/intel_nhm.conf group=sys file path=kernel/drv/ip group=sys file path=kernel/drv/ip.conf group=sys file path=kernel/drv/ip6 group=sys @@ -508,8 +507,8 @@ file path=kernel/drv/lofi group=sys file path=kernel/drv/lofi.conf group=sys file path=kernel/drv/log group=sys file path=kernel/drv/log.conf group=sys preserve=true -$(i386_ONLY)file path=kernel/drv/mc-amd group=sys -$(i386_ONLY)file path=kernel/drv/mc-amd.conf group=sys +file path=kernel/drv/mc-amd group=sys +file path=kernel/drv/mc-amd.conf group=sys file path=kernel/drv/mm group=sys file path=kernel/drv/mm.conf group=sys file path=kernel/drv/mouse8042 group=sys @@ -525,8 +524,8 @@ file path=kernel/drv/physmem group=sys file path=kernel/drv/physmem.conf group=sys file path=kernel/drv/poll group=sys file path=kernel/drv/poll.conf group=sys -$(i386_ONLY)file path=kernel/drv/power group=sys -$(i386_ONLY)file path=kernel/drv/power.conf group=sys +file path=kernel/drv/power group=sys +file path=kernel/drv/power.conf group=sys file path=kernel/drv/pseudo group=sys file path=kernel/drv/pseudo.conf group=sys file path=kernel/drv/ptc group=sys @@ -549,8 +548,8 @@ file path=kernel/drv/sgen group=sys file path=kernel/drv/sgen.conf group=sys preserve=true file path=kernel/drv/simnet group=sys file path=kernel/drv/simnet.conf group=sys -$(i386_ONLY)file path=kernel/drv/smbios group=sys -$(i386_ONLY)file path=kernel/drv/smbios.conf group=sys +file path=kernel/drv/smbios group=sys +file path=kernel/drv/smbios.conf group=sys file path=kernel/drv/softmac group=sys file path=kernel/drv/softmac.conf group=sys file path=kernel/drv/spdsock group=sys @@ -569,15 +568,15 @@ file path=kernel/drv/tcp6 group=sys file path=kernel/drv/tcp6.conf group=sys file path=kernel/drv/tl group=sys file path=kernel/drv/tl.conf group=sys -$(i386_ONLY)file path=kernel/drv/tzmon group=sys -$(i386_ONLY)file path=kernel/drv/tzmon.conf group=sys -$(i386_ONLY)file path=kernel/drv/ucode group=sys -$(i386_ONLY)file path=kernel/drv/ucode.conf group=sys +file path=kernel/drv/tzmon group=sys +file path=kernel/drv/tzmon.conf group=sys +file path=kernel/drv/ucode group=sys +file path=kernel/drv/ucode.conf group=sys file path=kernel/drv/udp group=sys file path=kernel/drv/udp.conf group=sys file path=kernel/drv/udp6 group=sys file path=kernel/drv/udp6.conf group=sys -$(i386_ONLY)file path=kernel/drv/vgatext group=sys +file path=kernel/drv/vgatext group=sys file path=kernel/drv/vnic group=sys file path=kernel/drv/vnic.conf group=sys file path=kernel/drv/wc group=sys @@ -604,7 +603,7 @@ file path=kernel/fs/sockfs group=sys mode=0755 file path=kernel/fs/specfs group=sys mode=0755 file path=kernel/fs/tmpfs group=sys mode=0755 file path=kernel/fs/ufs group=sys mode=0755 -$(i386_ONLY)file path=kernel/genunix group=sys mode=0755 +file path=kernel/genunix group=sys mode=0755 file path=kernel/ipp/ipgpc group=sys mode=0755 file path=kernel/kiconv/kiconv_emea group=sys mode=0755 file path=kernel/kiconv/kiconv_ja group=sys mode=0755 @@ -617,9 +616,9 @@ file path=kernel/mac/mac_ib group=sys mode=0755 file path=kernel/mac/mac_ipv4 group=sys mode=0755 file path=kernel/mac/mac_ipv6 group=sys mode=0755 file path=kernel/mac/mac_wifi group=sys mode=0755 -$(i386_ONLY)file path=kernel/misc/acpica group=sys mode=0755 +file path=kernel/misc/acpica group=sys mode=0755 file path=kernel/misc/bignum group=sys mode=0755 -$(i386_ONLY)file path=kernel/misc/bootdev group=sys mode=0755 +file path=kernel/misc/bootdev group=sys mode=0755 file path=kernel/misc/busra group=sys mode=0755 file path=kernel/misc/cmlb group=sys mode=0755 file path=kernel/misc/consconfig group=sys mode=0755 @@ -630,22 +629,22 @@ file path=kernel/misc/gld group=sys mode=0755 file path=kernel/misc/hook group=sys mode=0755 file path=kernel/misc/hpcsvc group=sys mode=0755 file path=kernel/misc/idmap group=sys mode=0755 -$(i386_ONLY)file path=kernel/misc/iommulib group=sys mode=0755 +file path=kernel/misc/iommulib group=sys mode=0755 file path=kernel/misc/ipc group=sys mode=0755 file path=kernel/misc/kbtrans group=sys mode=0755 file path=kernel/misc/kcf group=sys mode=0755 -$(i386_ONLY)file path=kernel/misc/kmdbmod group=sys mode=0755 +file path=kernel/misc/kmdbmod group=sys mode=0755 file path=kernel/misc/ksocket group=sys mode=0755 file path=kernel/misc/mac group=sys mode=0755 file path=kernel/misc/mii group=sys mode=0755 -$(i386_ONLY)file path=kernel/misc/net80211 group=sys mode=0755 +file path=kernel/misc/net80211 group=sys mode=0755 file path=kernel/misc/neti group=sys mode=0755 -$(i386_ONLY)file path=kernel/misc/pci_autoconfig group=sys mode=0755 -$(i386_ONLY)file path=kernel/misc/pcicfg group=sys mode=0755 -$(i386_ONLY)file path=kernel/misc/pcie group=sys mode=0755 +file path=kernel/misc/pci_autoconfig group=sys mode=0755 +file path=kernel/misc/pcicfg group=sys mode=0755 +file path=kernel/misc/pcie group=sys mode=0755 file path=kernel/misc/pcihp group=sys mode=0755 file path=kernel/misc/rpcsec group=sys mode=0755 -$(i386_ONLY)file path=kernel/misc/sata group=sys mode=0755 +file path=kernel/misc/sata group=sys mode=0755 file path=kernel/misc/scsi group=sys mode=0755 file path=kernel/misc/scsi_vhci/scsi_vhci_f_asym_sun group=sys mode=0755 file path=kernel/misc/scsi_vhci/scsi_vhci_f_sym group=sys mode=0755 @@ -729,7 +728,7 @@ file path=usr/kernel/sys/exacctsys group=sys mode=0755 file path=usr/kernel/sys/sysacct group=sys mode=0755 # On SPARC driver/bscv is Serverblade1 specific, and in system/kernel/platform # We keep the manual page generic -$(i386_ONLY)file path=usr/share/man/man7d/smbios.7d +file path=usr/share/man/man7d/smbios.7d # Sadly vuid mouse support is in different packages on different platforms # While kstat(7D) is in SUNWcs, the structures are general hardlink path=kernel/misc/edonr target=../../kernel/crypto/edonr @@ -768,22 +767,21 @@ license usr/src/cmd/mdb/common/libstand/THIRDPARTYLICENSE \ license usr/src/common/bzip2/LICENSE license=usr/src/common/bzip2/LICENSE license usr/src/common/crypto/THIRDPARTYLICENSE.cryptogams \ license=usr/src/common/crypto/THIRDPARTYLICENSE.cryptogams -$(i386_ONLY)license usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman \ +license usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman \ license=usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman -$(i386_ONLY)license usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl \ +license usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl \ license=usr/src/common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl license usr/src/common/crypto/ecc/THIRDPARTYLICENSE \ license=usr/src/common/crypto/ecc/THIRDPARTYLICENSE -$(i386_ONLY)license usr/src/common/crypto/md5/amd64/THIRDPARTYLICENSE \ +license usr/src/common/crypto/md5/amd64/THIRDPARTYLICENSE \ license=usr/src/common/crypto/md5/amd64/THIRDPARTYLICENSE license usr/src/common/mpi/THIRDPARTYLICENSE \ license=usr/src/common/mpi/THIRDPARTYLICENSE license usr/src/uts/common/io/THIRDPARTYLICENSE.etheraddr \ license=usr/src/uts/common/io/THIRDPARTYLICENSE.etheraddr -$(i386_ONLY)license usr/src/uts/intel/io/acpica/THIRDPARTYLICENSE \ +license usr/src/uts/intel/io/acpica/THIRDPARTYLICENSE \ license=usr/src/uts/intel/io/acpica/THIRDPARTYLICENSE -$(i386_ONLY)link path=boot/solaris/bin/root_archive \ - target=../../../usr/sbin/root_archive +link path=boot/solaris/bin/root_archive target=../../../usr/sbin/root_archive link path=dev/dld target=../devices/pseudo/dld@0:ctl link path=dev/stderr target=./fd/2 link path=dev/stdin target=./fd/0 diff --git a/usr/src/pkg/manifests/system-library-c-runtime.mf b/usr/src/pkg/manifests/system-library-c-runtime.mf index a09b535d06..8e9b19ab04 100644 --- a/usr/src/pkg/manifests/system-library-c-runtime.mf +++ b/usr/src/pkg/manifests/system-library-c-runtime.mf @@ -35,5 +35,5 @@ file path=usr/lib/values-xpg4.o file path=usr/lib/values-xpg6.o license cr_Sun license=cr_Sun license lic_CDDL license=lic_CDDL -$(i386_ONLY)link path=usr/lib/$(ARCH64)/gcrt1.o target=crt1.o -$(i386_ONLY)link path=usr/lib/gcrt1.o target=crt1.o +link path=usr/lib/$(ARCH64)/gcrt1.o target=crt1.o +link path=usr/lib/gcrt1.o target=crt1.o diff --git a/usr/src/pkg/manifests/system-library-math.inc b/usr/src/pkg/manifests/system-library-math.inc index 491956340d..6ef9c5ff81 100644 --- a/usr/src/pkg/manifests/system-library-math.inc +++ b/usr/src/pkg/manifests/system-library-math.inc @@ -17,7 +17,7 @@ dir path=lib dir path=lib/$(ARCH64) -$(i386_ONLY)dir path=lib/libmvec +dir path=lib/libmvec dir path=usr group=sys dir path=usr/include dir path=usr/include/iso @@ -30,7 +30,7 @@ file path=lib/$(ARCH64)/libm.so.2 file path=lib/$(ARCH64)/libmvec.so.1 file path=lib/libm.so.2 file path=lib/libmvec.so.1 -$(i386_ONLY)file path=lib/libmvec/libmvec_hwcap1.so.1 +file path=lib/libmvec/libmvec_hwcap1.so.1 file path=usr/include/complex.h file path=usr/include/fenv.h file path=usr/include/floatingpoint.h diff --git a/usr/src/pkg/manifests/system-library-platform.mf b/usr/src/pkg/manifests/system-library-platform.mf index 9b5275177a..0cccb4af8e 100644 --- a/usr/src/pkg/manifests/system-library-platform.mf +++ b/usr/src/pkg/manifests/system-library-platform.mf @@ -31,8 +31,8 @@ set name=info.classification value=org.opensolaris.category.2008:System/Core set name=variant.arch value=$(ARCH) dir path=usr group=sys dir path=usr/platform group=sys -$(i386_ONLY)dir path=usr/platform/i86pc group=sys -$(i386_ONLY)dir path=usr/platform/i86pc/lib +dir path=usr/platform/i86pc group=sys +dir path=usr/platform/i86pc/lib dir path=usr/share/man/man3lib dir path=usr/share/man/man8 file path=usr/share/man/man3lib/libtsalarm.3lib diff --git a/usr/src/pkg/manifests/system-library.inc b/usr/src/pkg/manifests/system-library.inc index 70d91f92a1..1fb5924b30 100644 --- a/usr/src/pkg/manifests/system-library.inc +++ b/usr/src/pkg/manifests/system-library.inc @@ -72,11 +72,11 @@ -$(i386_ONLY)dir path=etc group=sys -$(i386_ONLY)dir path=etc/flash group=sys -$(i386_ONLY)dir path=etc/flash/postcreation group=sys mode=0700 -$(i386_ONLY)dir path=etc/flash/precreation group=sys mode=0700 -$(i386_ONLY)dir path=etc/flash/preexit group=sys mode=0700 +dir path=etc group=sys +dir path=etc/flash group=sys +dir path=etc/flash/postcreation group=sys mode=0700 +dir path=etc/flash/precreation group=sys mode=0700 +dir path=etc/flash/preexit group=sys mode=0700 dir path=lib dir path=lib/$(ARCH64) dir path=lib/crypto @@ -155,7 +155,7 @@ dir path=usr/share/man/man3volmgt dir path=usr/share/man/man3xnet dir path=usr/share/man/man5 dir path=usr/share/man/man7p -$(i386_ONLY)file path=etc/flash/precreation/caplib group=sys mode=0500 +file path=etc/flash/precreation/caplib group=sys mode=0500 file path=lib/$(ARCH64)/ld.so.1 file path=lib/$(ARCH64)/libadm.so.1 file path=lib/$(ARCH64)/libaio.so.1 @@ -179,7 +179,7 @@ file path=lib/$(ARCH64)/libdoor.so.1 file path=lib/$(ARCH64)/libdwarf.so.1 file path=lib/$(ARCH64)/libefi.so.1 file path=lib/$(ARCH64)/libelf.so.1 -$(i386_ONLY)file path=lib/$(ARCH64)/libfdisk.so.1 +file path=lib/$(ARCH64)/libfdisk.so.1 file path=lib/$(ARCH64)/libgen.so.1 file path=lib/$(ARCH64)/libinetutil.so.1 file path=lib/$(ARCH64)/libintl.so.1 @@ -251,7 +251,7 @@ file path=lib/libdwarf.so.1 file path=lib/libefi.so.1 file path=lib/libelf.so.1 file path=lib/libelfsign.so.1 -$(i386_ONLY)file path=lib/libfdisk.so.1 +file path=lib/libfdisk.so.1 file path=lib/libgen.so.1 file path=lib/libinetutil.so.1 file path=lib/libintl.so.1 @@ -329,7 +329,7 @@ file path=usr/lib/$(ARCH64)/libpkcs11.so.1 file path=usr/lib/$(ARCH64)/libproject.so.1 file path=usr/lib/$(ARCH64)/libraidcfg.so.1 file path=usr/lib/$(ARCH64)/libreparse.so.1 -$(i386_ONLY)file path=usr/lib/$(ARCH64)/libsaveargs.so.1 +file path=usr/lib/$(ARCH64)/libsaveargs.so.1 file path=usr/lib/$(ARCH64)/libsched.so.1 file path=usr/lib/$(ARCH64)/libsctp.so.1 file path=usr/lib/$(ARCH64)/libsff.so.1 @@ -347,13 +347,13 @@ file path=usr/lib/$(ARCH64)/straddr.so.2 file path=usr/lib/$(ARCH64)/watchmalloc.so.1 file path=usr/lib/cfgadm/$(ARCH64)/ib.so.1 file path=usr/lib/cfgadm/$(ARCH64)/pci.so.1 -$(i386_ONLY)file path=usr/lib/cfgadm/$(ARCH64)/sata.so.1 +file path=usr/lib/cfgadm/$(ARCH64)/sata.so.1 file path=usr/lib/cfgadm/$(ARCH64)/scsi.so.1 file path=usr/lib/cfgadm/$(ARCH64)/shp.so.1 file path=usr/lib/cfgadm/$(ARCH64)/usb.so.1 file path=usr/lib/cfgadm/ib.so.1 file path=usr/lib/cfgadm/pci.so.1 -$(i386_ONLY)file path=usr/lib/cfgadm/sata.so.1 +file path=usr/lib/cfgadm/sata.so.1 file path=usr/lib/cfgadm/scsi.so.1 file path=usr/lib/cfgadm/shp.so.1 file path=usr/lib/cfgadm/usb.so.1 @@ -536,7 +536,7 @@ link path=lib/$(ARCH64)/libdlpi.so target=libdlpi.so.1 link path=lib/$(ARCH64)/libdoor.so target=libdoor.so.1 link path=lib/$(ARCH64)/libefi.so target=libefi.so.1 link path=lib/$(ARCH64)/libelf.so target=libelf.so.1 -$(i386_ONLY)link path=lib/$(ARCH64)/libfdisk.so target=libfdisk.so.1 +link path=lib/$(ARCH64)/libfdisk.so target=libfdisk.so.1 link path=lib/$(ARCH64)/libgen.so target=libgen.so.1 link path=lib/$(ARCH64)/libintl.so target=libintl.so.1 link path=lib/$(ARCH64)/libkmf.so target=libkmf.so.1 @@ -594,7 +594,7 @@ link path=lib/libdoor.so target=libdoor.so.1 link path=lib/libefi.so target=libefi.so.1 link path=lib/libelf.so target=libelf.so.1 link path=lib/libelfsign.so target=libelfsign.so.1 -$(i386_ONLY)link path=lib/libfdisk.so target=libfdisk.so.1 +link path=lib/libfdisk.so target=libfdisk.so.1 link path=lib/libgen.so target=libgen.so.1 link path=lib/libintl.so target=libintl.so.1 link path=lib/libipmp.so target=./libipmp.so.1 @@ -712,9 +712,9 @@ link path=usr/lib/$(ARCH64)/libelf.so \ link path=usr/lib/$(ARCH64)/libelf.so.1 \ target=../../../lib/$(ARCH64)/libelf.so.1 link path=usr/lib/$(ARCH64)/libexacct.so target=libexacct.so.1 -$(i386_ONLY)link path=usr/lib/$(ARCH64)/libfdisk.so \ +link path=usr/lib/$(ARCH64)/libfdisk.so \ target=../../../lib/$(ARCH64)/libfdisk.so.1 -$(i386_ONLY)link path=usr/lib/$(ARCH64)/libfdisk.so.1 \ +link path=usr/lib/$(ARCH64)/libfdisk.so.1 \ target=../../../lib/$(ARCH64)/libfdisk.so.1 link path=usr/lib/$(ARCH64)/libfstyp.so target=./libfstyp.so.1 link path=usr/lib/$(ARCH64)/libgen.so \ @@ -792,7 +792,7 @@ link path=usr/lib/$(ARCH64)/libresolv.so \ target=../../../lib/$(ARCH64)/libresolv.so.2 link path=usr/lib/$(ARCH64)/libresolv.so.2 \ target=../../../lib/$(ARCH64)/libresolv.so.2 -$(i386_ONLY)link path=usr/lib/$(ARCH64)/librestart.so \ +link path=usr/lib/$(ARCH64)/librestart.so \ target=../../../lib/$(ARCH64)/librestart.so.1 link path=usr/lib/$(ARCH64)/librestart.so.1 \ target=../../../lib/$(ARCH64)/librestart.so.1 @@ -873,13 +873,13 @@ link path=usr/lib/32 target=. link path=usr/lib/64 target=$(ARCH64) link path=usr/lib/cfgadm/$(ARCH64)/ib.so target=./ib.so.1 link path=usr/lib/cfgadm/$(ARCH64)/pci.so target=./pci.so.1 -$(i386_ONLY)link path=usr/lib/cfgadm/$(ARCH64)/sata.so target=./sata.so.1 +link path=usr/lib/cfgadm/$(ARCH64)/sata.so target=./sata.so.1 link path=usr/lib/cfgadm/$(ARCH64)/scsi.so target=./scsi.so.1 link path=usr/lib/cfgadm/$(ARCH64)/shp.so target=./shp.so.1 link path=usr/lib/cfgadm/$(ARCH64)/usb.so target=./usb.so.1 link path=usr/lib/cfgadm/ib.so target=./ib.so.1 link path=usr/lib/cfgadm/pci.so target=./pci.so.1 -$(i386_ONLY)link path=usr/lib/cfgadm/sata.so target=./sata.so.1 +link path=usr/lib/cfgadm/sata.so target=./sata.so.1 link path=usr/lib/cfgadm/scsi.so target=./scsi.so.1 link path=usr/lib/cfgadm/shp.so target=./shp.so.1 link path=usr/lib/cfgadm/usb.so target=./usb.so.1 @@ -932,8 +932,8 @@ link path=usr/lib/libefi.so.1 target=../../lib/libefi.so.1 link path=usr/lib/libelf.so target=../../lib/libelf.so.1 link path=usr/lib/libelf.so.1 target=../../lib/libelf.so.1 link path=usr/lib/libexacct.so target=./libexacct.so.1 -$(i386_ONLY)link path=usr/lib/libfdisk.so target=../../lib/libfdisk.so.1 -$(i386_ONLY)link path=usr/lib/libfdisk.so.1 target=../../lib/libfdisk.so.1 +link path=usr/lib/libfdisk.so target=../../lib/libfdisk.so.1 +link path=usr/lib/libfdisk.so.1 target=../../lib/libfdisk.so.1 link path=usr/lib/libfstyp.so target=./libfstyp.so.1 link path=usr/lib/libgen.so target=../../lib/libgen.so.1 link path=usr/lib/libgen.so.1 target=../../lib/libgen.so.1 diff --git a/usr/src/pkg/manifests/system-test-ostest.mf b/usr/src/pkg/manifests/system-test-ostest.mf index 328edc5f56..937ff6def2 100644 --- a/usr/src/pkg/manifests/system-test-ostest.mf +++ b/usr/src/pkg/manifests/system-test-ostest.mf @@ -26,7 +26,7 @@ dir path=opt/os-tests/bin dir path=opt/os-tests/runfiles dir path=opt/os-tests/tests dir path=opt/os-tests/tests/file-locking -$(i386_ONLY)dir path=opt/os-tests/tests/i386 +dir path=opt/os-tests/tests/i386 dir path=opt/os-tests/tests/pf_key dir path=opt/os-tests/tests/sdevfs dir path=opt/os-tests/tests/secflags @@ -41,8 +41,8 @@ file path=opt/os-tests/tests/file-locking/acquire-lock.32 mode=0555 file path=opt/os-tests/tests/file-locking/acquire-lock.64 mode=0555 file path=opt/os-tests/tests/file-locking/runtests.32 mode=0555 file path=opt/os-tests/tests/file-locking/runtests.64 mode=0555 -$(i386_ONLY)file path=opt/os-tests/tests/i386/badseg mode=0555 -$(i386_ONLY)file path=opt/os-tests/tests/i386/ldt mode=0555 +file path=opt/os-tests/tests/i386/badseg mode=0555 +file path=opt/os-tests/tests/i386/ldt mode=0555 file path=opt/os-tests/tests/pf_key/acquire-compare mode=0555 file path=opt/os-tests/tests/pf_key/acquire-spray mode=0555 file path=opt/os-tests/tests/pf_key/eacq-enabler mode=0555 diff --git a/usr/src/pkg/manifests/system-test-zfstest.mf b/usr/src/pkg/manifests/system-test-zfstest.mf index d3fd61e27c..1c0e31f11a 100644 --- a/usr/src/pkg/manifests/system-test-zfstest.mf +++ b/usr/src/pkg/manifests/system-test-zfstest.mf @@ -602,21 +602,15 @@ file \ file \ path=opt/zfs-tests/tests/functional/channel_program/synctask_core/tst.snapshot_simple.zcp \ mode=0444 -$(i386_ONLY)file path=opt/zfs-tests/tests/functional/checksum/edonr_test.amd64 \ - mode=0555 -$(i386_ONLY)file path=opt/zfs-tests/tests/functional/checksum/edonr_test.i386 \ - mode=0555 +file path=opt/zfs-tests/tests/functional/checksum/edonr_test.amd64 mode=0555 +file path=opt/zfs-tests/tests/functional/checksum/edonr_test.i386 mode=0555 file path=opt/zfs-tests/tests/functional/checksum/run_edonr_test mode=0555 file path=opt/zfs-tests/tests/functional/checksum/run_sha2_test mode=0555 file path=opt/zfs-tests/tests/functional/checksum/run_skein_test mode=0555 -$(i386_ONLY)file path=opt/zfs-tests/tests/functional/checksum/sha2_test.amd64 \ - mode=0555 -$(i386_ONLY)file path=opt/zfs-tests/tests/functional/checksum/sha2_test.i386 \ - mode=0555 -$(i386_ONLY)file path=opt/zfs-tests/tests/functional/checksum/skein_test.amd64 \ - mode=0555 -$(i386_ONLY)file path=opt/zfs-tests/tests/functional/checksum/skein_test.i386 \ - mode=0555 +file path=opt/zfs-tests/tests/functional/checksum/sha2_test.amd64 mode=0555 +file path=opt/zfs-tests/tests/functional/checksum/sha2_test.i386 mode=0555 +file path=opt/zfs-tests/tests/functional/checksum/skein_test.amd64 mode=0555 +file path=opt/zfs-tests/tests/functional/checksum/skein_test.i386 mode=0555 file path=opt/zfs-tests/tests/functional/clean_mirror/clean_mirror_001_pos \ mode=0555 file path=opt/zfs-tests/tests/functional/clean_mirror/clean_mirror_002_pos \ diff --git a/usr/src/pkg/manifests/system-zones-brand-sn1.mf b/usr/src/pkg/manifests/system-zones-brand-sn1.mf index d916a8f0df..bf623af9d1 100644 --- a/usr/src/pkg/manifests/system-zones-brand-sn1.mf +++ b/usr/src/pkg/manifests/system-zones-brand-sn1.mf @@ -32,15 +32,15 @@ set name=variant.arch value=$(ARCH) dir path=etc group=sys dir path=etc/zones group=sys dir path=usr group=sys -$(i386_ONLY)dir path=usr/kernel group=sys -$(i386_ONLY)dir path=usr/kernel/brand group=sys +dir path=usr/kernel group=sys +dir path=usr/kernel/brand group=sys dir path=usr/lib dir path=usr/lib/$(ARCH64) dir path=usr/lib/brand dir path=usr/lib/brand/sn1 group=sys dir path=usr/lib/brand/sn1/$(ARCH64) file path=etc/zones/SUNWsn1.xml mode=0444 -$(i386_ONLY)file path=usr/kernel/brand/sn1_brand group=sys mode=0755 +file path=usr/kernel/brand/sn1_brand group=sys mode=0755 file path=usr/lib/$(ARCH64)/sn1_brand.so.1 file path=usr/lib/brand/sn1/$(ARCH64)/sn1_librtld_db.so.1 file path=usr/lib/brand/sn1/config.xml mode=0444 -- 2.11.4.GIT