summaryrefslogtreecommitdiff
path: root/usr/src/pkg/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/pkg/manifests')
-rw-r--r--usr/src/pkg/manifests/SUNWcs.mf74
-rw-r--r--usr/src/pkg/manifests/developer-debug-mdb-module-module-fibre-channel.mf3
-rw-r--r--usr/src/pkg/manifests/developer-debug-mdb-module-module-qlc.mf1
-rw-r--r--usr/src/pkg/manifests/developer-debug-mdb.mf97
-rw-r--r--usr/src/pkg/manifests/developer-driver-ftsafe.mf1
-rw-r--r--usr/src/pkg/manifests/developer-dtrace.mf1
-rw-r--r--usr/src/pkg/manifests/diagnostic-cpu-counters.mf27
-rw-r--r--usr/src/pkg/manifests/driver-audio-audio810.mf1
-rw-r--r--usr/src/pkg/manifests/driver-audio-audiocmi.mf1
-rw-r--r--usr/src/pkg/manifests/driver-audio-audiocmihd.mf1
-rw-r--r--usr/src/pkg/manifests/driver-audio-audioemu10k.mf1
-rw-r--r--usr/src/pkg/manifests/driver-audio-audiohd.mf1
-rw-r--r--usr/src/pkg/manifests/driver-audio-audioixp.mf1
-rw-r--r--usr/src/pkg/manifests/driver-audio-audiols.mf1
-rw-r--r--usr/src/pkg/manifests/driver-audio-audiop16x.mf1
-rw-r--r--usr/src/pkg/manifests/driver-audio-audiosolo.mf1
-rw-r--r--usr/src/pkg/manifests/driver-audio-audiovia823x.mf1
-rw-r--r--usr/src/pkg/manifests/driver-audio.mf6
-rw-r--r--usr/src/pkg/manifests/driver-crypto-dca.mf1
-rw-r--r--usr/src/pkg/manifests/driver-crypto-dprov.mf2
-rw-r--r--usr/src/pkg/manifests/driver-crypto-tpm.mf1
-rw-r--r--usr/src/pkg/manifests/driver-firewire.mf2
-rw-r--r--usr/src/pkg/manifests/driver-graphics-agpgart.mf4
-rw-r--r--usr/src/pkg/manifests/driver-graphics-atiatom.mf1
-rw-r--r--usr/src/pkg/manifests/driver-graphics-av1394.mf1
-rw-r--r--usr/src/pkg/manifests/driver-graphics-dcam1394.mf1
-rw-r--r--usr/src/pkg/manifests/driver-graphics-drm.mf3
-rw-r--r--usr/src/pkg/manifests/driver-graphics-usbvc.mf1
-rw-r--r--usr/src/pkg/manifests/driver-i86pc-fipe.mf1
-rw-r--r--usr/src/pkg/manifests/driver-i86pc-ioat.mf3
-rw-r--r--usr/src/pkg/manifests/driver-i86pc-platform.mf13
-rw-r--r--usr/src/pkg/manifests/driver-ipmi.mf1
-rw-r--r--usr/src/pkg/manifests/driver-misc-virtio.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-afe.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-amd8111s.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-arn.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-atge.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-ath.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-atu.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-axf.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-bfe.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-bge.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-bnx.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-bnxe.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-bpf.mf2
-rw-r--r--usr/src/pkg/manifests/driver-network-chxge.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-cxgbe.mf2
-rw-r--r--usr/src/pkg/manifests/driver-network-dmfe.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-e1000g.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-efe.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-elxl.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-emlxs.mf5
-rw-r--r--usr/src/pkg/manifests/driver-network-eoib.mf2
-rw-r--r--usr/src/pkg/manifests/driver-network-fcip.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-fcoe.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-fcoei.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-fcoet.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-fcp.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-fcsm.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-fp.mf2
-rw-r--r--usr/src/pkg/manifests/driver-network-hermon.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-hme.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-hxge.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-i40e.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-ib.mf5
-rw-r--r--usr/src/pkg/manifests/driver-network-ibdma.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-ibp.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-igb.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-iprb.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-ipw.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-iwh.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-iwi.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-iwk.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-iwn.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-iwp.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-ixgb.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-ixgbe.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-mwl.mf2
-rw-r--r--usr/src/pkg/manifests/driver-network-mxfe.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-myri10ge.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-nge.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-ntxn.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-nxge.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-ofk.mf4
-rw-r--r--usr/src/pkg/manifests/driver-network-pcn.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-platform.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-qlc.mf8
-rw-r--r--usr/src/pkg/manifests/driver-network-ral.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-rds.mf2
-rw-r--r--usr/src/pkg/manifests/driver-network-rdsv3.mf2
-rw-r--r--usr/src/pkg/manifests/driver-network-rge.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-rpcib.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-rtls.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-rtw.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-rum.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-rwd.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-rwn.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-sdp.mf2
-rw-r--r--usr/src/pkg/manifests/driver-network-sdpib.mf2
-rw-r--r--usr/src/pkg/manifests/driver-network-sfe.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-sfxge.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-srpt.mf3
-rw-r--r--usr/src/pkg/manifests/driver-network-tavor.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-uath.mf2
-rw-r--r--usr/src/pkg/manifests/driver-network-udmf.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-upf.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-ural.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-urf.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-urtw.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-usbecm.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-vioif.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-vmxnet3s.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-vr.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-wpi.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-xge.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-yge.mf1
-rw-r--r--usr/src/pkg/manifests/driver-network-zyd.mf1
-rw-r--r--usr/src/pkg/manifests/driver-pcmcia.mf2
-rw-r--r--usr/src/pkg/manifests/driver-serial-usbftdi.mf1
-rw-r--r--usr/src/pkg/manifests/driver-serial-usbsacm.mf1
-rw-r--r--usr/src/pkg/manifests/driver-serial-usbser.mf1
-rw-r--r--usr/src/pkg/manifests/driver-serial-usbser_edge.mf1
-rw-r--r--usr/src/pkg/manifests/driver-serial-usbsksp-usbs49_fw.mf2
-rw-r--r--usr/src/pkg/manifests/driver-serial-usbsksp.mf1
-rw-r--r--usr/src/pkg/manifests/driver-serial-usbsprl.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-aac.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-adpu320.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-ahci.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-amr.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-arcmsr.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-ata.mf3
-rw-r--r--usr/src/pkg/manifests/driver-storage-bcm_sata.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-blkdev.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-cpqary3.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-glm.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-lsimega.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-marvell88sx.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-mega_sas.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-mpt_sas.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-mr_sas.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-nv_sata.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-nvme.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-pmcs.mf4
-rw-r--r--usr/src/pkg/manifests/driver-storage-pvscsi.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-sbp2.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-scsa1394.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-sdcard.mf2
-rw-r--r--usr/src/pkg/manifests/driver-storage-ses.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-si3124.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-skd.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-smp.mf1
-rw-r--r--usr/src/pkg/manifests/driver-storage-sv.mf3
-rw-r--r--usr/src/pkg/manifests/driver-storage-vioblk.mf1
-rw-r--r--usr/src/pkg/manifests/driver-usb-ugen.mf1
-rw-r--r--usr/src/pkg/manifests/driver-usb-usbgem.mf1
-rw-r--r--usr/src/pkg/manifests/driver-usb.mf21
-rw-r--r--usr/src/pkg/manifests/driver-x11-winlock.mf1
-rw-r--r--usr/src/pkg/manifests/driver-x11-xsvc.mf2
-rw-r--r--usr/src/pkg/manifests/driver-xvm-pv.mf10
-rw-r--r--usr/src/pkg/manifests/network-ipd.mf1
-rw-r--r--usr/src/pkg/manifests/network-ipfilter.mf1
-rw-r--r--usr/src/pkg/manifests/network-iscsi-initiator.mf1
-rw-r--r--usr/src/pkg/manifests/network-iscsi-iser.mf4
-rw-r--r--usr/src/pkg/manifests/network-iscsi-target.mf1
-rw-r--r--usr/src/pkg/manifests/service-fault-management.mf1
-rw-r--r--usr/src/pkg/manifests/service-file-system-nfs.mf1
-rw-r--r--usr/src/pkg/manifests/service-file-system-smb.mf3
-rw-r--r--usr/src/pkg/manifests/service-resource-pools.mf1
-rw-r--r--usr/src/pkg/manifests/service-storage-avs-cache-management.mf9
-rw-r--r--usr/src/pkg/manifests/service-storage-virus-scan.mf1
-rw-r--r--usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf3
-rw-r--r--usr/src/pkg/manifests/storage-avs-remote-mirror.mf7
-rw-r--r--usr/src/pkg/manifests/storage-stmf.mf9
-rw-r--r--usr/src/pkg/manifests/system-file-system-nfs.mf5
-rw-r--r--usr/src/pkg/manifests/system-file-system-smb.mf6
-rw-r--r--usr/src/pkg/manifests/system-file-system-udfs.mf1
-rw-r--r--usr/src/pkg/manifests/system-file-system-zfs-tests.mf1
-rw-r--r--usr/src/pkg/manifests/system-file-system-zfs.mf4
-rw-r--r--usr/src/pkg/manifests/system-io-tests.mf6
-rw-r--r--usr/src/pkg/manifests/system-kernel-cpu-counters.mf2
-rw-r--r--usr/src/pkg/manifests/system-kernel-dtrace-providers-xdt.mf1
-rw-r--r--usr/src/pkg/manifests/system-kernel-dtrace-providers.mf19
-rw-r--r--usr/src/pkg/manifests/system-kernel-platform.mf65
-rw-r--r--usr/src/pkg/manifests/system-kernel-power.mf1
-rw-r--r--usr/src/pkg/manifests/system-kernel-rsmops.mf1
-rw-r--r--usr/src/pkg/manifests/system-kernel-secure-rpc.mf1
-rw-r--r--usr/src/pkg/manifests/system-kernel-security-gss.mf2
-rw-r--r--usr/src/pkg/manifests/system-kernel-suspend-resume.mf2
-rw-r--r--usr/src/pkg/manifests/system-kernel.mf234
-rw-r--r--usr/src/pkg/manifests/system-network-http-cache-accelerator.mf2
-rw-r--r--usr/src/pkg/manifests/system-network-ipqos-ipqos-config.mf5
-rw-r--r--usr/src/pkg/manifests/system-network-ppp.mf5
-rw-r--r--usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf1
-rw-r--r--usr/src/pkg/manifests/system-remote-shared-memory.mf1
-rw-r--r--usr/src/pkg/manifests/system-scheduler-fss.mf1
-rw-r--r--usr/src/pkg/manifests/system-tnf.mf1
-rw-r--r--usr/src/pkg/manifests/system-zones-brand-s10.mf1
-rw-r--r--usr/src/pkg/manifests/system-zones-brand-sn1.mf1
-rw-r--r--usr/src/pkg/manifests/system-zones.mf1
199 files changed, 12 insertions, 853 deletions
diff --git a/usr/src/pkg/manifests/SUNWcs.mf b/usr/src/pkg/manifests/SUNWcs.mf
index b547cef60f..64ae87b79a 100644
--- a/usr/src/pkg/manifests/SUNWcs.mf
+++ b/usr/src/pkg/manifests/SUNWcs.mf
@@ -202,7 +202,6 @@ dir path=usr/lib/help/profiles/locale
dir path=usr/lib/help/profiles/locale/C
dir path=usr/lib/iconv
dir path=usr/lib/inet
-dir path=usr/lib/inet/$(ARCH32)
dir path=usr/lib/inet/$(ARCH64)
dir path=usr/lib/locale
dir path=usr/lib/locale/C
@@ -871,54 +870,30 @@ file path=usr/kernel/drv/$(ARCH64)/logindmux group=sys
file path=usr/kernel/drv/$(ARCH64)/ptm group=sys
file path=usr/kernel/drv/$(ARCH64)/pts group=sys
file path=usr/kernel/drv/$(ARCH64)/timerfd group=sys
-$(i386_ONLY)file path=usr/kernel/drv/dump group=sys
file path=usr/kernel/drv/dump.conf group=sys
-$(i386_ONLY)file path=usr/kernel/drv/eventfd group=sys
file path=usr/kernel/drv/eventfd.conf group=sys
-$(i386_ONLY)file path=usr/kernel/drv/fssnap group=sys
file path=usr/kernel/drv/fssnap.conf group=sys
-$(i386_ONLY)file path=usr/kernel/drv/kstat group=sys
file path=usr/kernel/drv/kstat.conf group=sys
-$(i386_ONLY)file path=usr/kernel/drv/ksyms group=sys
file path=usr/kernel/drv/ksyms.conf group=sys
-$(i386_ONLY)file path=usr/kernel/drv/logindmux group=sys
file path=usr/kernel/drv/logindmux.conf group=sys
-$(i386_ONLY)file path=usr/kernel/drv/ptm group=sys
file path=usr/kernel/drv/ptm.conf group=sys
-$(i386_ONLY)file path=usr/kernel/drv/pts group=sys
file path=usr/kernel/drv/pts.conf group=sys
-$(i386_ONLY)file path=usr/kernel/drv/timerfd group=sys
file path=usr/kernel/drv/timerfd.conf group=sys
file path=usr/kernel/exec/$(ARCH64)/javaexec group=sys mode=0755
file path=usr/kernel/exec/$(ARCH64)/shbinexec group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/exec/javaexec group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/exec/shbinexec group=sys mode=0755
file path=usr/kernel/fs/$(ARCH64)/fdfs group=sys mode=0755
file path=usr/kernel/fs/$(ARCH64)/pcfs group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/fs/fdfs group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/fs/pcfs group=sys mode=0755
file path=usr/kernel/sched/$(ARCH64)/FX group=sys mode=0755
file path=usr/kernel/sched/$(ARCH64)/FX_DPTBL group=sys mode=0755
file path=usr/kernel/sched/$(ARCH64)/IA group=sys mode=0755
file path=usr/kernel/sched/$(ARCH64)/RT group=sys mode=0755
file path=usr/kernel/sched/$(ARCH64)/RT_DPTBL group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/sched/FX group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/sched/FX_DPTBL group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/sched/IA group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/sched/RT group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/sched/RT_DPTBL group=sys mode=0755
file path=usr/kernel/strmod/$(ARCH64)/cryptmod group=sys mode=0755
file path=usr/kernel/strmod/$(ARCH64)/rlmod group=sys mode=0755
file path=usr/kernel/strmod/$(ARCH64)/telmod group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/strmod/cryptmod group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/strmod/rlmod group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/strmod/telmod group=sys mode=0755
file path=usr/kernel/sys/$(ARCH64)/acctctl group=sys mode=0755
file path=usr/kernel/sys/$(ARCH64)/exacctsys group=sys mode=0755
file path=usr/kernel/sys/$(ARCH64)/sysacct group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/sys/acctctl group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/sys/exacctsys group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/sys/sysacct group=sys mode=0755
file path=usr/kvm/README group=sys
file path=usr/lib/$(ARCH64)/libshare.so.1
file path=usr/lib/audit/audit_record_attr mode=0444
@@ -1199,7 +1174,6 @@ file path=usr/lib/iconv/8859.646it.t mode=0444
file path=usr/lib/iconv/8859.646sv.t mode=0444
file path=usr/lib/iconv/iconv_data mode=0444
file path=usr/lib/idmapd mode=0555
-file path=usr/lib/inet/$(ARCH32)/in.iked mode=0555
file path=usr/lib/inet/$(ARCH64)/in.iked mode=0555
file path=usr/lib/inet/certdb mode=0555
file path=usr/lib/inet/certlocal mode=0555
@@ -1263,32 +1237,9 @@ file path=usr/sadm/install/scripts/r.manifest group=sys mode=0555
file path=usr/sadm/install/scripts/r.pkcs11conf group=sys mode=0555
file path=usr/sadm/install/scripts/r.rbac group=sys mode=0555
file path=usr/sadm/ugdates mode=0444
-$(i386_ONLY)file path=usr/sbin/$(ARCH32)/add_drv group=sys mode=0555
-$(i386_ONLY)file path=usr/sbin/$(ARCH32)/modinfo group=sys mode=0555
-$(i386_ONLY)file path=usr/sbin/$(ARCH32)/modload group=sys mode=0555
-$(i386_ONLY)file path=usr/sbin/$(ARCH32)/modunload group=sys mode=0555
-$(i386_ONLY)file path=usr/sbin/$(ARCH32)/pbind group=sys mode=0555
-$(i386_ONLY)file path=usr/sbin/$(ARCH32)/prtconf group=sys mode=2555
-$(i386_ONLY)file path=usr/sbin/$(ARCH32)/psrset group=sys mode=0555
-$(i386_ONLY)file path=usr/sbin/$(ARCH32)/rem_drv group=sys mode=0555
-$(i386_ONLY)file path=usr/sbin/$(ARCH32)/swap group=sys mode=2555
-$(i386_ONLY)file path=usr/sbin/$(ARCH32)/sysdef group=sys mode=2555
-$(i386_ONLY)file path=usr/sbin/$(ARCH32)/update_drv group=sys mode=0555
-$(i386_ONLY)file path=usr/sbin/$(ARCH32)/whodo mode=4555
-file path=usr/sbin/$(ARCH64)/add_drv group=sys mode=0555
-file path=usr/sbin/$(ARCH64)/modinfo group=sys mode=0555
-file path=usr/sbin/$(ARCH64)/modload group=sys mode=0555
-file path=usr/sbin/$(ARCH64)/modunload group=sys mode=0555
-file path=usr/sbin/$(ARCH64)/pbind group=sys mode=0555
-file path=usr/sbin/$(ARCH64)/prtconf group=sys mode=2555
-file path=usr/sbin/$(ARCH64)/psrset group=sys mode=0555
-file path=usr/sbin/$(ARCH64)/rem_drv group=sys mode=0555
-file path=usr/sbin/$(ARCH64)/swap group=sys mode=2555
-file path=usr/sbin/$(ARCH64)/sysdef group=sys mode=2555
-file path=usr/sbin/$(ARCH64)/update_drv group=sys mode=0555
-file path=usr/sbin/$(ARCH64)/whodo mode=4555
file path=usr/sbin/6to4relay mode=0555
file path=usr/sbin/acctadm mode=0555
+file path=usr/sbin/add_drv group=sys mode=0555
file path=usr/sbin/allocate mode=4555
file path=usr/sbin/arp mode=0555
file path=usr/sbin/audit mode=0555
@@ -1350,6 +1301,9 @@ file path=usr/sbin/makedbm mode=0555
file path=usr/sbin/mkdevalloc mode=0555
file path=usr/sbin/mkfile mode=0555
file path=usr/sbin/mknod mode=0555
+file path=usr/sbin/modinfo group=sys mode=0555
+file path=usr/sbin/modload group=sys mode=0555
+file path=usr/sbin/modunload group=sys mode=0555
file path=usr/sbin/mountall group=sys mode=0555
file path=usr/sbin/msgid mode=0555
file path=usr/sbin/mvdir mode=0555
@@ -1360,18 +1314,22 @@ file path=usr/sbin/nltest mode=0555
file path=usr/sbin/nscd mode=0555
file path=usr/sbin/nwamadm mode=0555
file path=usr/sbin/nwamcfg mode=0555
+file path=usr/sbin/pbind group=sys mode=0555
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/prtvtoc group=sys mode=0555
file path=usr/sbin/psradm group=sys mode=0555
file path=usr/sbin/psrinfo group=sys mode=0555
+file path=usr/sbin/psrset group=sys mode=0555
file path=usr/sbin/pwck mode=0555
file path=usr/sbin/pwconv group=sys mode=0555
file path=usr/sbin/raidctl mode=0555
file path=usr/sbin/ramdiskadm mode=0555
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
@@ -1389,9 +1347,11 @@ file path=usr/sbin/strerr group=sys mode=0555
file path=usr/sbin/sttydefs group=sys mode=0755
file path=usr/sbin/svcadm mode=0555
file path=usr/sbin/svccfg mode=0555
+file path=usr/sbin/swap group=sys mode=2555
file path=usr/sbin/syncinit mode=0555
file path=usr/sbin/syncloop mode=0555
file path=usr/sbin/syncstat mode=0555
+file path=usr/sbin/sysdef group=sys mode=2555
file path=usr/sbin/syseventadm group=sys mode=0555
file path=usr/sbin/syslogd group=sys mode=0555
file path=usr/sbin/tar mode=0555
@@ -1402,12 +1362,14 @@ $(i386_ONLY)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
+file path=usr/sbin/update_drv group=sys mode=0555
file path=usr/sbin/useradd group=sys mode=0555
file path=usr/sbin/userdel group=sys mode=0555
file path=usr/sbin/usermod group=sys mode=0555
$(sparc_ONLY)file path=usr/sbin/virtinfo mode=0555
file path=usr/sbin/volcopy mode=0555
file path=usr/sbin/wall group=tty mode=2555
+file path=usr/sbin/whodo mode=4555
file path=usr/sbin/zdump mode=0555
file path=usr/sbin/zic mode=0555
file path=usr/share/doc/ksh/COMPATIBILITY
@@ -1595,7 +1557,6 @@ hardlink path=usr/sadm/bin/valstr target=../../../usr/bin/ckstr
hardlink path=usr/sadm/bin/valtime target=../../../usr/bin/cktime
hardlink path=usr/sadm/bin/valuid target=../../../usr/bin/ckuid
hardlink path=usr/sadm/bin/valyorn target=../../../usr/bin/ckyorn
-hardlink path=usr/sbin/add_drv target=../../usr/lib/isaexec
hardlink path=usr/sbin/audlinks target=./devfsadm
hardlink path=usr/sbin/consadmd target=../../usr/sbin/consadm
hardlink path=usr/sbin/deallocate target=../../usr/sbin/allocate
@@ -1605,27 +1566,16 @@ hardlink path=usr/sbin/disks target=./devfsadm
hardlink path=usr/sbin/drvconfig target=./devfsadm
hardlink path=usr/sbin/list_devices target=../../usr/sbin/allocate
hardlink path=usr/sbin/mkdevmaps target=../../usr/sbin/mkdevalloc
-hardlink path=usr/sbin/modinfo target=../../usr/lib/isaexec
-hardlink path=usr/sbin/modload target=../../usr/lib/isaexec
-hardlink path=usr/sbin/modunload target=../../usr/lib/isaexec
-hardlink path=usr/sbin/pbind target=../../usr/lib/isaexec
hardlink path=usr/sbin/ports target=./devfsadm
hardlink path=usr/sbin/poweroff target=./halt
-hardlink path=usr/sbin/prtconf target=../../usr/lib/isaexec
$(sparc_ONLY)hardlink path=usr/sbin/prtdiag target=../../usr/lib/platexec
-hardlink path=usr/sbin/psrset target=../../usr/lib/isaexec
hardlink path=usr/sbin/reboot target=./halt
-hardlink path=usr/sbin/rem_drv target=../../usr/lib/isaexec
hardlink path=usr/sbin/roleadd target=../../usr/sbin/useradd
hardlink path=usr/sbin/roledel target=../../usr/sbin/userdel
hardlink path=usr/sbin/rolemod target=../../usr/sbin/usermod
hardlink path=usr/sbin/share target=../../usr/sbin/sharemgr
-hardlink path=usr/sbin/swap target=../../usr/lib/isaexec
-hardlink path=usr/sbin/sysdef target=../../usr/lib/isaexec
hardlink path=usr/sbin/tapes target=./devfsadm
hardlink path=usr/sbin/unshare target=../../usr/sbin/sharemgr
-hardlink path=usr/sbin/update_drv target=../../usr/lib/isaexec
-hardlink path=usr/sbin/whodo target=../../usr/lib/isaexec
legacy pkg=SUNWcsr \
desc="core software for a specific instruction-set architecture" \
name="Core Solaris, (Root)"
diff --git a/usr/src/pkg/manifests/developer-debug-mdb-module-module-fibre-channel.mf b/usr/src/pkg/manifests/developer-debug-mdb-module-module-fibre-channel.mf
index 305772c9fe..cfeacfb9e5 100644
--- a/usr/src/pkg/manifests/developer-debug-mdb-module-module-fibre-channel.mf
+++ b/usr/src/pkg/manifests/developer-debug-mdb-module-module-fibre-channel.mf
@@ -38,9 +38,6 @@ dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
file path=usr/lib/mdb/kvm/$(ARCH64)/fcip.so group=sys mode=0555
file path=usr/lib/mdb/kvm/$(ARCH64)/fcp.so group=sys mode=0555
file path=usr/lib/mdb/kvm/$(ARCH64)/fctl.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/fcip.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/fcp.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/fctl.so group=sys mode=0555
legacy pkg=SUNWfcmdb desc="Fibre Channel adb macros and mdb modules" \
name="Fibre Channel adb macros and mdb modules"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/developer-debug-mdb-module-module-qlc.mf b/usr/src/pkg/manifests/developer-debug-mdb-module-module-qlc.mf
index 4afb78bb43..b0eb2b116a 100644
--- a/usr/src/pkg/manifests/developer-debug-mdb-module-module-qlc.mf
+++ b/usr/src/pkg/manifests/developer-debug-mdb-module-module-qlc.mf
@@ -36,7 +36,6 @@ dir path=usr/lib/mdb group=sys
dir path=usr/lib/mdb/kvm group=sys
dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
file path=usr/lib/mdb/kvm/$(ARCH64)/qlc.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/qlc.so group=sys mode=0555
legacy pkg=SUNWqlcu \
desc="Utilties associated with the Qlogic Fibre Channel Adapter" \
name="Qlogic Fibre Channel Adapter Utilities (usr)"
diff --git a/usr/src/pkg/manifests/developer-debug-mdb.mf b/usr/src/pkg/manifests/developer-debug-mdb.mf
index 34be68fa23..bd64e89854 100644
--- a/usr/src/pkg/manifests/developer-debug-mdb.mf
+++ b/usr/src/pkg/manifests/developer-debug-mdb.mf
@@ -129,42 +129,6 @@ $(sparc_ONLY)file path=kernel/kmdb/$(ARCH64)/ssd group=sys mode=0555
file path=kernel/kmdb/$(ARCH64)/ufs group=sys mode=0555
$(i386_ONLY)file path=kernel/kmdb/$(ARCH64)/uhci group=sys mode=0555
file path=kernel/kmdb/$(ARCH64)/usba group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/arp group=sys mode=0555
-$(i386_ONLY)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
-$(i386_ONLY)file path=kernel/kmdb/crypto group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/genunix group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/hook group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/i40e group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/ip group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/ipc group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/ipp group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/krtld group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/lofs group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/logindmux group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/mac group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/mdb_ds group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/mm group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/mpt group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/mpt_sas group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/mr_sas group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/nca group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/neti group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/nfs group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/ptm group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/random group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/s1394 group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/sata group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/scsi_vhci group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/sctp group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/sd group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/sockfs group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/specfs group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/sppp group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/ufs group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/uhci group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/usba group=sys mode=0555
$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/$(ARCH64)/apix group=sys \
mode=0555
$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/$(ARCH64)/pcplusmp group=sys \
@@ -173,19 +137,12 @@ $(i386_ONLY)file path=platform/i86pc/kernel/kmdb/$(ARCH64)/unix group=sys \
mode=0555
$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/$(ARCH64)/uppc group=sys \
mode=0555
-$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/apix group=sys mode=0555
-$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/pcplusmp group=sys mode=0555
-$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/unix group=sys mode=0555
-$(i386_ONLY)file path=platform/i86pc/kernel/kmdb/uppc group=sys mode=0555
$(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/$(ARCH64)/unix group=sys \
mode=0555
$(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/$(ARCH64)/xpv_psm group=sys \
mode=0555
$(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/$(ARCH64)/xpv_uppc group=sys \
mode=0555
-$(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/unix group=sys mode=0555
-$(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/xpv_psm group=sys mode=0555
-$(i386_ONLY)file path=platform/i86xpv/kernel/kmdb/xpv_uppc group=sys mode=0555
$(sparc_ONLY)file path=platform/sun4u/kernel/kmdb/$(ARCH64)/oplhwd group=sys \
mode=0555
$(sparc_ONLY)file path=platform/sun4u/kernel/kmdb/$(ARCH64)/sgenv group=sys \
@@ -248,44 +205,6 @@ $(sparc_ONLY)file path=usr/lib/mdb/kvm/$(ARCH64)/ssd.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)/usba.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/arp.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/cpc.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/cpu.generic.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/cpu_ms.AuthenticAMD.15.so group=sys \
- mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/crypto.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/genunix.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/hook.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/i40e.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/ip.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/ipc.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/ipp.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/krtld.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/lofs.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/logindmux.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/mac.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/mdb_kb.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/mdb_ks.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/mm.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/mpt.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/mpt_sas.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/mr_sas.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/nca.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/neti.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/nfs.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/ptm.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/random.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/s1394.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/sata.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/scsi_vhci.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/sctp.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/sd.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/sockfs.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/specfs.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/sppp.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/ufs.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/uhci.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/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
file path=usr/lib/mdb/proc/$(ARCH64)/libc.so group=sys mode=0555
@@ -323,14 +242,6 @@ $(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
-$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/apix.so group=sys \
- mode=0555
-$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/pcplusmp.so group=sys \
- mode=0555
-$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/unix.so group=sys \
- mode=0555
-$(i386_ONLY)file path=usr/platform/i86pc/lib/mdb/kvm/uppc.so group=sys \
- mode=0555
$(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/$(ARCH64)/unix.so \
group=sys mode=0555
$(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/$(ARCH64)/xpv.so \
@@ -339,14 +250,6 @@ $(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/$(ARCH64)/xpv_psm.so \
group=sys mode=0555
$(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/$(ARCH64)/xpv_uppc.so \
group=sys mode=0555
-$(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/unix.so group=sys \
- mode=0555
-$(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/xpv.so group=sys \
- mode=0555
-$(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/xpv_psm.so group=sys \
- mode=0555
-$(i386_ONLY)file path=usr/platform/i86xpv/lib/mdb/kvm/xpv_uppc.so group=sys \
- mode=0555
$(sparc_ONLY)file path=usr/platform/sun4u/lib/mdb/kvm/$(ARCH64)/oplhwd.so \
group=sys mode=0555
$(sparc_ONLY)file path=usr/platform/sun4u/lib/mdb/kvm/$(ARCH64)/sgenv.so \
diff --git a/usr/src/pkg/manifests/developer-driver-ftsafe.mf b/usr/src/pkg/manifests/developer-driver-ftsafe.mf
index 8947f05e83..f35318495d 100644
--- a/usr/src/pkg/manifests/developer-driver-ftsafe.mf
+++ b/usr/src/pkg/manifests/developer-driver-ftsafe.mf
@@ -38,7 +38,6 @@ dir path=usr/sbin
dir path=usr/share/man/man1m
driver name=bofi perms="* 0600 bin bin"
file path=kernel/drv/$(ARCH64)/bofi group=sys mode=0644
-$(i386_ONLY)file path=kernel/drv/bofi group=sys mode=0644
file path=kernel/drv/bofi.conf group=sys
file path=usr/lib/th_script mode=0555
file path=usr/sbin/th_define mode=0555
diff --git a/usr/src/pkg/manifests/developer-dtrace.mf b/usr/src/pkg/manifests/developer-dtrace.mf
index d8ebeb21a1..c6aa48f53b 100644
--- a/usr/src/pkg/manifests/developer-dtrace.mf
+++ b/usr/src/pkg/manifests/developer-dtrace.mf
@@ -210,7 +210,6 @@ file path=usr/lib/libdtrace_jni.so.1
file path=usr/lib/llib-ldtrace
file path=usr/lib/llib-ldtrace.ln
file path=usr/lib/mdb/kvm/$(ARCH64)/dtrace.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/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
diff --git a/usr/src/pkg/manifests/diagnostic-cpu-counters.mf b/usr/src/pkg/manifests/diagnostic-cpu-counters.mf
index 4000a9fb4e..c2a9fe822b 100644
--- a/usr/src/pkg/manifests/diagnostic-cpu-counters.mf
+++ b/usr/src/pkg/manifests/diagnostic-cpu-counters.mf
@@ -60,11 +60,6 @@ $(i386_ONLY)file path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.6 group=sys \
mode=0755
$(i386_ONLY)file path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.6.15 \
group=sys mode=0755
-$(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 group=sys mode=0755
-$(i386_ONLY)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/$(ARCH64)/llib-lcpc.ln
@@ -107,8 +102,6 @@ $(sparc_ONLY)hardlink path=usr/kernel/pcbe/$(ARCH64)/pcbe.23 target=pcbe.62
$(sparc_ONLY)hardlink path=usr/kernel/pcbe/$(ARCH64)/pcbe.4.7 target=pcbe.4.6
$(i386_ONLY)hardlink path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.5 \
target=pcbe.GenuineIntel.6
-$(i386_ONLY)hardlink path=usr/kernel/pcbe/pcbe.GenuineIntel.5 \
- target=pcbe.GenuineIntel.6
legacy pkg=SUNWcpcu desc="CPU Performance Counter libraries and utilities" \
name="CPU Performance Counter libraries and utilities"
license cr_Sun license=cr_Sun
@@ -137,26 +130,6 @@ $(i386_ONLY)link path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.6.46 \
target=pcbe.GenuineIntel.6.15
$(i386_ONLY)link path=usr/kernel/pcbe/$(ARCH64)/pcbe.GenuineIntel.6.47 \
target=pcbe.GenuineIntel.6.15
-$(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/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/driver-audio-audio810.mf b/usr/src/pkg/manifests/driver-audio-audio810.mf
index afeef1d1b0..c03cd83ca6 100644
--- a/usr/src/pkg/manifests/driver-audio-audio810.mf
+++ b/usr/src/pkg/manifests/driver-audio-audio810.mf
@@ -65,7 +65,6 @@ driver name=audio810 \
alias=pci8086,27de \
alias=pci8086,7195
file path=kernel/drv/$(ARCH64)/audio810 group=sys
-file path=kernel/drv/audio810 group=sys
file path=kernel/drv/audio810.conf group=sys \
original_name=SUNWad810:kernel/drv/audio810.conf preserve=true
file path=usr/share/man/man7d/audio810.7d
diff --git a/usr/src/pkg/manifests/driver-audio-audiocmi.mf b/usr/src/pkg/manifests/driver-audio-audiocmi.mf
index f8770598a7..b42416e166 100644
--- a/usr/src/pkg/manifests/driver-audio-audiocmi.mf
+++ b/usr/src/pkg/manifests/driver-audio-audiocmi.mf
@@ -44,7 +44,6 @@ driver name=audiocmi \
alias=pci13f6,101 \
alias=pci13f6,111
file path=kernel/drv/$(ARCH64)/audiocmi group=sys
-file path=kernel/drv/audiocmi group=sys
file path=usr/share/man/man7d/audiocmi.7d
legacy pkg=SUNWaudiocmi desc="SunOS audio device driver for C-Media 8738" \
name="C-Media 8738 Family Audio Driver"
diff --git a/usr/src/pkg/manifests/driver-audio-audiocmihd.mf b/usr/src/pkg/manifests/driver-audio-audiocmihd.mf
index 63d701f49f..eeb3fdd1cd 100644
--- a/usr/src/pkg/manifests/driver-audio-audiocmihd.mf
+++ b/usr/src/pkg/manifests/driver-audio-audiocmihd.mf
@@ -45,6 +45,5 @@ dir path=usr/share/man
dir path=usr/share/man/man7d
driver name=audiocmihd alias=pci13f6,8788
file path=kernel/drv/$(ARCH64)/audiocmihd group=sys
-$(i386_ONLY)file path=kernel/drv/audiocmihd group=sys
file path=usr/share/man/man7d/audiocmihd.7d
license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-audio-audioemu10k.mf b/usr/src/pkg/manifests/driver-audio-audioemu10k.mf
index 3587a868f8..bc915384ed 100644
--- a/usr/src/pkg/manifests/driver-audio-audioemu10k.mf
+++ b/usr/src/pkg/manifests/driver-audio-audioemu10k.mf
@@ -48,7 +48,6 @@ driver name=audioemu10k \
alias=pci1102,4 \
alias=pci1102,8
file path=kernel/drv/$(ARCH64)/audioemu10k group=sys
-file path=kernel/drv/audioemu10k group=sys
file path=usr/share/man/man7d/audioemu10k.7d
legacy pkg=SUNWaudioemu10k \
desc="SunOS audio device driver for Creative EMU10K" \
diff --git a/usr/src/pkg/manifests/driver-audio-audiohd.mf b/usr/src/pkg/manifests/driver-audio-audiohd.mf
index 949a3c9d74..3f24a93804 100644
--- a/usr/src/pkg/manifests/driver-audio-audiohd.mf
+++ b/usr/src/pkg/manifests/driver-audio-audiohd.mf
@@ -46,7 +46,6 @@ driver name=audiohd \
alias=pciclass,0403 \
alias=pciexclass,0403
file path=kernel/drv/$(ARCH64)/audiohd group=sys
-file path=kernel/drv/audiohd group=sys
file path=kernel/drv/audiohd.conf group=sys
file path=usr/share/man/man7d/audiohd.7d
legacy pkg=SUNWaudiohd desc="SunOS audio device driver for Munich workstation" \
diff --git a/usr/src/pkg/manifests/driver-audio-audioixp.mf b/usr/src/pkg/manifests/driver-audio-audioixp.mf
index d642848b62..648b5539c1 100644
--- a/usr/src/pkg/manifests/driver-audio-audioixp.mf
+++ b/usr/src/pkg/manifests/driver-audio-audioixp.mf
@@ -45,7 +45,6 @@ driver name=audioixp \
alias=pci1002,4361 \
alias=pci1002,4370
file path=kernel/drv/$(ARCH64)/audioixp group=sys
-file path=kernel/drv/audioixp group=sys
file path=usr/share/man/man7d/audioixp.7d
legacy pkg=SUNWadixp \
desc="SunOS audio device driver for ATI IXP integrated audio hardware" \
diff --git a/usr/src/pkg/manifests/driver-audio-audiols.mf b/usr/src/pkg/manifests/driver-audio-audiols.mf
index 1ef1d4ca07..e836713779 100644
--- a/usr/src/pkg/manifests/driver-audio-audiols.mf
+++ b/usr/src/pkg/manifests/driver-audio-audiols.mf
@@ -42,7 +42,6 @@ dir path=usr/share/man
dir path=usr/share/man/man7d
driver name=audiols alias=pci1102,7
file path=kernel/drv/$(ARCH64)/audiols group=sys
-$(i386_ONLY)file path=kernel/drv/audiols group=sys
file path=usr/share/man/man7d/audiols.7d
legacy pkg=SUNWaudiols desc="SunOS audio device driver for Creative Audigy LS" \
name="Creative Audigy LS Audio Driver"
diff --git a/usr/src/pkg/manifests/driver-audio-audiop16x.mf b/usr/src/pkg/manifests/driver-audio-audiop16x.mf
index 1f93025bf1..c1631ca3ff 100644
--- a/usr/src/pkg/manifests/driver-audio-audiop16x.mf
+++ b/usr/src/pkg/manifests/driver-audio-audiop16x.mf
@@ -42,7 +42,6 @@ dir path=usr/share/man
dir path=usr/share/man/man7d
driver name=audiop16x alias=pci1102,6
file path=kernel/drv/$(ARCH64)/audiop16x group=sys
-$(i386_ONLY)file path=kernel/drv/audiop16x group=sys
file path=usr/share/man/man7d/audiop16x.7d
legacy pkg=SUNWaudiop16x \
desc="SunOS audio device driver for Creative P16X (EMU10K1X)" \
diff --git a/usr/src/pkg/manifests/driver-audio-audiosolo.mf b/usr/src/pkg/manifests/driver-audio-audiosolo.mf
index b91d1599cb..7a75c8ecd7 100644
--- a/usr/src/pkg/manifests/driver-audio-audiosolo.mf
+++ b/usr/src/pkg/manifests/driver-audio-audiosolo.mf
@@ -41,7 +41,6 @@ dir path=usr/share/man
dir path=usr/share/man/man7d
driver name=audiosolo alias=pci125d,1969
file path=kernel/drv/$(ARCH64)/audiosolo group=sys
-file path=kernel/drv/audiosolo group=sys
file path=usr/share/man/man7d/audiosolo.7d
legacy pkg=SUNWaudiosolo desc="SunOS audio device driver for ESS Solo-1" \
name="ESS Solo-1 Audio Driver"
diff --git a/usr/src/pkg/manifests/driver-audio-audiovia823x.mf b/usr/src/pkg/manifests/driver-audio-audiovia823x.mf
index 2e7ac57b97..ef1b4f4b81 100644
--- a/usr/src/pkg/manifests/driver-audio-audiovia823x.mf
+++ b/usr/src/pkg/manifests/driver-audio-audiovia823x.mf
@@ -42,7 +42,6 @@ dir path=usr/share/man
dir path=usr/share/man/man7d
driver name=audiovia823x alias=pci1106,3059
file path=kernel/drv/$(ARCH64)/audiovia823x group=sys
-file path=kernel/drv/audiovia823x group=sys
file path=usr/share/man/man7d/audiovia823x.7d
legacy pkg=SUNWvia823x \
desc="SunOS audio device driver for VIA VT823x south bridges" \
diff --git a/usr/src/pkg/manifests/driver-audio.mf b/usr/src/pkg/manifests/driver-audio.mf
index e4f841ab98..3ca820fb9f 100644
--- a/usr/src/pkg/manifests/driver-audio.mf
+++ b/usr/src/pkg/manifests/driver-audio.mf
@@ -56,14 +56,8 @@ $(sparc_ONLY)file path=kernel/drv/$(ARCH64)/audiocs group=sys
file path=kernel/drv/$(ARCH64)/audioens group=sys
file path=kernel/drv/$(ARCH64)/audiopci group=sys
file path=kernel/drv/$(ARCH64)/audiots group=sys
-$(i386_ONLY)file path=kernel/drv/audio group=sys
file path=kernel/drv/audio.conf group=sys
-$(i386_ONLY)file path=kernel/drv/audio1575 group=sys
-$(i386_ONLY)file path=kernel/drv/audioens group=sys
-$(i386_ONLY)file path=kernel/drv/audiopci group=sys
-$(i386_ONLY)file path=kernel/drv/audiots group=sys
file path=kernel/misc/$(ARCH64)/ac97 group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/ac97 group=sys mode=0755
file path=usr/share/man/man7d/audio.7d
file path=usr/share/man/man7d/audio1575.7d
$(sparc_ONLY)file path=usr/share/man/man7d/audiocs.7d
diff --git a/usr/src/pkg/manifests/driver-crypto-dca.mf b/usr/src/pkg/manifests/driver-crypto-dca.mf
index e165457e49..6e2e1076ab 100644
--- a/usr/src/pkg/manifests/driver-crypto-dca.mf
+++ b/usr/src/pkg/manifests/driver-crypto-dca.mf
@@ -52,7 +52,6 @@ driver name=dca \
alias=pci14e4,5822 \
alias=pci14e4,5825
file path=kernel/drv/$(ARCH64)/dca group=sys
-$(i386_ONLY)file path=kernel/drv/dca group=sys
file path=kernel/drv/dca.conf group=sys \
original_name=SUNWdcaf:kernel/drv/dca.conf preserve=true
file path=usr/lib/fm/dict/SCA1000.dict mode=0444
diff --git a/usr/src/pkg/manifests/driver-crypto-dprov.mf b/usr/src/pkg/manifests/driver-crypto-dprov.mf
index 7e7de70eea..b889fcf1a8 100644
--- a/usr/src/pkg/manifests/driver-crypto-dprov.mf
+++ b/usr/src/pkg/manifests/driver-crypto-dprov.mf
@@ -35,7 +35,6 @@ dir path=kernel/crypto/$(ARCH64) group=sys
dir path=kernel/drv group=sys
dir path=kernel/drv/$(ARCH64) group=sys
file path=kernel/drv/$(ARCH64)/dprov group=sys
-$(i386_ONLY)file path=kernel/drv/dprov group=sys
file path=kernel/drv/dprov.conf group=sys
legacy pkg=SUNWcryptoint desc="Kernel Crypto Framework Test Driver" \
name="Kernel Crypto Framework Test Driver"
@@ -43,4 +42,3 @@ license cr_Sun license=cr_Sun
license lic_CDDL license=lic_CDDL
link path=kernel/crypto/$(ARCH64)/dprov \
target=../../../kernel/drv/$(ARCH64)/dprov
-$(i386_ONLY)link path=kernel/crypto/dprov target=../../kernel/drv/dprov
diff --git a/usr/src/pkg/manifests/driver-crypto-tpm.mf b/usr/src/pkg/manifests/driver-crypto-tpm.mf
index e6be3f53e3..3189d089b5 100644
--- a/usr/src/pkg/manifests/driver-crypto-tpm.mf
+++ b/usr/src/pkg/manifests/driver-crypto-tpm.mf
@@ -48,7 +48,6 @@ $(sparc_ONLY)driver name=tpm alias=SUNW,sun4v-ptpm \
$(i386_ONLY)driver name=tpm devlink=type=ddi_pseudo;name=tpm\t\D \
perms="* 0600 root sys"
$(i386_ONLY)file path=kernel/drv/$(ARCH64)/tpm group=sys
-$(i386_ONLY)file path=kernel/drv/tpm group=sys
$(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/tpm group=sys
legacy pkg=SUNWtpm desc="Trusted Platform Module driver" \
name="Trusted Platform Module driver" version=11.11.0,REV=2009.11.11
diff --git a/usr/src/pkg/manifests/driver-firewire.mf b/usr/src/pkg/manifests/driver-firewire.mf
index b9fac6b626..13772489b9 100644
--- a/usr/src/pkg/manifests/driver-firewire.mf
+++ b/usr/src/pkg/manifests/driver-firewire.mf
@@ -45,10 +45,8 @@ dir path=usr/share/man
dir path=usr/share/man/man7d
driver name=hci1394 alias=pciclass,0c0010 perms="* 0600 root sys"
file path=kernel/drv/$(ARCH64)/hci1394 group=sys
-$(i386_ONLY)file path=kernel/drv/hci1394 group=sys
file path=kernel/drv/hci1394.conf group=sys
file path=kernel/misc/$(ARCH64)/s1394 group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/s1394 group=sys mode=0755
file path=usr/share/man/man7d/hci1394.7d
file path=usr/share/man/man7d/ieee1394.7d
legacy pkg=SUNW1394 desc="IEEE1394 Framework and OpenHCI Driver" \
diff --git a/usr/src/pkg/manifests/driver-graphics-agpgart.mf b/usr/src/pkg/manifests/driver-graphics-agpgart.mf
index d159eff659..69f4307f71 100644
--- a/usr/src/pkg/manifests/driver-graphics-agpgart.mf
+++ b/usr/src/pkg/manifests/driver-graphics-agpgart.mf
@@ -83,12 +83,8 @@ driver name=amd64_gart alias=pci1022,1103 perms="* 0644 root sys"
file path=kernel/drv/$(ARCH64)/$(ARCH64)_gart group=sys
file path=kernel/drv/$(ARCH64)/agpgart group=sys
file path=kernel/drv/$(ARCH64)/agptarget group=sys
-file path=kernel/drv/$(ARCH64)_gart group=sys
-file path=kernel/drv/agpgart group=sys
file path=kernel/drv/agpgart.conf group=sys
-file path=kernel/drv/agptarget group=sys
file path=kernel/misc/$(ARCH64)/agpmaster group=sys mode=0755
-file path=kernel/misc/agpmaster group=sys mode=0755
file path=usr/share/man/man7i/agpgart_io.7i
legacy pkg=SUNWagp desc="AGP GART driver for x86 workstations" \
name="AGP GART Driver"
diff --git a/usr/src/pkg/manifests/driver-graphics-atiatom.mf b/usr/src/pkg/manifests/driver-graphics-atiatom.mf
index 6a4a28a973..ed8f3250c8 100644
--- a/usr/src/pkg/manifests/driver-graphics-atiatom.mf
+++ b/usr/src/pkg/manifests/driver-graphics-atiatom.mf
@@ -40,7 +40,6 @@ dir path=kernel/drv group=sys
dir path=kernel/drv/$(ARCH64) group=sys
driver name=atiatom alias=pci1002,4752 perms="* 0644 root sys"
file path=kernel/drv/$(ARCH64)/atiatom group=sys
-file path=kernel/drv/atiatom group=sys
legacy pkg=SUNWatigfx desc="Drivers for ATI framebuffer hardware" \
name="ATI Framebuffer Drivers"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-graphics-av1394.mf b/usr/src/pkg/manifests/driver-graphics-av1394.mf
index 691506c00a..c6c3292aab 100644
--- a/usr/src/pkg/manifests/driver-graphics-av1394.mf
+++ b/usr/src/pkg/manifests/driver-graphics-av1394.mf
@@ -43,7 +43,6 @@ driver name=av1394 perms="* 0600 root sys" \
alias=firewire00a02d,010000 \
alias=firewire00a02d,010001
file path=kernel/drv/$(ARCH64)/av1394 group=sys
-$(i386_ONLY)file path=kernel/drv/av1394 group=sys
file path=usr/share/man/man7d/av1394.7d
legacy pkg=SUNWav1394 desc="IEEE1394 AV Driver" name="IEEE1394 AV Driver"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-graphics-dcam1394.mf b/usr/src/pkg/manifests/driver-graphics-dcam1394.mf
index 80e40ebbff..bd36943f9d 100644
--- a/usr/src/pkg/manifests/driver-graphics-dcam1394.mf
+++ b/usr/src/pkg/manifests/driver-graphics-dcam1394.mf
@@ -41,7 +41,6 @@ driver name=dcam1394 perms="* 0666 root sys" \
alias=firewire000104,000100 \
alias=firewire00a02d,000100
file path=kernel/drv/$(ARCH64)/dcam1394 group=sys
-$(i386_ONLY)file path=kernel/drv/dcam1394 group=sys
legacy pkg=SUNWfwdc desc="IEEE1394 Video Conferencing Class Driver" \
name="IEEE1394 Video Conferencing Class Driver"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-graphics-drm.mf b/usr/src/pkg/manifests/driver-graphics-drm.mf
index 9291f9c989..b04efa4a99 100644
--- a/usr/src/pkg/manifests/driver-graphics-drm.mf
+++ b/usr/src/pkg/manifests/driver-graphics-drm.mf
@@ -74,10 +74,7 @@ driver name=i915 perms="* 0644 root sys" \
alias=pci8086,46
file path=kernel/drv/$(ARCH64)/i915 group=sys
file path=kernel/drv/$(ARCH64)/radeon group=sys
-file path=kernel/drv/i915 group=sys
-file path=kernel/drv/radeon group=sys
file path=kernel/misc/$(ARCH64)/drm group=sys mode=0755
-file path=kernel/misc/drm group=sys mode=0755
file path=usr/lib/devfsadm/linkmod/SUNW_drm_link_i386.so group=sys
file path=usr/share/man/man7d/i915.7d
file path=usr/share/man/man7d/radeon.7d
diff --git a/usr/src/pkg/manifests/driver-graphics-usbvc.mf b/usr/src/pkg/manifests/driver-graphics-usbvc.mf
index 7d681f6950..3676bfe291 100644
--- a/usr/src/pkg/manifests/driver-graphics-usbvc.mf
+++ b/usr/src/pkg/manifests/driver-graphics-usbvc.mf
@@ -46,7 +46,6 @@ driver name=usbvc perms="* 0666 root sys" \
alias=usbia46d,8c3.config1.0 \
alias=usbia46d,8c5.config1.0
file path=kernel/drv/$(ARCH64)/usbvc group=sys
-$(i386_ONLY)file path=kernel/drv/usbvc group=sys
file path=usr/share/man/man7d/usbvc.7d
legacy pkg=SUNWusbvc desc="usbvc (USB Video Class Driver)" \
name="USB Video Class Driver"
diff --git a/usr/src/pkg/manifests/driver-i86pc-fipe.mf b/usr/src/pkg/manifests/driver-i86pc-fipe.mf
index 5868cfcefe..3f335c2e09 100644
--- a/usr/src/pkg/manifests/driver-i86pc-fipe.mf
+++ b/usr/src/pkg/manifests/driver-i86pc-fipe.mf
@@ -45,7 +45,6 @@ driver name=fipe \
alias=pci8086,25f0 \
alias=pci8086,360c
file path=platform/i86pc/kernel/drv/$(ARCH64)/fipe group=sys
-file path=platform/i86pc/kernel/drv/fipe group=sys
file path=platform/i86pc/kernel/drv/fipe.conf group=sys
legacy pkg=SUNWfipe desc="Intel 5000/7300 memory power management driver" \
name="Intel 5000/7300 memory power management driver"
diff --git a/usr/src/pkg/manifests/driver-i86pc-ioat.mf b/usr/src/pkg/manifests/driver-i86pc-ioat.mf
index 08f72d007c..b74d2a1a79 100644
--- a/usr/src/pkg/manifests/driver-i86pc-ioat.mf
+++ b/usr/src/pkg/manifests/driver-i86pc-ioat.mf
@@ -52,12 +52,9 @@ driver name=ioat \
alias=pciex8086,360b \
alias=pciex8086,402f
file path=kernel/misc/$(ARCH64)/dcopy group=sys mode=0755
-file path=kernel/misc/dcopy group=sys mode=0755
file path=platform/i86pc/kernel/drv/$(ARCH64)/ioat group=sys
-file path=platform/i86pc/kernel/drv/ioat group=sys
file path=platform/i86pc/kernel/drv/ioat.conf group=sys
file path=platform/i86xpv/kernel/drv/$(ARCH64)/ioat group=sys
-file path=platform/i86xpv/kernel/drv/ioat group=sys
file path=platform/i86xpv/kernel/drv/ioat.conf group=sys
legacy pkg=SUNWdcopy desc="Sun dcopy DMA drivers" name="Sun dcopy DMA drivers"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-i86pc-platform.mf b/usr/src/pkg/manifests/driver-i86pc-platform.mf
index 34d4443b28..010a664093 100644
--- a/usr/src/pkg/manifests/driver-i86pc-platform.mf
+++ b/usr/src/pkg/manifests/driver-i86pc-platform.mf
@@ -56,32 +56,19 @@ file path=kernel/drv/$(ARCH64)/cmdk group=sys
file path=kernel/drv/$(ARCH64)/ecpp group=sys
file path=kernel/drv/$(ARCH64)/fd group=sys
file path=kernel/drv/$(ARCH64)/fdc group=sys
-file path=kernel/drv/asy group=sys
file path=kernel/drv/asy.conf group=sys
-file path=kernel/drv/cmdk group=sys
file path=kernel/drv/cmdk.conf group=sys
-file path=kernel/drv/ecpp group=sys
file path=kernel/drv/ecpp.conf group=sys
-file path=kernel/drv/fd group=sys
file path=kernel/drv/fd.conf group=sys
-file path=kernel/drv/fdc group=sys
file path=kernel/drv/fdc.conf group=sys
file path=kernel/misc/$(ARCH64)/dadk group=sys mode=0755
file path=kernel/misc/$(ARCH64)/gda group=sys mode=0755
file path=kernel/misc/$(ARCH64)/strategy group=sys mode=0755
-file path=kernel/misc/dadk group=sys mode=0755
-file path=kernel/misc/gda group=sys mode=0755
-file path=kernel/misc/strategy group=sys mode=0755
file path=kernel/strmod/$(ARCH64)/vuid2ps2 group=sys mode=0755
file path=kernel/strmod/$(ARCH64)/vuid3ps2 group=sys mode=0755
file path=kernel/strmod/$(ARCH64)/vuidm3p group=sys mode=0755
file path=kernel/strmod/$(ARCH64)/vuidm4p group=sys mode=0755
file path=kernel/strmod/$(ARCH64)/vuidm5p group=sys mode=0755
-file path=kernel/strmod/vuid2ps2 group=sys mode=0755
-file path=kernel/strmod/vuid3ps2 group=sys mode=0755
-file path=kernel/strmod/vuidm3p group=sys mode=0755
-file path=kernel/strmod/vuidm4p group=sys mode=0755
-file path=kernel/strmod/vuidm5p group=sys mode=0755
file path=usr/share/man/man7d/asy.7d
file path=usr/share/man/man7d/cmdk.7d
file path=usr/share/man/man7d/ecpp.7d
diff --git a/usr/src/pkg/manifests/driver-ipmi.mf b/usr/src/pkg/manifests/driver-ipmi.mf
index e6eea4cb99..9e9619196f 100644
--- a/usr/src/pkg/manifests/driver-ipmi.mf
+++ b/usr/src/pkg/manifests/driver-ipmi.mf
@@ -37,7 +37,6 @@ dir path=usr/share/man/man7d
driver name=ipmi perms="* 0600 root sys"
file path=usr/include/sys/ipmi.h
file path=usr/kernel/drv/amd64/ipmi
-file path=usr/kernel/drv/ipmi
file path=usr/kernel/drv/ipmi.conf
file path=usr/share/man/man7d/ipmi.7d
license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-misc-virtio.mf b/usr/src/pkg/manifests/driver-misc-virtio.mf
index 805f52137d..7a9ecc5a3a 100644
--- a/usr/src/pkg/manifests/driver-misc-virtio.mf
+++ b/usr/src/pkg/manifests/driver-misc-virtio.mf
@@ -39,5 +39,4 @@ dir path=kernel group=sys
dir path=kernel/misc group=sys
dir path=kernel/misc/$(ARCH64) group=sys
file path=kernel/misc/$(ARCH64)/virtio group=sys mode=0755
-file path=kernel/misc/virtio group=sys mode=0755
license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-network-afe.mf b/usr/src/pkg/manifests/driver-network-afe.mf
index b165cc6c60..39dd16b9ac 100644
--- a/usr/src/pkg/manifests/driver-network-afe.mf
+++ b/usr/src/pkg/manifests/driver-network-afe.mf
@@ -54,7 +54,6 @@ driver name=afe clone_perms="afe 0666 root sys" perms="* 0666 root sys" \
alias=pci13d1,ab08 \
alias=pci1737,ab08
file path=kernel/drv/$(ARCH64)/afe group=sys
-$(i386_ONLY)file path=kernel/drv/afe group=sys
file path=usr/share/man/man7d/afe.7d
legacy pkg=SUNWafe desc="ADMtek/Infineon Fast Ethernet Network Adapter Driver" \
name="ADMtek Ethernet Driver"
diff --git a/usr/src/pkg/manifests/driver-network-amd8111s.mf b/usr/src/pkg/manifests/driver-network-amd8111s.mf
index f848a02fbd..55a9965a3d 100644
--- a/usr/src/pkg/manifests/driver-network-amd8111s.mf
+++ b/usr/src/pkg/manifests/driver-network-amd8111s.mf
@@ -42,7 +42,6 @@ dir path=usr/share/man
dir path=usr/share/man/man7d
driver name=amd8111s alias=pci1022,7462
file path=kernel/drv/$(ARCH64)/amd8111s group=sys
-file path=kernel/drv/amd8111s group=sys
file path=usr/share/man/man7d/amd8111s.7d
legacy pkg=SUNWamd8111s desc="AMD8111 FAST Ethernet Network Adapter Driver" \
name="AMD8111 Fast Ethernet Driver"
diff --git a/usr/src/pkg/manifests/driver-network-arn.mf b/usr/src/pkg/manifests/driver-network-arn.mf
index 6285cb7c8c..25c2d149bc 100644
--- a/usr/src/pkg/manifests/driver-network-arn.mf
+++ b/usr/src/pkg/manifests/driver-network-arn.mf
@@ -44,7 +44,6 @@ driver name=arn clone_perms="arn 0666 root sys" perms="* 0666 root sys" \
alias=pciex168c,2a \
alias=pciex168c,2b
file path=kernel/drv/$(ARCH64)/arn group=sys
-file path=kernel/drv/arn group=sys
file path=usr/share/man/man7d/arn.7d
legacy pkg=SUNWarn desc="Atheros AR9xxx 802.11 Wireless NIC Driver" \
name="Atheros IEEE 802.11 Wireless NIC Driver"
diff --git a/usr/src/pkg/manifests/driver-network-atge.mf b/usr/src/pkg/manifests/driver-network-atge.mf
index 0f4d69d437..76fb542e6a 100644
--- a/usr/src/pkg/manifests/driver-network-atge.mf
+++ b/usr/src/pkg/manifests/driver-network-atge.mf
@@ -52,7 +52,6 @@ driver name=atge \
alias=pciex1969,2060 \
alias=pciex1969,2062
file path=kernel/drv/$(ARCH64)/atge group=sys
-file path=kernel/drv/atge group=sys
file path=usr/share/man/man7d/atge.7d
legacy pkg=SUNWatge desc="Atheros/Attansic L1E Gigabit Ethernet" \
name="Atheros/Attansic L1E Gigabit Ethernet 10/100/1000 Base (AR8121/AR8113)"
diff --git a/usr/src/pkg/manifests/driver-network-ath.mf b/usr/src/pkg/manifests/driver-network-ath.mf
index 4eb6c2bcab..3dde9ef758 100644
--- a/usr/src/pkg/manifests/driver-network-ath.mf
+++ b/usr/src/pkg/manifests/driver-network-ath.mf
@@ -50,7 +50,6 @@ driver name=ath clone_perms="ath 0666 root sys" perms="* 0666 root sys" \
alias=pciex168c,1c \
alias=pciex168c,24
file path=kernel/drv/$(ARCH64)/ath group=sys
-file path=kernel/drv/ath group=sys
file path=usr/share/man/man7d/ath.7d
legacy pkg=SUNWatheros desc="Atheros AR52xx 802.11b/g Wireless NIC Driver" \
name="Atheros 802.11b/g Wireless NIC Driver"
diff --git a/usr/src/pkg/manifests/driver-network-atu.mf b/usr/src/pkg/manifests/driver-network-atu.mf
index 3406857637..026241ffb1 100644
--- a/usr/src/pkg/manifests/driver-network-atu.mf
+++ b/usr/src/pkg/manifests/driver-network-atu.mf
@@ -45,7 +45,6 @@ dir path=usr/share/man/man7d
driver name=atu alias=usb1915,2233 clone_perms="atu 0666 root sys" \
perms="* 0666 root sys"
file path=kernel/drv/$(ARCH64)/atu group=sys
-file path=kernel/drv/atu group=sys
file path=usr/share/man/man7d/atu.7d
legacy pkg=SUNWatu \
desc="Atmel AT76C50x USB IEEE 802.11b Wireless Device Driver" \
diff --git a/usr/src/pkg/manifests/driver-network-axf.mf b/usr/src/pkg/manifests/driver-network-axf.mf
index 038ed8aed0..9f5538bf37 100644
--- a/usr/src/pkg/manifests/driver-network-axf.mf
+++ b/usr/src/pkg/manifests/driver-network-axf.mf
@@ -44,7 +44,6 @@ driver name=axf clone_perms="axf 0666 root sys" perms="* 0666 root sys" \
alias=usbb95,7720 \
alias=usbb95,772a
file path=kernel/drv/$(ARCH64)/axf group=sys
-file path=kernel/drv/axf group=sys
license usr/src/uts/common/io/axf/THIRDPARTYLICENSE \
license=usr/src/uts/common/io/axf/THIRDPARTYLICENSE
depend fmri=driver/usb/usbgem type=require
diff --git a/usr/src/pkg/manifests/driver-network-bfe.mf b/usr/src/pkg/manifests/driver-network-bfe.mf
index fc84cfc5c4..d0c1a4493c 100644
--- a/usr/src/pkg/manifests/driver-network-bfe.mf
+++ b/usr/src/pkg/manifests/driver-network-bfe.mf
@@ -45,7 +45,6 @@ driver name=bfe \
alias=pci14e4,4401 \
alias=pci14e4,4402
file path=kernel/drv/$(ARCH64)/bfe group=sys
-file path=kernel/drv/bfe group=sys
file path=usr/share/man/man7d/bfe.7d
legacy pkg=SUNWbfe desc="Broadcom BCM4401 Fast Ethernet Driver" \
name="Broadcom BCM4401 Fast Ethernet Driver"
diff --git a/usr/src/pkg/manifests/driver-network-bge.mf b/usr/src/pkg/manifests/driver-network-bge.mf
index 0b0cbb6898..6ac1368ea0 100644
--- a/usr/src/pkg/manifests/driver-network-bge.mf
+++ b/usr/src/pkg/manifests/driver-network-bge.mf
@@ -128,7 +128,6 @@ $(sparc_ONLY)driver name=bge clone_perms="bge 0666 root sys" \
alias=pciex14e4,167a \
alias=pciex14e4,167b
file path=kernel/drv/$(ARCH64)/bge group=sys
-$(i386_ONLY)file path=kernel/drv/bge group=sys
file path=kernel/drv/bge.conf group=sys
file path=usr/share/man/man7d/bge.7d
legacy pkg=SUNWbge \
diff --git a/usr/src/pkg/manifests/driver-network-bnx.mf b/usr/src/pkg/manifests/driver-network-bnx.mf
index 53c1c76ee2..5a2ffc508a 100644
--- a/usr/src/pkg/manifests/driver-network-bnx.mf
+++ b/usr/src/pkg/manifests/driver-network-bnx.mf
@@ -50,7 +50,6 @@ driver name=bnx perms="* 0644 root sys" \
alias=pci14e4,16aa \
alias=pci14e4,16ac
file path=kernel/drv/$(ARCH64)/bnx group=sys
-file path=kernel/drv/bnx group=sys
file path=kernel/drv/bnx.conf group=sys \
original_name=BRCMbnx:kernel/drv/bnx.conf preserve=renamenew
legacy pkg=BRCMbnx \
diff --git a/usr/src/pkg/manifests/driver-network-bnxe.mf b/usr/src/pkg/manifests/driver-network-bnxe.mf
index 468211968d..34a296f1cb 100644
--- a/usr/src/pkg/manifests/driver-network-bnxe.mf
+++ b/usr/src/pkg/manifests/driver-network-bnxe.mf
@@ -59,7 +59,6 @@ driver name=bnxe perms="* 0666 root sys" \
alias=pciex14e4,16ab \
alias=pciex14e4,16ae
file path=kernel/drv/$(ARCH64)/bnxe group=sys
-$(i386_ONLY)file path=kernel/drv/bnxe group=sys
file path=kernel/drv/bnxe.conf group=sys \
original_name=BRCMbnxe:kernel/drv/bnxe.conf preserve=renameold
file path=usr/share/man/man7d/bnxe.7d
diff --git a/usr/src/pkg/manifests/driver-network-bpf.mf b/usr/src/pkg/manifests/driver-network-bpf.mf
index 786054fb35..4008da8f6a 100644
--- a/usr/src/pkg/manifests/driver-network-bpf.mf
+++ b/usr/src/pkg/manifests/driver-network-bpf.mf
@@ -47,10 +47,8 @@ file path=usr/include/net/bpfdesc.h
file path=usr/include/net/dlt.h
file path=usr/include/netpacket/packet.h
file path=usr/kernel/drv/$(ARCH64)/bpf group=sys
-$(i386_ONLY)file path=usr/kernel/drv/bpf group=sys
file path=usr/kernel/drv/bpf.conf group=sys
file path=usr/kernel/socketmod/$(ARCH64)/sockpfp group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/socketmod/sockpfp group=sys mode=0755
legacy pkg=SUNWpacketh desc="C header files for BPF/PF_PACKET" \
name="Solaris Packet header files"
legacy pkg=SUNWpacketu desc="BPF/PF_PACKET kernel packet modules" \
diff --git a/usr/src/pkg/manifests/driver-network-chxge.mf b/usr/src/pkg/manifests/driver-network-chxge.mf
index e5cc6fd5eb..4f1acd0967 100644
--- a/usr/src/pkg/manifests/driver-network-chxge.mf
+++ b/usr/src/pkg/manifests/driver-network-chxge.mf
@@ -45,7 +45,6 @@ driver name=chxge clone_perms="chxge 0666 root sys" perms="* 0666 root sys" \
alias=pci1425,7 \
alias=pci1425,a
file path=kernel/drv/$(ARCH64)/chxge group=sys
-$(i386_ONLY)file path=kernel/drv/chxge group=sys
file path=usr/share/man/man7d/chxge.7d
legacy pkg=SUNWchxge \
desc="Chelsio N110 10 Gigabit Ethernet Network Adapter Driver" \
diff --git a/usr/src/pkg/manifests/driver-network-cxgbe.mf b/usr/src/pkg/manifests/driver-network-cxgbe.mf
index 2e0cbffe54..17193f1732 100644
--- a/usr/src/pkg/manifests/driver-network-cxgbe.mf
+++ b/usr/src/pkg/manifests/driver-network-cxgbe.mf
@@ -111,7 +111,5 @@ driver name=t4nex clone_perms="t4nex 0666 root sys" \
alias=pciex1425,6481
file path=kernel/drv/$(ARCH64)/cxgbe group=sys
file path=kernel/drv/$(ARCH64)/t4nex group=sys
-$(i386_ONLY)file path=kernel/drv/cxgbe group=sys
-$(i386_ONLY)file path=kernel/drv/t4nex group=sys
license cr_Sun license=cr_Sun
license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-network-dmfe.mf b/usr/src/pkg/manifests/driver-network-dmfe.mf
index a3bbf6066d..694d3a24ff 100644
--- a/usr/src/pkg/manifests/driver-network-dmfe.mf
+++ b/usr/src/pkg/manifests/driver-network-dmfe.mf
@@ -46,7 +46,6 @@ driver name=dmfe clone_perms="dmfe 0666 root sys" perms="* 0666 root sys" \
alias=pci1282,9102 \
alias=pci128h,9102
file path=kernel/drv/$(ARCH64)/dmfe group=sys
-$(i386_ONLY)file path=kernel/drv/dmfe group=sys
file path=usr/share/man/man7d/dmfe.7d
legacy pkg=SUNWdmfe desc="Davicom 9102 Fast Ethernet Network Adapter Driver" \
name="Davicom 9102 Fast Ethernet Driver"
diff --git a/usr/src/pkg/manifests/driver-network-e1000g.mf b/usr/src/pkg/manifests/driver-network-e1000g.mf
index c912bd8ba3..727cb7a8e0 100644
--- a/usr/src/pkg/manifests/driver-network-e1000g.mf
+++ b/usr/src/pkg/manifests/driver-network-e1000g.mf
@@ -222,7 +222,6 @@ driver name=e1000g clone_perms="e1000g 0666 root sys" perms="* 0666 root sys" \
alias=pciex8086,294c \
alias=pciex8086,f0fe
file path=kernel/drv/$(ARCH64)/e1000g group=sys
-$(i386_ONLY)file path=kernel/drv/e1000g group=sys
file path=kernel/drv/e1000g.conf group=sys \
original_name=SUNWintgige:kernel/drv/e1000g.conf preserve=renamenew
legacy pkg=SUNWintgige desc="Intel(R) PRO/1000 Server Adapter Driver" \
diff --git a/usr/src/pkg/manifests/driver-network-efe.mf b/usr/src/pkg/manifests/driver-network-efe.mf
index 23fba6c940..7155717da2 100644
--- a/usr/src/pkg/manifests/driver-network-efe.mf
+++ b/usr/src/pkg/manifests/driver-network-efe.mf
@@ -27,6 +27,5 @@ dir path=kernel/drv/$(ARCH64) group=sys
driver name=efe alias=pci10b8,5 clone_perms="efe 0666 root sys" \
perms="* 0666 root sys"
file path=kernel/drv/$(ARCH64)/efe group=sys
-$(i386_ONLY)file path=kernel/drv/efe group=sys
license usr/src/uts/common/io/efe/THIRDPARTYLICENSE \
license=usr/src/uts/common/io/efe/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/driver-network-elxl.mf b/usr/src/pkg/manifests/driver-network-elxl.mf
index 8cafd29fea..c9b2564b83 100644
--- a/usr/src/pkg/manifests/driver-network-elxl.mf
+++ b/usr/src/pkg/manifests/driver-network-elxl.mf
@@ -58,7 +58,6 @@ driver name=elxl clone_perms="elxl 0666 root sys" perms="* 0666 root sys" \
alias=pci10b7,9800 \
alias=pci10b7,9805
file path=kernel/drv/$(ARCH64)/elxl group=sys
-file path=kernel/drv/elxl group=sys
file path=usr/share/man/man7d/elxl.7d
legacy pkg=SUNWelxl desc="3Com Etherlink XL Ethernet Driver" \
name="3Com Etherlink XL Ethernet Driver"
diff --git a/usr/src/pkg/manifests/driver-network-emlxs.mf b/usr/src/pkg/manifests/driver-network-emlxs.mf
index 5b8da009ed..338147c990 100644
--- a/usr/src/pkg/manifests/driver-network-emlxs.mf
+++ b/usr/src/pkg/manifests/driver-network-emlxs.mf
@@ -72,16 +72,11 @@ driver name=oce perms="* 0666 root sys" \
alias=pciex19a2,710
file path=kernel/drv/$(ARCH64)/emlxs group=sys
file path=kernel/drv/$(ARCH64)/oce group=sys
-$(i386_ONLY)file path=kernel/drv/emlxs group=sys
file path=kernel/drv/emlxs.conf group=sys \
original_name=SUNWemlxs:kernel/drv/emlxs.conf preserve=true
-$(i386_ONLY)file path=kernel/drv/oce group=sys
file path=kernel/kmdb/$(ARCH64)/emlxs group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/emlxs group=sys mode=0555
file path=kernel/misc/emlxs/$(ARCH64)/emlxs_fw group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/emlxs/emlxs_fw group=sys mode=0755
file path=usr/lib/mdb/kvm/$(ARCH64)/emlxs.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/emlxs.so group=sys mode=0555
legacy pkg=SUNWemlxs \
desc="Device driver kit for Emulex-Sun FC, FCoE, and NIC adapters" \
name="Emulex-Sun driver kit for Fibre Channel and Converged Network Adapters (root)" \
diff --git a/usr/src/pkg/manifests/driver-network-eoib.mf b/usr/src/pkg/manifests/driver-network-eoib.mf
index cabb6c6488..87dbee3d4b 100644
--- a/usr/src/pkg/manifests/driver-network-eoib.mf
+++ b/usr/src/pkg/manifests/driver-network-eoib.mf
@@ -42,8 +42,6 @@ driver name=eibnx perms="* 0666 root sys"
driver name=eoib clone_perms="eoib 0666 root sys" perms="* 0666 root sys"
file path=kernel/drv/$(ARCH64)/eibnx group=sys
file path=kernel/drv/$(ARCH64)/eoib group=sys
-$(i386_ONLY)file path=kernel/drv/eibnx group=sys
file path=kernel/drv/eibnx.conf group=sys
-$(i386_ONLY)file path=kernel/drv/eoib group=sys
license cr_Sun license=cr_Sun
license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-network-fcip.mf b/usr/src/pkg/manifests/driver-network-fcip.mf
index 9479cc197f..a41f04ad18 100644
--- a/usr/src/pkg/manifests/driver-network-fcip.mf
+++ b/usr/src/pkg/manifests/driver-network-fcip.mf
@@ -42,7 +42,6 @@ dir path=usr/share/man
dir path=usr/share/man/man7d
driver name=fcip perms="* 0600 root sys"
file path=kernel/drv/$(ARCH64)/fcip group=sys
-$(i386_ONLY)file path=kernel/drv/fcip group=sys
file path=kernel/drv/fcip.conf group=sys
file path=usr/share/man/man7d/fcip.7d
legacy pkg=SUNWfcip desc="Sun FCIP IP/ARP over FibreChannel Device Driver" \
diff --git a/usr/src/pkg/manifests/driver-network-fcoe.mf b/usr/src/pkg/manifests/driver-network-fcoe.mf
index 5b3e177e30..43e501569f 100644
--- a/usr/src/pkg/manifests/driver-network-fcoe.mf
+++ b/usr/src/pkg/manifests/driver-network-fcoe.mf
@@ -43,7 +43,6 @@ dir path=usr/share/man
dir path=usr/share/man/man7d
driver name=fcoe perms="* 0600 root sys"
file path=kernel/drv/$(ARCH64)/fcoe group=sys
-$(i386_ONLY)file path=kernel/drv/fcoe group=sys
file path=kernel/drv/fcoe.conf group=sys
file path=usr/share/man/man7d/fcoe.7d
legacy pkg=SUNWfcoe \
diff --git a/usr/src/pkg/manifests/driver-network-fcoei.mf b/usr/src/pkg/manifests/driver-network-fcoei.mf
index dc49b9f6b5..010c7fa4e1 100644
--- a/usr/src/pkg/manifests/driver-network-fcoei.mf
+++ b/usr/src/pkg/manifests/driver-network-fcoei.mf
@@ -43,7 +43,6 @@ dir path=usr/share/man
dir path=usr/share/man/man7d
driver name=fcoei perms="* 0600 root sys"
file path=kernel/drv/$(ARCH64)/fcoei group=sys
-$(i386_ONLY)file path=kernel/drv/fcoei group=sys
file path=kernel/drv/fcoei.conf group=sys
file path=usr/share/man/man7d/fcoei.7d
legacy pkg=SUNWfcoei \
diff --git a/usr/src/pkg/manifests/driver-network-fcoet.mf b/usr/src/pkg/manifests/driver-network-fcoet.mf
index 1438f8e9e6..760eb944f8 100644
--- a/usr/src/pkg/manifests/driver-network-fcoet.mf
+++ b/usr/src/pkg/manifests/driver-network-fcoet.mf
@@ -43,7 +43,6 @@ dir path=usr/share/man
dir path=usr/share/man/man7d
driver name=fcoet perms="* 0600 root sys"
file path=kernel/drv/$(ARCH64)/fcoet group=sys
-$(i386_ONLY)file path=kernel/drv/fcoet group=sys
file path=usr/share/man/man7d/fcoet.7d
legacy pkg=SUNWfcoet \
desc="Sun FCoE (Fibre Channel over Ethernet) COMSTAR Driver" \
diff --git a/usr/src/pkg/manifests/driver-network-fcp.mf b/usr/src/pkg/manifests/driver-network-fcp.mf
index b96fbdc443..0c5edf7e89 100644
--- a/usr/src/pkg/manifests/driver-network-fcp.mf
+++ b/usr/src/pkg/manifests/driver-network-fcp.mf
@@ -42,7 +42,6 @@ dir path=usr/share/man
dir path=usr/share/man/man7d
driver name=fcp perms="* 0600 root sys"
file path=kernel/drv/$(ARCH64)/fcp group=sys
-$(i386_ONLY)file path=kernel/drv/fcp group=sys
file path=kernel/drv/fcp.conf group=sys
file path=usr/share/man/man7d/fcp.7d
legacy pkg=SUNWfcp desc="Sun FCP SCSI Fibre Channel Device Driver" \
diff --git a/usr/src/pkg/manifests/driver-network-fcsm.mf b/usr/src/pkg/manifests/driver-network-fcsm.mf
index 4984631445..26f1e3af96 100644
--- a/usr/src/pkg/manifests/driver-network-fcsm.mf
+++ b/usr/src/pkg/manifests/driver-network-fcsm.mf
@@ -40,7 +40,6 @@ dir path=kernel/drv group=sys
dir path=kernel/drv/$(ARCH64) group=sys
driver name=fcsm perms="* 0600 root sys"
file path=kernel/drv/$(ARCH64)/fcsm group=sys
-$(i386_ONLY)file path=kernel/drv/fcsm group=sys
file path=kernel/drv/fcsm.conf group=sys
legacy pkg=SUNWfcsm desc="Provides the FCSM driver" name="FCSM driver"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-network-fp.mf b/usr/src/pkg/manifests/driver-network-fp.mf
index ed9a1ebdc1..2b513c2825 100644
--- a/usr/src/pkg/manifests/driver-network-fp.mf
+++ b/usr/src/pkg/manifests/driver-network-fp.mf
@@ -44,11 +44,9 @@ dir path=usr/share/man
dir path=usr/share/man/man7d
driver name=fp perms="* 0600 root sys"
file path=kernel/drv/$(ARCH64)/fp group=sys
-$(i386_ONLY)file path=kernel/drv/fp group=sys
file path=kernel/drv/fp.conf group=sys \
original_name=SUNWfctl:kernel/drv/fp.conf preserve=true
file path=kernel/misc/$(ARCH64)/fctl group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/fctl group=sys mode=0755
file path=usr/share/man/man7d/fctl.7d
file path=usr/share/man/man7d/fp.7d
legacy pkg=SUNWfctl desc="fctl module and fp device driver" \
diff --git a/usr/src/pkg/manifests/driver-network-hermon.mf b/usr/src/pkg/manifests/driver-network-hermon.mf
index ee5f7a77c1..8f8073ea48 100644
--- a/usr/src/pkg/manifests/driver-network-hermon.mf
+++ b/usr/src/pkg/manifests/driver-network-hermon.mf
@@ -47,7 +47,6 @@ driver name=hermon perms="* 0666 root sys" \
alias=pciex15b3,673c \
alias=pciex15b3,6746
file path=kernel/drv/$(ARCH64)/hermon group=sys
-$(i386_ONLY)file path=kernel/drv/hermon group=sys
file path=kernel/drv/hermon.conf group=sys
file path=usr/share/man/man7d/hermon.7d
legacy pkg=SUNWhermon desc="Hermon HCA driver" name="Sun IB Hermon HCA driver"
diff --git a/usr/src/pkg/manifests/driver-network-hme.mf b/usr/src/pkg/manifests/driver-network-hme.mf
index ddb66eefcf..1a51ebc572 100644
--- a/usr/src/pkg/manifests/driver-network-hme.mf
+++ b/usr/src/pkg/manifests/driver-network-hme.mf
@@ -46,7 +46,6 @@ $(sparc_ONLY)driver name=hme alias=SUNW,hme
$(i386_ONLY)driver name=hme alias=pci108e,1001
$(sparc_ONLY)file path=kernel/drv/$(ARCH64)/fas group=sys
file path=kernel/drv/$(ARCH64)/hme group=sys
-$(i386_ONLY)file path=kernel/drv/hme group=sys
$(sparc_ONLY)file path=usr/share/man/man7d/fas.7d
file path=usr/share/man/man7d/hme.7d
legacy pkg=SUNWhmd desc="SunSwift Adapter Drivers" \
diff --git a/usr/src/pkg/manifests/driver-network-hxge.mf b/usr/src/pkg/manifests/driver-network-hxge.mf
index 17357804d0..3eba6ce610 100644
--- a/usr/src/pkg/manifests/driver-network-hxge.mf
+++ b/usr/src/pkg/manifests/driver-network-hxge.mf
@@ -43,7 +43,6 @@ dir path=usr/share/man/man7d
$(i386_ONLY)driver name=hxge alias=pci108e,aaaa perms="* 0600 root sys"
$(sparc_ONLY)driver name=hxge alias=pciex108e,aaaa perms="* 0600 root sys"
file path=kernel/drv/$(ARCH64)/hxge group=sys
-$(i386_ONLY)file path=kernel/drv/hxge group=sys
file path=kernel/drv/hxge.conf group=sys \
original_name=SUNWhxge:kernel/drv/hxge.conf preserve=renamenew
file path=usr/share/man/man7d/hxge.7d
diff --git a/usr/src/pkg/manifests/driver-network-i40e.mf b/usr/src/pkg/manifests/driver-network-i40e.mf
index 57c49438dc..3b3d06ba83 100644
--- a/usr/src/pkg/manifests/driver-network-i40e.mf
+++ b/usr/src/pkg/manifests/driver-network-i40e.mf
@@ -43,7 +43,6 @@ driver name=i40e clone_perms="i40e 0666 root sys" perms="* 0666 root sys" \
alias=pciex8086,37d2 \
alias=pciex8086,37d3
file path=kernel/drv/$(ARCH64)/i40e group=sys
-file path=kernel/drv/i40e group=sys
file path=kernel/drv/i40e.conf group=sys
file path=usr/share/man/man7d/i40e.7d
license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-network-ib.mf b/usr/src/pkg/manifests/driver-network-ib.mf
index 61017052a1..3704fdf9f0 100644
--- a/usr/src/pkg/manifests/driver-network-ib.mf
+++ b/usr/src/pkg/manifests/driver-network-ib.mf
@@ -46,17 +46,12 @@ dir path=usr/share/man/man7
dir path=usr/share/man/man7d
driver name=ib perms="* 0644 root sys"
file path=kernel/drv/$(ARCH64)/ib group=sys
-$(i386_ONLY)file path=kernel/drv/ib group=sys
file path=kernel/drv/ib.conf group=sys original_name=SUNWib:kernel/drv/ib.conf \
preserve=renameold
file path=kernel/misc/$(ARCH64)/ibcm group=sys mode=0755
file path=kernel/misc/$(ARCH64)/ibdm group=sys mode=0755
file path=kernel/misc/$(ARCH64)/ibmf group=sys mode=0755
file path=kernel/misc/$(ARCH64)/ibtl group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/ibcm group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/ibdm group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/ibmf group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/ibtl group=sys mode=0755
file path=usr/share/man/man4/ib.4
file path=usr/share/man/man7/ibmf.7
file path=usr/share/man/man7d/ib.7d
diff --git a/usr/src/pkg/manifests/driver-network-ibdma.mf b/usr/src/pkg/manifests/driver-network-ibdma.mf
index 4f2d29cb3e..5b5da446f3 100644
--- a/usr/src/pkg/manifests/driver-network-ibdma.mf
+++ b/usr/src/pkg/manifests/driver-network-ibdma.mf
@@ -41,7 +41,6 @@ dir path=kernel/misc/$(ARCH64) group=sys
dir path=usr/share/man
dir path=usr/share/man/man7d
file path=kernel/misc/$(ARCH64)/ibdma group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/ibdma group=sys mode=0755
file path=usr/share/man/man7d/ibdma.7d
legacy pkg=SUNWibdmar desc="Sun InfiniBand Device Management Agent (Root)" \
name="Sun InfiniBand Device Management Agent (Root)"
diff --git a/usr/src/pkg/manifests/driver-network-ibp.mf b/usr/src/pkg/manifests/driver-network-ibp.mf
index f8b2168c42..a04475d3b3 100644
--- a/usr/src/pkg/manifests/driver-network-ibp.mf
+++ b/usr/src/pkg/manifests/driver-network-ibp.mf
@@ -49,7 +49,6 @@ dir path=usr/share/man/man7d
driver name=ibp alias=ib.ipib clone_perms="ibp 0666 root sys" \
perms="* 0666 root sys"
file path=kernel/drv/$(ARCH64)/ibp group=sys
-$(i386_ONLY)file path=kernel/drv/ibp group=sys
file path=kernel/drv/ibp.conf group=sys \
original_name=SUNWipoib:kernel/drv/ibd.conf preserve=renameold
file path=lib/svc/manifest/network/ibd-post-upgrade.xml group=sys mode=0444
diff --git a/usr/src/pkg/manifests/driver-network-igb.mf b/usr/src/pkg/manifests/driver-network-igb.mf
index 669ec3b24c..64a3815f47 100644
--- a/usr/src/pkg/manifests/driver-network-igb.mf
+++ b/usr/src/pkg/manifests/driver-network-igb.mf
@@ -78,7 +78,6 @@ driver name=igb clone_perms="igb 0666 root sys" perms="* 0666 root sys" \
alias=pciex8086,1f45 \
alias=pciex8086,438
file path=kernel/drv/$(ARCH64)/igb group=sys
-$(i386_ONLY)file path=kernel/drv/igb group=sys
file path=kernel/drv/igb.conf group=sys \
original_name=SUNWigb:kernel/drv/igb.conf preserve=renamenew
file path=usr/share/man/man7d/igb.7d
diff --git a/usr/src/pkg/manifests/driver-network-iprb.mf b/usr/src/pkg/manifests/driver-network-iprb.mf
index 45af97bc50..f566ab4a2e 100644
--- a/usr/src/pkg/manifests/driver-network-iprb.mf
+++ b/usr/src/pkg/manifests/driver-network-iprb.mf
@@ -62,7 +62,6 @@ driver name=iprb clone_perms="iprb 0666 root sys" perms="* 0666 root sys" \
alias=pci8086,2449 \
alias=pci8086,27dc
file path=kernel/drv/$(ARCH64)/iprb group=sys
-file path=kernel/drv/iprb group=sys
file path=usr/share/man/man7d/iprb.7d
license lic_CDDL license=lic_CDDL
license usr/src/uts/common/io/iprb/THIRDPARTYLICENSE \
diff --git a/usr/src/pkg/manifests/driver-network-ipw.mf b/usr/src/pkg/manifests/driver-network-ipw.mf
index 182a844ad1..91db031032 100644
--- a/usr/src/pkg/manifests/driver-network-ipw.mf
+++ b/usr/src/pkg/manifests/driver-network-ipw.mf
@@ -43,7 +43,6 @@ dir path=usr/share/man/man7d
driver name=ipw alias=pci8086,1043 clone_perms="ipw 0666 root sys" \
perms="* 0666 root sys"
file path=kernel/drv/$(ARCH64)/ipw group=sys
-file path=kernel/drv/ipw group=sys
file path=usr/share/man/man7d/ipw.7d
legacy pkg=SUNWipw desc="Intel Pro. Wirless 802.11b IPW2100B Driver" \
name="Intel Pro. Wireless 802.11b IPW2100B Driver"
diff --git a/usr/src/pkg/manifests/driver-network-iwh.mf b/usr/src/pkg/manifests/driver-network-iwh.mf
index f8e42d1ca7..26503caf0a 100644
--- a/usr/src/pkg/manifests/driver-network-iwh.mf
+++ b/usr/src/pkg/manifests/driver-network-iwh.mf
@@ -49,7 +49,6 @@ driver name=iwh clone_perms="iwh 0666 root sys" perms="* 0666 root sys" \
alias=pciex8086,423c \
alias=pciex8086,423d
file path=kernel/drv/$(ARCH64)/iwh group=sys
-file path=kernel/drv/iwh group=sys
file path=usr/share/man/man7d/iwh.7d
legacy pkg=SUNWiwh desc="Intel(R) WiFi Link 5100/5300 driver" \
name="Intel(R) WiFi Link 5100/5300 driver"
diff --git a/usr/src/pkg/manifests/driver-network-iwi.mf b/usr/src/pkg/manifests/driver-network-iwi.mf
index 326ac86368..9291dc8bf6 100644
--- a/usr/src/pkg/manifests/driver-network-iwi.mf
+++ b/usr/src/pkg/manifests/driver-network-iwi.mf
@@ -51,7 +51,6 @@ driver name=iwi clone_perms="iwi 0666 root sys" perms="* 0666 root sys" \
alias=pci8086,4224.8086.1010 \
alias=pci8086,4224.8086.1011
file path=kernel/drv/$(ARCH64)/iwi group=sys
-file path=kernel/drv/iwi group=sys
file path=usr/share/man/man7d/iwi.7d
legacy pkg=SUNWiwi \
desc="Intel Pro. Wirless 802.11a/b/g IPW2200B/G IPW2915A/B/G Driver" \
diff --git a/usr/src/pkg/manifests/driver-network-iwk.mf b/usr/src/pkg/manifests/driver-network-iwk.mf
index 19ec6110e9..4f15ae6ec3 100644
--- a/usr/src/pkg/manifests/driver-network-iwk.mf
+++ b/usr/src/pkg/manifests/driver-network-iwk.mf
@@ -42,7 +42,6 @@ driver name=iwk clone_perms="iwk 0666 root sys" perms="* 0666 root sys" \
alias=pciex8086,4229 \
alias=pciex8086,4230
file path=kernel/drv/$(ARCH64)/iwk group=sys
-file path=kernel/drv/iwk group=sys
legacy pkg=SUNWiwk desc="Intel(R) PRO/Wireless 4965AGN driver" \
name="Intel(R) PRO/Wireless 4965AGN driver"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-network-iwn.mf b/usr/src/pkg/manifests/driver-network-iwn.mf
index d949c63985..cde3f74d0e 100644
--- a/usr/src/pkg/manifests/driver-network-iwn.mf
+++ b/usr/src/pkg/manifests/driver-network-iwn.mf
@@ -67,7 +67,6 @@ driver name=iwn clone_perms="iwn 0666 root sys" perms="* 0666 root sys" \
alias=pciex8086,90 \
alias=pciex8086,91
file path=kernel/drv/$(ARCH64)/iwn group=sys
-file path=kernel/drv/iwn group=sys
file path=kernel/firmware/iwn/iwlwifi-100-5.ucode
file path=kernel/firmware/iwn/iwlwifi-1000-3.ucode
file path=kernel/firmware/iwn/iwlwifi-105-6.ucode
diff --git a/usr/src/pkg/manifests/driver-network-iwp.mf b/usr/src/pkg/manifests/driver-network-iwp.mf
index f8c83ba399..9a0980ffb9 100644
--- a/usr/src/pkg/manifests/driver-network-iwp.mf
+++ b/usr/src/pkg/manifests/driver-network-iwp.mf
@@ -41,7 +41,6 @@ dir path=kernel/drv group=sys
dir path=kernel/drv/$(ARCH64) group=sys
driver name=iwp clone_perms="iwp 0666 root sys" perms="* 0666 root sys"
file path=kernel/drv/$(ARCH64)/iwp group=sys
-file path=kernel/drv/iwp group=sys
legacy pkg=SUNWiwp desc="Intel(R) WiFi Link 6000 series driver" \
name="Intel(R) WiFi Link 6000 series driver"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-network-ixgb.mf b/usr/src/pkg/manifests/driver-network-ixgb.mf
index 5db8ec7249..2848288481 100644
--- a/usr/src/pkg/manifests/driver-network-ixgb.mf
+++ b/usr/src/pkg/manifests/driver-network-ixgb.mf
@@ -44,7 +44,6 @@ driver name=ixgb perms="* 0666 root root" \
alias=pci8086,1a48 \
alias=pci8086,a11f
file path=kernel/drv/$(ARCH64)/ixgb group=sys
-$(i386_ONLY)file path=kernel/drv/ixgb group=sys
legacy pkg=SUNWixgb desc="Intel(R) PRO/10G Server Adapter Driver" \
name="Intel(R) PRO/10G Server Adapter Driver"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-network-ixgbe.mf b/usr/src/pkg/manifests/driver-network-ixgbe.mf
index c18bd54107..bfcae9d47a 100644
--- a/usr/src/pkg/manifests/driver-network-ixgbe.mf
+++ b/usr/src/pkg/manifests/driver-network-ixgbe.mf
@@ -79,7 +79,6 @@ driver name=ixgbe clone_perms="ixgbe 0666 root sys" perms="* 0666 root sys" \
alias=pciex8086,15ae \
alias=pciex8086,15d1
file path=kernel/drv/$(ARCH64)/ixgbe group=sys
-$(i386_ONLY)file path=kernel/drv/ixgbe group=sys
file path=kernel/drv/ixgbe.conf group=sys \
original_name=SUNWixgbe:kernel/drv/ixgbe.conf preserve=renamenew
file path=usr/share/man/man7d/ixgbe.7d
diff --git a/usr/src/pkg/manifests/driver-network-mwl.mf b/usr/src/pkg/manifests/driver-network-mwl.mf
index 28b9ce84e4..a99361f9be 100644
--- a/usr/src/pkg/manifests/driver-network-mwl.mf
+++ b/usr/src/pkg/manifests/driver-network-mwl.mf
@@ -46,9 +46,7 @@ driver name=mwl clone_perms="mwl 0666 root sys" perms="* 0666 root sys" \
alias=pci11ab,2a0a \
alias=pci11ab,2a24
file path=kernel/drv/$(ARCH64)/mwl group=sys
-file path=kernel/drv/mwl group=sys
file path=kernel/misc/$(ARCH64)/mwlfw group=sys mode=0755
-file path=kernel/misc/mwlfw group=sys mode=0755
legacy pkg=SUNWmwl \
desc="Marvell 88W8363 IEEE802.11b/g Wireless Network Device Driver" \
name="Marvell 88W8363 IEEE802.11b/g Wireless Network Device Driver"
diff --git a/usr/src/pkg/manifests/driver-network-mxfe.mf b/usr/src/pkg/manifests/driver-network-mxfe.mf
index f9f3501dd6..838db2688c 100644
--- a/usr/src/pkg/manifests/driver-network-mxfe.mf
+++ b/usr/src/pkg/manifests/driver-network-mxfe.mf
@@ -46,7 +46,6 @@ driver name=mxfe clone_perms="mxfe 0666 root sys" perms="* 0666 root sys" \
alias=pci11ad,c115 \
alias=pci11fc,9881
file path=kernel/drv/$(ARCH64)/mxfe group=sys
-$(i386_ONLY)file path=kernel/drv/mxfe group=sys
file path=usr/share/man/man7d/mxfe.7d
legacy pkg=SUNWmxfe desc="Macronix Fast Ethernet Network Adapter Driver" \
name="Macronix Fast Ethernet Driver"
diff --git a/usr/src/pkg/manifests/driver-network-myri10ge.mf b/usr/src/pkg/manifests/driver-network-myri10ge.mf
index 091ec08b2b..5612a1ae4f 100644
--- a/usr/src/pkg/manifests/driver-network-myri10ge.mf
+++ b/usr/src/pkg/manifests/driver-network-myri10ge.mf
@@ -47,7 +47,6 @@ driver name=myri10ge clone_perms="myri10ge 0666 root sys" \
alias=pciex14c1,8 \
alias=pciex14c1,9
file path=kernel/drv/$(ARCH64)/myri10ge group=sys
-$(i386_ONLY)file path=kernel/drv/myri10ge group=sys
file path=usr/share/man/man7d/myri10ge.7d
legacy pkg=SUNWmyri10ge desc="Myricom 10 Gigabit Ethernet Adapter Driver" \
name="Myricom 10Gb NIC Driver"
diff --git a/usr/src/pkg/manifests/driver-network-nge.mf b/usr/src/pkg/manifests/driver-network-nge.mf
index 84e43ce02d..102410807a 100644
--- a/usr/src/pkg/manifests/driver-network-nge.mf
+++ b/usr/src/pkg/manifests/driver-network-nge.mf
@@ -54,7 +54,6 @@ driver name=nge clone_perms="nge 0666 root sys" perms="* 0666 root sys" \
alias=pci10de,df \
alias=pci10de,e6
file path=kernel/drv/$(ARCH64)/nge group=sys
-file path=kernel/drv/nge group=sys
file path=kernel/drv/nge.conf group=sys
legacy pkg=SUNWnge desc="Nvidia CK8-04 GE driver" \
name="Nvidia CK8-04 GE driver"
diff --git a/usr/src/pkg/manifests/driver-network-ntxn.mf b/usr/src/pkg/manifests/driver-network-ntxn.mf
index 53da40597a..2b831e8ae3 100644
--- a/usr/src/pkg/manifests/driver-network-ntxn.mf
+++ b/usr/src/pkg/manifests/driver-network-ntxn.mf
@@ -50,7 +50,6 @@ driver name=ntxn \
alias=pci4040,4 \
alias=pci4040,5
file path=kernel/drv/$(ARCH64)/ntxn group=sys
-file path=kernel/drv/ntxn group=sys
file path=kernel/drv/ntxn.conf group=sys
file path=usr/share/man/man7d/ntxn.7d
legacy pkg=SUNWntxn desc="NetXen 1Gb/10Gb Ethernet Adapter Driver" \
diff --git a/usr/src/pkg/manifests/driver-network-nxge.mf b/usr/src/pkg/manifests/driver-network-nxge.mf
index a064b06be3..cc9e5cb6fe 100644
--- a/usr/src/pkg/manifests/driver-network-nxge.mf
+++ b/usr/src/pkg/manifests/driver-network-nxge.mf
@@ -59,7 +59,6 @@ $(i386_ONLY)driver name=nxge perms="* 0600 root sys" \
alias=SUNW,niusl \
alias=pciex108e,abcd
$(i386_ONLY)file path=kernel/drv/$(ARCH64)/nxge group=sys
-$(i386_ONLY)file path=kernel/drv/nxge group=sys
$(i386_ONLY)file path=kernel/drv/nxge.conf group=sys \
original_name=SUNWnxge:kernel/drv/nxge.conf preserve=renamenew
$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/nxge group=sys
diff --git a/usr/src/pkg/manifests/driver-network-ofk.mf b/usr/src/pkg/manifests/driver-network-ofk.mf
index 058d9a0632..408c520611 100644
--- a/usr/src/pkg/manifests/driver-network-ofk.mf
+++ b/usr/src/pkg/manifests/driver-network-ofk.mf
@@ -47,14 +47,10 @@ driver name=sol_uverbs perms="* 0666 root sys"
file path=kernel/drv/$(ARCH64)/sol_ucma group=sys
file path=kernel/drv/$(ARCH64)/sol_umad group=sys
file path=kernel/drv/$(ARCH64)/sol_uverbs group=sys
-$(i386_ONLY)file path=kernel/drv/sol_ucma group=sys
file path=kernel/drv/sol_ucma.conf group=sys
-$(i386_ONLY)file path=kernel/drv/sol_umad group=sys
file path=kernel/drv/sol_umad.conf group=sys
-$(i386_ONLY)file path=kernel/drv/sol_uverbs group=sys
file path=kernel/drv/sol_uverbs.conf group=sys
file path=kernel/misc/$(ARCH64)/sol_ofs group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/sol_ofs group=sys mode=0755
license cr_Sun license=cr_Sun
license lic_CDDL license=lic_CDDL
license usr/src/uts/common/io/ib/clients/of/THIRDPARTYLICENSE \
diff --git a/usr/src/pkg/manifests/driver-network-pcn.mf b/usr/src/pkg/manifests/driver-network-pcn.mf
index 458b494b71..b180dd153b 100644
--- a/usr/src/pkg/manifests/driver-network-pcn.mf
+++ b/usr/src/pkg/manifests/driver-network-pcn.mf
@@ -44,7 +44,6 @@ driver name=pcn clone_perms="pcn 0666 root sys" perms="* 0666 root sys" \
alias=pci1022,2000 \
alias=pci103c,104c
file path=kernel/drv/$(ARCH64)/pcn group=sys
-$(i386_ONLY)file path=kernel/drv/pcn group=sys
file path=usr/share/man/man7d/pcn.7d
license license_in_headers license=license_in_headers
license usr/src/uts/common/io/pcn/THIRDPARTYLICENSE \
diff --git a/usr/src/pkg/manifests/driver-network-platform.mf b/usr/src/pkg/manifests/driver-network-platform.mf
index d82fb633a2..c406e86442 100644
--- a/usr/src/pkg/manifests/driver-network-platform.mf
+++ b/usr/src/pkg/manifests/driver-network-platform.mf
@@ -50,7 +50,6 @@ driver name=dnet clone_perms="dnet 0666 root sys" perms="* 0666 root sys" \
alias=pci1109,2400 \
alias=pci2646,1
file path=kernel/drv/$(ARCH64)/dnet group=sys
-file path=kernel/drv/dnet group=sys
file path=usr/share/man/man7d/dnet.7d
legacy pkg=SUNWos86r desc="Platform Support, OS Functionality (Root)" \
name="Platform Support, OS Functionality (Root)"
diff --git a/usr/src/pkg/manifests/driver-network-qlc.mf b/usr/src/pkg/manifests/driver-network-qlc.mf
index 81a5471a9f..47ef55184f 100644
--- a/usr/src/pkg/manifests/driver-network-qlc.mf
+++ b/usr/src/pkg/manifests/driver-network-qlc.mf
@@ -60,22 +60,14 @@ driver name=qlc class=fibre-channel perms="* 0666 root sys" \
driver name=qlge alias=pciex1077,8000 perms="* 0666 root sys"
file path=kernel/drv/$(ARCH64)/qlc group=sys
file path=kernel/drv/$(ARCH64)/qlge group=sys
-$(i386_ONLY)file path=kernel/drv/qlc group=sys
file path=kernel/drv/qlc.conf group=sys \
original_name=SUNWqlc:kernel/drv/qlc.conf preserve=true
-$(i386_ONLY)file path=kernel/drv/qlge group=sys
file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_2200 group=sys mode=0755
file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_2300 group=sys mode=0755
file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_2400 group=sys mode=0755
file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_2500 group=sys mode=0755
file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_6322 group=sys mode=0755
file path=kernel/misc/qlc/$(ARCH64)/qlc_fw_8100 group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_2200 group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_2300 group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_2400 group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_2500 group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_6322 group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/qlc/qlc_fw_8100 group=sys mode=0755
file path=usr/share/man/man7d/qlc.7d
legacy pkg=SUNWqlc \
desc="Qlogic ISP Fibre Channel Device Driver and GLDv3 NIC driver" \
diff --git a/usr/src/pkg/manifests/driver-network-ral.mf b/usr/src/pkg/manifests/driver-network-ral.mf
index a13bfa51af..ebb9f42ba1 100644
--- a/usr/src/pkg/manifests/driver-network-ral.mf
+++ b/usr/src/pkg/manifests/driver-network-ral.mf
@@ -43,7 +43,6 @@ dir path=usr/share/man/man7d
driver name=ral alias=pci1814,201 clone_perms="ral 0666 root sys" \
perms="* 0666 root sys"
file path=kernel/drv/$(ARCH64)/ral group=sys
-file path=kernel/drv/ral group=sys
file path=usr/share/man/man7d/ral.7d
legacy pkg=SUNWralink desc="Ralink RT2500 802.11b/g Wireless Driver" \
name="Ralink RT2500 802.11b/g Wireless Driver"
diff --git a/usr/src/pkg/manifests/driver-network-rds.mf b/usr/src/pkg/manifests/driver-network-rds.mf
index 252b1ede5a..0940afc4e4 100644
--- a/usr/src/pkg/manifests/driver-network-rds.mf
+++ b/usr/src/pkg/manifests/driver-network-rds.mf
@@ -45,9 +45,7 @@ driver name=rdsib perms="* 0644 root sys"
file path=etc/sock2path.d/driver%2Fnetwork%2Frds group=sys
file path=kernel/drv/$(ARCH64)/rds group=sys
file path=kernel/drv/$(ARCH64)/rdsib group=sys
-$(i386_ONLY)file path=kernel/drv/rds group=sys
file path=kernel/drv/rds.conf group=sys
-$(i386_ONLY)file path=kernel/drv/rdsib group=sys
file path=kernel/drv/rdsib.conf group=sys
legacy pkg=SUNWrds desc="Sun Reliable Datagram Sockets" \
name="Sun Reliable Datagram Sockets"
diff --git a/usr/src/pkg/manifests/driver-network-rdsv3.mf b/usr/src/pkg/manifests/driver-network-rdsv3.mf
index 060c86a4ad..7470680e54 100644
--- a/usr/src/pkg/manifests/driver-network-rdsv3.mf
+++ b/usr/src/pkg/manifests/driver-network-rdsv3.mf
@@ -50,10 +50,8 @@ dir path=usr/lib/rcm/scripts group=bin
driver name=rdsv3 perms="* 0644 root sys"
file path=etc/sock2path.d/driver%2Fnetwork%2Frdsv3 group=sys
file path=kernel/drv/$(ARCH64)/rdsv3 group=sys
-$(i386_ONLY)file path=kernel/drv/rdsv3 group=sys
file path=kernel/drv/rdsv3.conf group=sys preserve=renamenew
file path=kernel/socketmod/$(ARCH64)/sockrds group=sys mode=0755
-$(i386_ONLY)file path=kernel/socketmod/sockrds group=sys mode=0755
file path=usr/lib/rcm/scripts/SUNW,rdsv3u.sh group=bin mode=0555
license cr_Sun license=cr_Sun
license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-network-rge.mf b/usr/src/pkg/manifests/driver-network-rge.mf
index 55b26cd3d2..b009225b6b 100644
--- a/usr/src/pkg/manifests/driver-network-rge.mf
+++ b/usr/src/pkg/manifests/driver-network-rge.mf
@@ -49,7 +49,6 @@ driver name=rge clone_perms="rge 0666 root sys" perms="* 0666 root sys" \
alias=pci16ec,116 \
alias=pciex10ec,8136
file path=kernel/drv/$(ARCH64)/rge group=sys
-$(i386_ONLY)file path=kernel/drv/rge group=sys
file path=usr/share/man/man7d/rge.7d
legacy pkg=SUNWrge desc="Realtek Gigabit Ethernet Network Adapter Driver" \
name="Realtek Gigabit Ethernet Driver"
diff --git a/usr/src/pkg/manifests/driver-network-rpcib.mf b/usr/src/pkg/manifests/driver-network-rpcib.mf
index fe49e99147..84de45c5d9 100644
--- a/usr/src/pkg/manifests/driver-network-rpcib.mf
+++ b/usr/src/pkg/manifests/driver-network-rpcib.mf
@@ -41,7 +41,6 @@ dir path=kernel/drv group=sys
dir path=kernel/drv/$(ARCH64) group=sys
driver name=rpcib perms="* 0644 root sys"
file path=kernel/drv/$(ARCH64)/rpcib group=sys
-$(i386_ONLY)file path=kernel/drv/rpcib group=sys
file path=kernel/drv/rpcib.conf group=sys \
original_name=SUNWrpcib:kernel/drv/rpcib.conf preserve=true
legacy pkg=SUNWrpcib desc="InfiniBand plugin implementation of RPC over RDMA" \
diff --git a/usr/src/pkg/manifests/driver-network-rtls.mf b/usr/src/pkg/manifests/driver-network-rtls.mf
index b6111107ec..528c6f4ee3 100644
--- a/usr/src/pkg/manifests/driver-network-rtls.mf
+++ b/usr/src/pkg/manifests/driver-network-rtls.mf
@@ -47,7 +47,6 @@ driver name=rtls clone_perms="rtls 0666 root sys" perms="* 0666 root sys" \
alias=pci1186,1300 \
alias=pci1186,1301
file path=kernel/drv/$(ARCH64)/rtls group=sys
-$(i386_ONLY)file path=kernel/drv/rtls group=sys
file path=usr/share/man/man7d/rtls.7d
legacy pkg=SUNWrtls desc="RTL Fast NIC" name="REALTEK Fast NIC"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-network-rtw.mf b/usr/src/pkg/manifests/driver-network-rtw.mf
index 4e07e245f2..d51e58a0db 100644
--- a/usr/src/pkg/manifests/driver-network-rtw.mf
+++ b/usr/src/pkg/manifests/driver-network-rtw.mf
@@ -43,7 +43,6 @@ dir path=usr/share/man/man7d
driver name=rtw alias=pci10ec,8180 clone_perms="rtw 0666 root sys" \
perms="* 0666 root sys"
file path=kernel/drv/$(ARCH64)/rtw group=sys
-file path=kernel/drv/rtw group=sys
file path=usr/share/man/man7d/rtw.7d
legacy pkg=SUNWrtw desc="realtek 8180L 802.11b driver" \
name="realtek 8180L 802.11b driver"
diff --git a/usr/src/pkg/manifests/driver-network-rum.mf b/usr/src/pkg/manifests/driver-network-rum.mf
index 7db3fbf9e6..7dfb39c505 100644
--- a/usr/src/pkg/manifests/driver-network-rum.mf
+++ b/usr/src/pkg/manifests/driver-network-rum.mf
@@ -51,7 +51,6 @@ driver name=rum clone_perms="rum 0666 root sys" perms="* 0666 root sys" \
alias=usb7d1,3c04 \
alias=usbb05,1723
file path=kernel/drv/$(ARCH64)/rum group=sys
-file path=kernel/drv/rum group=sys
file path=usr/share/man/man7d/rum.7d
legacy pkg=SUNWrum \
desc="Ralink RT2501/RT2601/RT73USB 802.11b/g Wireless Driver" \
diff --git a/usr/src/pkg/manifests/driver-network-rwd.mf b/usr/src/pkg/manifests/driver-network-rwd.mf
index 864fd096d8..401704903e 100644
--- a/usr/src/pkg/manifests/driver-network-rwd.mf
+++ b/usr/src/pkg/manifests/driver-network-rwd.mf
@@ -45,7 +45,6 @@ dir path=usr/share/man/man7d
driver name=rwd alias=pci1814,401 clone_perms="rwd 0666 root sys" \
perms="* 0666 root sys"
file path=kernel/drv/$(ARCH64)/rwd group=sys
-file path=kernel/drv/rwd group=sys
file path=usr/share/man/man7d/rwd.7d
legacy pkg=SUNWrwd \
desc="Ralink RT2561/RT2561S/RT2661 IEEE802.11b/g Wireless Network Device" \
diff --git a/usr/src/pkg/manifests/driver-network-rwn.mf b/usr/src/pkg/manifests/driver-network-rwn.mf
index e890b8a30e..36c63fdd8b 100644
--- a/usr/src/pkg/manifests/driver-network-rwn.mf
+++ b/usr/src/pkg/manifests/driver-network-rwn.mf
@@ -49,7 +49,6 @@ driver name=rwn clone_perms="rwn 0666 root sys" perms="* 0666 root sys" \
alias=pci1814,781 \
alias=pci1a3b,1059
file path=kernel/drv/$(ARCH64)/rwn group=sys
-file path=kernel/drv/rwn group=sys
file path=usr/share/man/man7d/rwn.7d
legacy pkg=SUNWrwn \
desc="Ralink RT2700/RT2800 IEEE802.11 a/b/g/n Wireless Network Device" \
diff --git a/usr/src/pkg/manifests/driver-network-sdp.mf b/usr/src/pkg/manifests/driver-network-sdp.mf
index 2886c8ef7d..fc8d093c1d 100644
--- a/usr/src/pkg/manifests/driver-network-sdp.mf
+++ b/usr/src/pkg/manifests/driver-network-sdp.mf
@@ -50,10 +50,8 @@ file path=etc/sdp.conf group=sys original_name=SUNWibsdp:etc/sdp.conf \
preserve=true
file path=etc/sock2path.d/driver%2Fnetwork%2Fsdp group=sys
file path=kernel/drv/$(ARCH64)/sdp group=sys
-$(i386_ONLY)file path=kernel/drv/sdp group=sys
file path=kernel/drv/sdp.conf group=sys
file path=kernel/socketmod/$(ARCH64)/socksdp group=sys mode=0755
-$(i386_ONLY)file path=kernel/socketmod/socksdp group=sys mode=0755
file path=usr/share/man/man7d/sdp.7d
legacy pkg=SUNWibsdp desc="Sun InfiniBand layered Sockets Direct Protocol" \
name="Sun InfiniBand layered Sockets Direct Protocol"
diff --git a/usr/src/pkg/manifests/driver-network-sdpib.mf b/usr/src/pkg/manifests/driver-network-sdpib.mf
index ad7919cbbd..30853767dc 100644
--- a/usr/src/pkg/manifests/driver-network-sdpib.mf
+++ b/usr/src/pkg/manifests/driver-network-sdpib.mf
@@ -42,11 +42,9 @@ dir path=kernel/strmod group=sys
dir path=kernel/strmod/$(ARCH64) group=sys
driver name=sdpib perms="* 0644 root sys"
file path=kernel/drv/$(ARCH64)/sdpib group=sys
-$(i386_ONLY)file path=kernel/drv/sdpib group=sys
file path=kernel/drv/sdpib.conf group=sys
hardlink path=kernel/strmod/$(ARCH64)/sdpib \
target=../../../kernel/drv/$(ARCH64)/sdpib
-$(i386_ONLY)hardlink path=kernel/strmod/sdpib target=../../kernel/drv/sdpib
legacy pkg=SUNWibsdpib desc="Sun InfiniBand Sockets Direct Protocol" \
name="Sun InfiniBand Sockets Direct Protocol"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-network-sfe.mf b/usr/src/pkg/manifests/driver-network-sfe.mf
index b1f5eddb42..0fd0664d38 100644
--- a/usr/src/pkg/manifests/driver-network-sfe.mf
+++ b/usr/src/pkg/manifests/driver-network-sfe.mf
@@ -46,7 +46,6 @@ driver name=sfe perms="* 0666 root root" \
alias=pci1039,7016 \
alias=pci1039,900
file path=kernel/drv/$(ARCH64)/sfe group=sys
-$(i386_ONLY)file path=kernel/drv/sfe group=sys
file path=usr/share/man/man7d/sfe.7d
legacy pkg=SUNWsfe desc="SiS900 series Fast Ethernet Network Adapter Driver" \
name="SiS900 Ethernet Driver"
diff --git a/usr/src/pkg/manifests/driver-network-sfxge.mf b/usr/src/pkg/manifests/driver-network-sfxge.mf
index 5cdaa45613..2197fa3f3b 100644
--- a/usr/src/pkg/manifests/driver-network-sfxge.mf
+++ b/usr/src/pkg/manifests/driver-network-sfxge.mf
@@ -47,7 +47,6 @@ driver name=sfxge clone_perms="sfxge 0666 root sys" perms="* 0666 root sys" \
alias=pci1924,903 \
alias=pci1924,923
file path=kernel/drv/$(ARCH64)/sfxge group=sys
-$(i386_ONLY)file path=kernel/drv/sfxge group=sys
file path=usr/share/man/man7d/sfxge.7d
license usr/src/uts/common/io/sfxge/THIRDPARTYLICENSE \
license=usr/src/uts/common/io/sfxge/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/driver-network-srpt.mf b/usr/src/pkg/manifests/driver-network-srpt.mf
index a1f683cb1f..f65b003834 100644
--- a/usr/src/pkg/manifests/driver-network-srpt.mf
+++ b/usr/src/pkg/manifests/driver-network-srpt.mf
@@ -53,10 +53,8 @@ dir path=usr/share/man
dir path=usr/share/man/man7d
driver name=srpt perms="* 0644 root sys"
file path=kernel/drv/$(ARCH64)/srpt group=sys
-$(i386_ONLY)file path=kernel/drv/srpt group=sys
file path=kernel/drv/srpt.conf group=sys
file path=kernel/kmdb/$(ARCH64)/srpt group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/srpt group=sys mode=0555
file path=lib/svc/manifest/system/ibsrp/target.xml group=sys mode=0444 \
variant.opensolaris.zone=global
file path=lib/svc/method/svc-srpt mode=0555 variant.opensolaris.zone=global
@@ -67,7 +65,6 @@ file path=usr/lib/libsrpt.so.1
file path=usr/lib/llib-lsrpt
file path=usr/lib/llib-lsrpt.ln
file path=usr/lib/mdb/kvm/$(ARCH64)/srpt.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/srpt.so group=sys mode=0555
file path=usr/sbin/srptadm mode=0555
file path=usr/share/man/man7d/srpt.7d
legacy pkg=SUNWsrptr desc="Sun SRP COMSTAR Port Provider (Root)" \
diff --git a/usr/src/pkg/manifests/driver-network-tavor.mf b/usr/src/pkg/manifests/driver-network-tavor.mf
index 29fdc2556f..9d9235439c 100644
--- a/usr/src/pkg/manifests/driver-network-tavor.mf
+++ b/usr/src/pkg/manifests/driver-network-tavor.mf
@@ -46,7 +46,6 @@ driver name=tavor perms="* 0666 root sys" \
alias=pciex15b3,6278 \
alias=pciex15b3,6279
file path=kernel/drv/$(ARCH64)/tavor group=sys
-$(i386_ONLY)file path=kernel/drv/tavor group=sys
file path=kernel/drv/tavor.conf group=sys
legacy pkg=SUNWtavor desc="Tavor HCA driver" name="Sun Tavor HCA driver"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-network-uath.mf b/usr/src/pkg/manifests/driver-network-uath.mf
index f95eb002ab..47e5cfdf10 100644
--- a/usr/src/pkg/manifests/driver-network-uath.mf
+++ b/usr/src/pkg/manifests/driver-network-uath.mf
@@ -50,9 +50,7 @@ driver name=uath clone_perms="uath 0666 root sys" perms="* 0666 root sys" \
alias=usbcf3,2 \
alias=usbcf3,3
file path=kernel/drv/$(ARCH64)/uath group=sys
-file path=kernel/drv/uath group=sys
file path=kernel/misc/$(ARCH64)/uathfw group=sys mode=0755
-file path=kernel/misc/uathfw group=sys mode=0755
file path=usr/share/man/man7d/uath.7d
legacy pkg=SUNWuath \
desc="Atheros AR5523 USB IEEE802.11b/g Wireless Network Driver" \
diff --git a/usr/src/pkg/manifests/driver-network-udmf.mf b/usr/src/pkg/manifests/driver-network-udmf.mf
index 124852293b..29b7fb3999 100644
--- a/usr/src/pkg/manifests/driver-network-udmf.mf
+++ b/usr/src/pkg/manifests/driver-network-udmf.mf
@@ -30,7 +30,6 @@ driver name=udmf clone_perms="udmf 0666 root sys" perms="* 0666 root sys" \
alias=usba46,9601 \
alias=usbfe6,8101
file path=kernel/drv/$(ARCH64)/udmf group=sys
-file path=kernel/drv/udmf group=sys
license usr/src/uts/common/io/udmf/THIRDPARTYLICENSE \
license=usr/src/uts/common/io/udmf/THIRDPARTYLICENSE
depend fmri=driver/usb/usbgem type=require
diff --git a/usr/src/pkg/manifests/driver-network-upf.mf b/usr/src/pkg/manifests/driver-network-upf.mf
index e12a8a41d7..91888be8c5 100644
--- a/usr/src/pkg/manifests/driver-network-upf.mf
+++ b/usr/src/pkg/manifests/driver-network-upf.mf
@@ -98,7 +98,6 @@ driver name=upf clone_perms="upf 0666 root sys" perms="* 0666 root sys" \
alias=usbdb7,2 \
alias=usbe66,400c
file path=kernel/drv/$(ARCH64)/upf group=sys
-file path=kernel/drv/upf group=sys
license usr/src/uts/common/io/upf/THIRDPARTYLICENSE \
license=usr/src/uts/common/io/upf/THIRDPARTYLICENSE
depend fmri=driver/usb/usbgem type=require
diff --git a/usr/src/pkg/manifests/driver-network-ural.mf b/usr/src/pkg/manifests/driver-network-ural.mf
index eac27a655f..8601a50601 100644
--- a/usr/src/pkg/manifests/driver-network-ural.mf
+++ b/usr/src/pkg/manifests/driver-network-ural.mf
@@ -46,7 +46,6 @@ driver name=ural clone_perms="ural 0666 root sys" perms="* 0666 root sys" \
alias=usb2001,3c00 \
alias=usb411,67
file path=kernel/drv/$(ARCH64)/ural group=sys
-file path=kernel/drv/ural group=sys
file path=usr/share/man/man7d/ural.7d
legacy pkg=SUNWural desc="Ralink RT2500USB 802.11b/g Wireless Driver" \
name="Ralink RT2500USB 802.11b/g Wireless Driver"
diff --git a/usr/src/pkg/manifests/driver-network-urf.mf b/usr/src/pkg/manifests/driver-network-urf.mf
index 0cc0145d3f..66ae53c83b 100644
--- a/usr/src/pkg/manifests/driver-network-urf.mf
+++ b/usr/src/pkg/manifests/driver-network-urf.mf
@@ -31,7 +31,6 @@ driver name=urf clone_perms="urf 0666 root sys" perms="* 0666 root sys" \
alias=usb7b8,401a \
alias=usbbda,8150
file path=kernel/drv/$(ARCH64)/urf group=sys
-file path=kernel/drv/urf group=sys
license usr/src/uts/common/io/urf/THIRDPARTYLICENSE \
license=usr/src/uts/common/io/urf/THIRDPARTYLICENSE
depend fmri=driver/usb/usbgem type=require
diff --git a/usr/src/pkg/manifests/driver-network-urtw.mf b/usr/src/pkg/manifests/driver-network-urtw.mf
index 35ffad0447..42196abf09 100644
--- a/usr/src/pkg/manifests/driver-network-urtw.mf
+++ b/usr/src/pkg/manifests/driver-network-urtw.mf
@@ -55,7 +55,6 @@ driver name=urtw clone_perms="urtw 0666 root sys" perms="* 0666 root sys" \
alias=usbbda,8198 \
alias=usbdf6,28
file path=kernel/drv/$(ARCH64)/urtw group=sys
-file path=kernel/drv/urtw group=sys
file path=usr/share/man/man7d/urtw.7d
legacy pkg=SUNWurtw desc="RealTek RTL8187L/B USB 802.11b/g Wireless Driver" \
name="RealTek RTL8187L/B USB 802.11b/g Wireless Driver"
diff --git a/usr/src/pkg/manifests/driver-network-usbecm.mf b/usr/src/pkg/manifests/driver-network-usbecm.mf
index 71b5d617a5..14e2b51298 100644
--- a/usr/src/pkg/manifests/driver-network-usbecm.mf
+++ b/usr/src/pkg/manifests/driver-network-usbecm.mf
@@ -43,6 +43,5 @@ driver name=usbecm perms="* 0666 root sys" \
alias=usb430,a4a2 \
alias=usbif,class2.6
file path=kernel/drv/$(ARCH64)/usbecm group=sys
-$(i386_ONLY)file path=kernel/drv/usbecm group=sys
license cr_Sun license=cr_Sun
license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-network-vioif.mf b/usr/src/pkg/manifests/driver-network-vioif.mf
index 91eb79bb19..695a4ca923 100644
--- a/usr/src/pkg/manifests/driver-network-vioif.mf
+++ b/usr/src/pkg/manifests/driver-network-vioif.mf
@@ -34,7 +34,6 @@ dir path=kernel/drv group=sys
dir path=kernel/drv/$(ARCH64) group=sys
driver name=vioif alias=pci1af4,1 perms="* 0666 root sys"
file path=kernel/drv/$(ARCH64)/vioif group=sys
-$(i386_ONLY)file path=kernel/drv/vioif group=sys
legacy pkg=SUNWvioif desc="VirtIO network driver" name="VirtIO network driver"
license cr_Sun license=cr_Sun
license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-network-vmxnet3s.mf b/usr/src/pkg/manifests/driver-network-vmxnet3s.mf
index 1783b45a4c..73554667fb 100644
--- a/usr/src/pkg/manifests/driver-network-vmxnet3s.mf
+++ b/usr/src/pkg/manifests/driver-network-vmxnet3s.mf
@@ -31,6 +31,5 @@ dir path=kernel/drv/$(ARCH64) group=sys
driver name=vmxnet3s alias=pci15ad,7b0 clone_perms="vmxnet3s 0666 root sys" \
perms="* 0666 root sys"
file path=kernel/drv/$(ARCH64)/vmxnet3s group=sys
-file path=kernel/drv/vmxnet3s group=sys
file path=kernel/drv/vmxnet3s.conf group=sys
license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-network-vr.mf b/usr/src/pkg/manifests/driver-network-vr.mf
index fa5207ec91..eee7c84fb8 100644
--- a/usr/src/pkg/manifests/driver-network-vr.mf
+++ b/usr/src/pkg/manifests/driver-network-vr.mf
@@ -46,7 +46,6 @@ driver name=vr perms="* 0666 root sys" \
alias=pci1106,3065 \
alias=pci1106,3106
file path=kernel/drv/$(ARCH64)/vr group=sys
-$(i386_ONLY)file path=kernel/drv/vr group=sys
file path=usr/share/man/man7d/vr.7d
legacy pkg=SUNWvr desc="VIA Rhine Fast Ethernet driver" \
name="VIA Rhine Fast Ethernet driver"
diff --git a/usr/src/pkg/manifests/driver-network-wpi.mf b/usr/src/pkg/manifests/driver-network-wpi.mf
index b6b0ea32ca..a51160c221 100644
--- a/usr/src/pkg/manifests/driver-network-wpi.mf
+++ b/usr/src/pkg/manifests/driver-network-wpi.mf
@@ -56,7 +56,6 @@ driver name=wpi clone_perms="wpi 0666 root sys" perms="* 0666 root sys" \
alias=pciex8086,4227.8086.1012 \
alias=pciex8086,4227.8086.1014
file path=kernel/drv/$(ARCH64)/wpi group=sys
-file path=kernel/drv/wpi group=sys
file path=usr/share/man/man7d/wpi.7d
legacy pkg=SUNWwpi desc="Intel(R) PRO/Wireless 3945ABG driver" \
name="Intel(R) PRO/Wireless 3945ABG driver"
diff --git a/usr/src/pkg/manifests/driver-network-xge.mf b/usr/src/pkg/manifests/driver-network-xge.mf
index 71f112e001..4ab7aed291 100644
--- a/usr/src/pkg/manifests/driver-network-xge.mf
+++ b/usr/src/pkg/manifests/driver-network-xge.mf
@@ -46,7 +46,6 @@ driver name=xge clone_perms="xge 0666 root sys" perms="* 0666 root sys" \
alias=pci17d5,5831 \
alias=pci17d5,5832
file path=kernel/drv/$(ARCH64)/xge group=sys
-$(i386_ONLY)file path=kernel/drv/xge group=sys
file path=usr/share/man/man7d/xge.7d
legacy pkg=SUNWxge \
desc="Neterion Xframe (I/II) 10 Gigabit Ethernet Adapter Driver" \
diff --git a/usr/src/pkg/manifests/driver-network-yge.mf b/usr/src/pkg/manifests/driver-network-yge.mf
index f2e1d07eb0..f7ef0b8180 100644
--- a/usr/src/pkg/manifests/driver-network-yge.mf
+++ b/usr/src/pkg/manifests/driver-network-yge.mf
@@ -51,7 +51,6 @@ driver name=yge perms="* 0666 root sys" \
alias=pciex11ab,4364 \
alias=pciex11ab,436a
file path=kernel/drv/$(ARCH64)/yge group=sys
-$(i386_ONLY)file path=kernel/drv/yge group=sys
file path=usr/share/man/man7d/yge.7d
legacy pkg=SUNWyge desc="Marvell Yukon 2 Gigabit Ethernet Controller Driver" \
name="Marvell Yukon 2 Gigabit Ethernet Driver"
diff --git a/usr/src/pkg/manifests/driver-network-zyd.mf b/usr/src/pkg/manifests/driver-network-zyd.mf
index cdec3c775c..8b23df9c15 100644
--- a/usr/src/pkg/manifests/driver-network-zyd.mf
+++ b/usr/src/pkg/manifests/driver-network-zyd.mf
@@ -46,7 +46,6 @@ driver name=zyd clone_perms="zyd 0666 root sys" perms="* 0666 root sys" \
alias=usbace,1211 \
alias=usbace,1215
file path=kernel/drv/$(ARCH64)/zyd group=sys
-file path=kernel/drv/zyd group=sys
file path=usr/share/man/man7d/zyd.7d
legacy pkg=SUNWzyd desc="ZyDAS ZD1211 USB 802.11b/g Wireless Driver" \
name="ZyDAS ZD1211 USB 802.11b/g Wireless Driver"
diff --git a/usr/src/pkg/manifests/driver-pcmcia.mf b/usr/src/pkg/manifests/driver-pcmcia.mf
index d1c4bf7a7d..cf2a085e92 100644
--- a/usr/src/pkg/manifests/driver-pcmcia.mf
+++ b/usr/src/pkg/manifests/driver-pcmcia.mf
@@ -47,9 +47,7 @@ driver name=pcic class=pcmcia \
driver name=pcs
file path=kernel/drv/$(ARCH64)/pcic group=sys
file path=kernel/drv/$(ARCH64)/pcs group=sys
-$(i386_ONLY)file path=kernel/drv/pcic group=sys
file path=kernel/drv/pcic.conf group=sys
-$(i386_ONLY)file path=kernel/drv/pcs group=sys
file path=usr/share/man/man7d/pcic.7d
file path=usr/share/man/man7d/pcmcia.7d
legacy pkg=SUNWpcmci \
diff --git a/usr/src/pkg/manifests/driver-serial-usbftdi.mf b/usr/src/pkg/manifests/driver-serial-usbftdi.mf
index b502a96c42..2d625e89f6 100644
--- a/usr/src/pkg/manifests/driver-serial-usbftdi.mf
+++ b/usr/src/pkg/manifests/driver-serial-usbftdi.mf
@@ -67,7 +67,6 @@ driver name=usbftdi perms="* 0666 root sys" \
alias=usbif403,6010.config1.1 \
alias=usbif9e88,9e8f.config1.1
file path=kernel/drv/$(ARCH64)/usbftdi group=sys
-$(i386_ONLY)file path=kernel/drv/usbftdi group=sys
file path=kernel/drv/usbftdi.conf group=sys \
original_name=SUNWuftdi:kernel/drv/usbftdi.conf preserve=true
file path=usr/share/man/man7d/usbftdi.7d
diff --git a/usr/src/pkg/manifests/driver-serial-usbsacm.mf b/usr/src/pkg/manifests/driver-serial-usbsacm.mf
index d7dd63132b..20e922d5ad 100644
--- a/usr/src/pkg/manifests/driver-serial-usbsacm.mf
+++ b/usr/src/pkg/manifests/driver-serial-usbsacm.mf
@@ -45,7 +45,6 @@ driver name=usbsacm perms="* 0666 root sys" \
alias=usbc88,17da \
alias=usbif,class2.2
file path=kernel/drv/$(ARCH64)/usbsacm group=sys
-$(i386_ONLY)file path=kernel/drv/usbsacm group=sys
file path=usr/share/man/man7d/usbsacm.7d
legacy pkg=SUNWuacm desc="CDC ACM USB-to-serial driver" \
name="CDC ACM USB-to-serial driver"
diff --git a/usr/src/pkg/manifests/driver-serial-usbser.mf b/usr/src/pkg/manifests/driver-serial-usbser.mf
index fc92355e92..4fe65cdf4a 100644
--- a/usr/src/pkg/manifests/driver-serial-usbser.mf
+++ b/usr/src/pkg/manifests/driver-serial-usbser.mf
@@ -39,7 +39,6 @@ dir path=kernel group=sys
dir path=kernel/misc group=sys
dir path=kernel/misc/$(ARCH64) group=sys
file path=kernel/misc/$(ARCH64)/usbser group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/usbser group=sys mode=0755
legacy pkg=SUNWusbs desc="USB generic serial module" \
name="USB generic serial module"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-serial-usbser_edge.mf b/usr/src/pkg/manifests/driver-serial-usbser_edge.mf
index 7b18dd3223..bf1f6fa19d 100644
--- a/usr/src/pkg/manifests/driver-serial-usbser_edge.mf
+++ b/usr/src/pkg/manifests/driver-serial-usbser_edge.mf
@@ -70,7 +70,6 @@ driver name=usbser_edge perms="* 0666 root sys" \
alias=usbif1608,e.config1.0 \
alias=usbif1608,f.config1.0
file path=kernel/drv/$(ARCH64)/usbser_edge group=sys
-$(i386_ONLY)file path=kernel/drv/usbser_edge group=sys
file path=kernel/drv/usbser_edge.conf group=sys \
original_name=SUNWuedg:kernel/drv/usbser_edge.conf preserve=true
legacy pkg=SUNWuedg desc="USB Digi Edgeport serial driver" \
diff --git a/usr/src/pkg/manifests/driver-serial-usbsksp-usbs49_fw.mf b/usr/src/pkg/manifests/driver-serial-usbsksp-usbs49_fw.mf
index 99de965d53..abe3e0f993 100644
--- a/usr/src/pkg/manifests/driver-serial-usbsksp-usbs49_fw.mf
+++ b/usr/src/pkg/manifests/driver-serial-usbsksp-usbs49_fw.mf
@@ -41,8 +41,6 @@ dir path=kernel/misc group=sys
dir path=kernel/misc/$(ARCH64) group=sys
file path=kernel/misc/$(ARCH64)/usbs49_fw group=sys mode=0755 \
original_name=SUNWukspfw:kernel/misc/$(ARCH64)/usbs49_fw preserve=true
-$(i386_ONLY)file path=kernel/misc/usbs49_fw group=sys mode=0755 \
- original_name=SUNWukspfw:kernel/misc/usbs49_fw preserve=true
legacy pkg=SUNWukspfw desc="USA49WLC firmware for USB Keyspan serial driver" \
name="USA49WLC firmware for USB Keyspan serial driver"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-serial-usbsksp.mf b/usr/src/pkg/manifests/driver-serial-usbsksp.mf
index 60132cde16..b662158ba6 100644
--- a/usr/src/pkg/manifests/driver-serial-usbsksp.mf
+++ b/usr/src/pkg/manifests/driver-serial-usbsksp.mf
@@ -45,7 +45,6 @@ driver name=usbsksp perms="* 0666 root sys" \
alias=usb6cd,12a \
alias=usb6cd,131
file path=kernel/drv/$(ARCH64)/usbsksp group=sys
-$(i386_ONLY)file path=kernel/drv/usbsksp group=sys
file path=usr/share/man/man7d/usbsksp.7d
legacy pkg=SUNWuksp desc="USB Keyspan serial driver" \
name="USB Keyspan serial driver"
diff --git a/usr/src/pkg/manifests/driver-serial-usbsprl.mf b/usr/src/pkg/manifests/driver-serial-usbsprl.mf
index 0c712ddc8e..5811b2357c 100644
--- a/usr/src/pkg/manifests/driver-serial-usbsprl.mf
+++ b/usr/src/pkg/manifests/driver-serial-usbsprl.mf
@@ -47,7 +47,6 @@ driver name=usbsprl perms="* 0666 root sys" \
alias=usb67b,2303 \
alias=usb67b,aaa2
file path=kernel/drv/$(ARCH64)/usbsprl group=sys
-$(i386_ONLY)file path=kernel/drv/usbsprl group=sys
file path=usr/share/man/man7d/usbsprl.7d
legacy pkg=SUNWuprl desc="Prolific PL2303 USB-to-serial driver" \
name="Prolific PL2303 USB-to-serial driver"
diff --git a/usr/src/pkg/manifests/driver-storage-aac.mf b/usr/src/pkg/manifests/driver-storage-aac.mf
index fc9700aefb..6a797e49bf 100644
--- a/usr/src/pkg/manifests/driver-storage-aac.mf
+++ b/usr/src/pkg/manifests/driver-storage-aac.mf
@@ -48,7 +48,6 @@ driver name=aac class=scsi \
alias=pciex9005,285 \
alias=pciex9005,286
file path=kernel/drv/$(ARCH64)/aac group=sys
-$(i386_ONLY)file path=kernel/drv/aac group=sys
file path=kernel/drv/aac.conf group=sys \
original_name=SUNWaac:kernel/drv/aac.conf preserve=true
file path=usr/share/man/man7d/aac.7d
diff --git a/usr/src/pkg/manifests/driver-storage-adpu320.mf b/usr/src/pkg/manifests/driver-storage-adpu320.mf
index aeddd7d411..6bb320f317 100644
--- a/usr/src/pkg/manifests/driver-storage-adpu320.mf
+++ b/usr/src/pkg/manifests/driver-storage-adpu320.mf
@@ -52,7 +52,6 @@ driver name=adpu320 class=scsi perms="adpu320ctl 0666 root root" \
alias=pci9005,801f \
alias=pci9005,808f
file path=kernel/drv/$(ARCH64)/adpu320 group=sys
-file path=kernel/drv/adpu320 group=sys
file path=kernel/drv/adpu320.conf group=sys
legacy pkg=SUNWadpu320 desc="Adaptec 7902 SCSI Driver" \
name="Adaptec Ultra320 Driver"
diff --git a/usr/src/pkg/manifests/driver-storage-ahci.mf b/usr/src/pkg/manifests/driver-storage-ahci.mf
index f191291157..031baffd31 100644
--- a/usr/src/pkg/manifests/driver-storage-ahci.mf
+++ b/usr/src/pkg/manifests/driver-storage-ahci.mf
@@ -44,7 +44,6 @@ dir path=usr/share/man/man7d
driver name=ahci alias=pciclass,010601 class=scsi-self-identifying \
perms="* 0644 root sys"
file path=kernel/drv/$(ARCH64)/ahci group=sys
-file path=kernel/drv/ahci group=sys
file path=usr/share/man/man7d/ahci.7d
legacy pkg=SUNWahci \
desc="Advanced Host Controller Interface (AHCI) SATA HBA Driver" \
diff --git a/usr/src/pkg/manifests/driver-storage-amr.mf b/usr/src/pkg/manifests/driver-storage-amr.mf
index 2b68976c14..15b0ae6452 100644
--- a/usr/src/pkg/manifests/driver-storage-amr.mf
+++ b/usr/src/pkg/manifests/driver-storage-amr.mf
@@ -47,7 +47,6 @@ driver name=amr class=scsi \
alias=pci1028,e \
alias=pci1028,f
file path=kernel/drv/$(ARCH64)/amr group=sys
-file path=kernel/drv/amr group=sys
file path=kernel/drv/amr.conf group=sys
file path=usr/share/man/man7d/amr.7d
legacy pkg=SUNWamr desc="LSI MegaRAID SCSI HBA Driver" \
diff --git a/usr/src/pkg/manifests/driver-storage-arcmsr.mf b/usr/src/pkg/manifests/driver-storage-arcmsr.mf
index b324cdaae1..de5b53668a 100644
--- a/usr/src/pkg/manifests/driver-storage-arcmsr.mf
+++ b/usr/src/pkg/manifests/driver-storage-arcmsr.mf
@@ -61,7 +61,6 @@ driver name=arcmsr class=scsi perms="* 0600 root sys" \
alias=pci17d3,1880 \
alias=pci17d3,1882
file path=kernel/drv/$(ARCH64)/arcmsr group=sys
-file path=kernel/drv/arcmsr group=sys
file path=kernel/drv/arcmsr.conf group=sys
file path=usr/share/man/man7d/arcmsr.7d
legacy pkg=SUNWarcmsr desc="SAS/SATA RAID driver" \
diff --git a/usr/src/pkg/manifests/driver-storage-ata.mf b/usr/src/pkg/manifests/driver-storage-ata.mf
index 73f3c9fb8f..c43765124f 100644
--- a/usr/src/pkg/manifests/driver-storage-ata.mf
+++ b/usr/src/pkg/manifests/driver-storage-ata.mf
@@ -52,14 +52,11 @@ dir path=usr/share/man/man7d
driver name=ata alias=ide class=dada class=scsi
driver name=pci-ide
file path=kernel/drv/$(ARCH64)/ata group=sys
-file path=kernel/drv/ata group=sys
file path=kernel/drv/ata.conf group=sys \
original_name=SUNWpsdir:kernel/drv/ata.conf preserve=true
file path=platform/i86pc/kernel/drv/$(ARCH64)/pci-ide group=sys
-file path=platform/i86pc/kernel/drv/pci-ide group=sys
file path=platform/i86pc/kernel/drv/pci-ide.conf group=sys
file path=platform/i86xpv/kernel/drv/$(ARCH64)/pci-ide group=sys
-file path=platform/i86xpv/kernel/drv/pci-ide group=sys
file path=platform/i86xpv/kernel/drv/pci-ide.conf group=sys
file path=usr/share/man/man7d/ata.7d
legacy pkg=SUNWpsdir desc="Platform Support, ISA Bus Device Drivers, (Root)" \
diff --git a/usr/src/pkg/manifests/driver-storage-bcm_sata.mf b/usr/src/pkg/manifests/driver-storage-bcm_sata.mf
index e3406d812c..4c40d3f043 100644
--- a/usr/src/pkg/manifests/driver-storage-bcm_sata.mf
+++ b/usr/src/pkg/manifests/driver-storage-bcm_sata.mf
@@ -43,7 +43,6 @@ dir path=usr/share/man/man7d
driver name=bcm_sata alias=pci1166,24a class=scsi-self-identifying \
perms="* 0644 root sys"
file path=kernel/drv/$(ARCH64)/bcm_sata group=sys
-file path=kernel/drv/bcm_sata group=sys
file path=usr/share/man/man7d/bcm_sata.7d
legacy pkg=SUNWbcmsata desc="BroadCom ht1000 sata driver" \
name="BroadCom ht1000 sata driver"
diff --git a/usr/src/pkg/manifests/driver-storage-blkdev.mf b/usr/src/pkg/manifests/driver-storage-blkdev.mf
index ef336e371b..bda4a2ff0e 100644
--- a/usr/src/pkg/manifests/driver-storage-blkdev.mf
+++ b/usr/src/pkg/manifests/driver-storage-blkdev.mf
@@ -43,7 +43,6 @@ dir path=usr/share/man
dir path=usr/share/man/man7d
driver name=blkdev perms="* 0640 root root"
file path=kernel/drv/$(ARCH64)/blkdev group=sys
-$(i386_ONLY)file path=kernel/drv/blkdev group=sys
file path=usr/share/man/man7d/blkdev.7d
license cr_Sun license=cr_Sun
license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-storage-cpqary3.mf b/usr/src/pkg/manifests/driver-storage-cpqary3.mf
index 7c0656e3f6..024b6e8319 100644
--- a/usr/src/pkg/manifests/driver-storage-cpqary3.mf
+++ b/usr/src/pkg/manifests/driver-storage-cpqary3.mf
@@ -83,7 +83,6 @@ driver name=cpqary3 class=scsi \
alias=pcie11,409d \
alias=pcie11,409e
file path=kernel/drv/$(ARCH64)/cpqary3 group=sys
-file path=kernel/drv/cpqary3 group=sys
file path=kernel/drv/cpqary3.conf group=sys
file path=usr/share/man/man7d/cpqary3.7d
legacy pkg=CPQary3 desc="HP Smart Array HBA Driver" \
diff --git a/usr/src/pkg/manifests/driver-storage-glm.mf b/usr/src/pkg/manifests/driver-storage-glm.mf
index 3d6ff80d26..09d34971d9 100644
--- a/usr/src/pkg/manifests/driver-storage-glm.mf
+++ b/usr/src/pkg/manifests/driver-storage-glm.mf
@@ -40,7 +40,6 @@ dir path=kernel/drv group=sys
dir path=kernel/drv/$(ARCH64) group=sys
driver name=glm alias=pci1000,b class=scsi perms="* 0755 root sys"
file path=kernel/drv/$(ARCH64)/glm group=sys
-file path=kernel/drv/glm group=sys
file path=kernel/drv/glm.conf group=sys
legacy pkg=SUNWpd desc="Drivers for the PCI bus" name="PCI Drivers"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-storage-lsimega.mf b/usr/src/pkg/manifests/driver-storage-lsimega.mf
index fe3adcb862..a1d3ab77e8 100644
--- a/usr/src/pkg/manifests/driver-storage-lsimega.mf
+++ b/usr/src/pkg/manifests/driver-storage-lsimega.mf
@@ -47,7 +47,6 @@ driver name=lsimega class=scsi \
alias=pci1000,409 \
alias=pci1028,13
file path=kernel/drv/$(ARCH64)/lsimega group=sys
-file path=kernel/drv/lsimega group=sys
file path=kernel/drv/lsimega.conf group=sys
legacy pkg=SUNWlsimega desc="LSI Hardware RAID HBA Driver" \
name="LSI Hardware RAID HBA Driver"
diff --git a/usr/src/pkg/manifests/driver-storage-marvell88sx.mf b/usr/src/pkg/manifests/driver-storage-marvell88sx.mf
index 16b46a6614..96cc585bf5 100644
--- a/usr/src/pkg/manifests/driver-storage-marvell88sx.mf
+++ b/usr/src/pkg/manifests/driver-storage-marvell88sx.mf
@@ -45,7 +45,6 @@ driver name=marvell88sx class=scsi-self-identifying perms="* 0644 root sys" \
alias=pci11ab,6041.9 \
alias=pci11ab,6081.9
file path=kernel/drv/$(ARCH64)/marvell88sx group=sys
-file path=kernel/drv/marvell88sx group=sys
legacy pkg=SUNWmv88sx desc="Marvell 88sx sata driver" \
name="Marvell 88sx sata driver"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-storage-mega_sas.mf b/usr/src/pkg/manifests/driver-storage-mega_sas.mf
index f2403f5467..1844440ca0 100644
--- a/usr/src/pkg/manifests/driver-storage-mega_sas.mf
+++ b/usr/src/pkg/manifests/driver-storage-mega_sas.mf
@@ -145,7 +145,6 @@ driver name=mega_sas class=scsi \
alias=pci1028,15.1028.1f02 \
alias=pci1028,15.1028.1f03
file path=kernel/drv/$(ARCH64)/mega_sas group=sys
-file path=kernel/drv/mega_sas group=sys
file path=kernel/drv/mega_sas.conf group=sys
file path=usr/share/man/man7d/mega_sas.7d
legacy pkg=SUNWmegasas desc="LSI MegaSAS RAID Controller HBA Driver" \
diff --git a/usr/src/pkg/manifests/driver-storage-mpt_sas.mf b/usr/src/pkg/manifests/driver-storage-mpt_sas.mf
index 89527309e6..ae55dc9422 100644
--- a/usr/src/pkg/manifests/driver-storage-mpt_sas.mf
+++ b/usr/src/pkg/manifests/driver-storage-mpt_sas.mf
@@ -74,7 +74,6 @@ driver name=mpt_sas class=scsi-self-identifying \
alias=pciex1000,c4 \
alias=pciex1000,c9
file path=kernel/drv/$(ARCH64)/mpt_sas group=sys
-$(i386_ONLY)file path=kernel/drv/mpt_sas group=sys
file path=kernel/drv/mpt_sas.conf group=sys \
original_name=SUNWmptsas:kernel/drv/mpt_sas.conf preserve=true
file path=usr/share/man/man7d/mpt_sas.7d
diff --git a/usr/src/pkg/manifests/driver-storage-mr_sas.mf b/usr/src/pkg/manifests/driver-storage-mr_sas.mf
index d1b39a659e..af8df8acf0 100644
--- a/usr/src/pkg/manifests/driver-storage-mr_sas.mf
+++ b/usr/src/pkg/manifests/driver-storage-mr_sas.mf
@@ -70,7 +70,6 @@ $(i386_ONLY)driver name=mr_sas class=scsi-self-identifying \
alias=pciex1000,ce \
alias=pciex1000,cf
file path=kernel/drv/$(ARCH64)/mr_sas group=sys
-$(i386_ONLY)file path=kernel/drv/mr_sas group=sys
file path=kernel/drv/mr_sas.conf group=sys
file path=usr/share/man/man7d/mr_sas.7d
legacy pkg=SUNWmrsas desc="LSI MegaRAID SAS2.0 Controller HBA Driver" \
diff --git a/usr/src/pkg/manifests/driver-storage-nv_sata.mf b/usr/src/pkg/manifests/driver-storage-nv_sata.mf
index de461de362..9d95ac4347 100644
--- a/usr/src/pkg/manifests/driver-storage-nv_sata.mf
+++ b/usr/src/pkg/manifests/driver-storage-nv_sata.mf
@@ -54,7 +54,6 @@ driver name=nv_sata class=scsi-self-identifying perms="* 0644 root sys" \
alias=pci10de,54 \
alias=pci10de,55
file path=kernel/drv/$(ARCH64)/nv_sata group=sys
-file path=kernel/drv/nv_sata group=sys
file path=kernel/drv/nv_sata.conf group=sys
file path=usr/share/man/man7d/nv_sata.7d
legacy pkg=SUNWnvsata desc="Nvidia ck804 pro / mcp55 pro combo SATA driver" \
diff --git a/usr/src/pkg/manifests/driver-storage-nvme.mf b/usr/src/pkg/manifests/driver-storage-nvme.mf
index d2742de3c2..98f9b8cc81 100644
--- a/usr/src/pkg/manifests/driver-storage-nvme.mf
+++ b/usr/src/pkg/manifests/driver-storage-nvme.mf
@@ -42,7 +42,6 @@ driver name=nvme class=disk perms="* 0600 root sys" \
alias=pciclass,010802 \
alias=pciexclass,010802
file path=kernel/drv/$(ARCH64)/nvme group=sys
-file path=kernel/drv/nvme group=sys
file path=kernel/drv/nvme.conf group=sys
file path=usr/sbin/nvmeadm mode=0555
file path=usr/share/man/man1m/nvmeadm.1m
diff --git a/usr/src/pkg/manifests/driver-storage-pmcs.mf b/usr/src/pkg/manifests/driver-storage-pmcs.mf
index a537835c91..94bd6fc0d7 100644
--- a/usr/src/pkg/manifests/driver-storage-pmcs.mf
+++ b/usr/src/pkg/manifests/driver-storage-pmcs.mf
@@ -51,15 +51,11 @@ dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
driver name=pmcs alias=pciex11f8,8001 class=scsi-self-identifying \
perms="* 0600 root sys"
file path=kernel/drv/$(ARCH64)/pmcs group=sys
-$(i386_ONLY)file path=kernel/drv/pmcs group=sys
file path=kernel/drv/pmcs.conf group=sys \
original_name=SUNWpmcs:kernel/drv/pmcs.conf preserve=true
file path=kernel/kmdb/$(ARCH64)/pmcs group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/pmcs group=sys mode=0555
file path=kernel/misc/pmcs/$(ARCH64)/pmcs8001fw group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/pmcs/pmcs8001fw group=sys mode=0755
file path=usr/lib/mdb/kvm/$(ARCH64)/pmcs.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/pmcs.so group=sys mode=0555
legacy pkg=SUNWpmcsr desc="PMC-Sierra SAS-2 HBA Driver (root)" \
name="PMC-Sierra SAS-2 HBA driver (root)"
legacy pkg=SUNWpmcsu desc="PMC-Sierra SAS-2 HBA driver (usr)" \
diff --git a/usr/src/pkg/manifests/driver-storage-pvscsi.mf b/usr/src/pkg/manifests/driver-storage-pvscsi.mf
index 2efefefb73..710263bdab 100644
--- a/usr/src/pkg/manifests/driver-storage-pvscsi.mf
+++ b/usr/src/pkg/manifests/driver-storage-pvscsi.mf
@@ -30,7 +30,6 @@ dir path=kernel/drv group=sys
dir path=kernel/drv/$(ARCH64) group=sys
driver name=pvscsi alias=pci15ad,7c0 class=scsi-self-identifying
file path=kernel/drv/$(ARCH64)/pvscsi group=sys
-file path=kernel/drv/pvscsi group=sys
license lic_CDDL license=lic_CDDL
license usr/src/uts/intel/io/scsi/adapters/pvscsi/THIRDPARTYLICENSE \
license=usr/src/uts/intel/io/scsi/adapters/pvscsi/THIRDPARTYLICENSE
diff --git a/usr/src/pkg/manifests/driver-storage-sbp2.mf b/usr/src/pkg/manifests/driver-storage-sbp2.mf
index 99f5a5b375..e5b7aabe7b 100644
--- a/usr/src/pkg/manifests/driver-storage-sbp2.mf
+++ b/usr/src/pkg/manifests/driver-storage-sbp2.mf
@@ -39,7 +39,6 @@ dir path=kernel group=sys
dir path=kernel/misc group=sys
dir path=kernel/misc/$(ARCH64) group=sys
file path=kernel/misc/$(ARCH64)/sbp2 group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/sbp2 group=sys mode=0755
legacy pkg=SUNWsbp2 desc="Serial Bus Protocol 2 module" \
name="Serial Bus Protocol 2 module"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-storage-scsa1394.mf b/usr/src/pkg/manifests/driver-storage-scsa1394.mf
index 326c1b0c9d..ecad2c21c8 100644
--- a/usr/src/pkg/manifests/driver-storage-scsa1394.mf
+++ b/usr/src/pkg/manifests/driver-storage-scsa1394.mf
@@ -41,7 +41,6 @@ dir path=usr/share/man
dir path=usr/share/man/man7d
driver name=scsa1394 alias=firewire00609e,010483 perms="* 0666 root sys"
file path=kernel/drv/$(ARCH64)/scsa1394 group=sys
-$(i386_ONLY)file path=kernel/drv/scsa1394 group=sys
file path=usr/share/man/man7d/scsa1394.7d
legacy pkg=SUNWscsa1394 desc="IEEE 1394 mass storage driver" \
name="IEEE 1394 mass storage driver"
diff --git a/usr/src/pkg/manifests/driver-storage-sdcard.mf b/usr/src/pkg/manifests/driver-storage-sdcard.mf
index f14e86ffdb..15147cc00e 100644
--- a/usr/src/pkg/manifests/driver-storage-sdcard.mf
+++ b/usr/src/pkg/manifests/driver-storage-sdcard.mf
@@ -49,9 +49,7 @@ $(i386_ONLY)driver name=sdhost perms="* 0644 root root" \
alias=pciclass,080500 \
alias=pciclass,080501
$(i386_ONLY)file path=kernel/drv/$(ARCH64)/sdhost group=sys
-$(i386_ONLY)file path=kernel/drv/sdhost group=sys
$(i386_ONLY)file path=kernel/misc/$(ARCH64)/sda group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/sda group=sys mode=0755
$(i386_ONLY)file path=usr/share/man/man7d/sda.7d
$(i386_ONLY)file path=usr/share/man/man7d/sdhost.7d
$(i386_ONLY)legacy pkg=SUNWsdcard desc="SD/MMC Drivers" name="SD/MMC Drivers"
diff --git a/usr/src/pkg/manifests/driver-storage-ses.mf b/usr/src/pkg/manifests/driver-storage-ses.mf
index e45af9d08b..2f6236e02e 100644
--- a/usr/src/pkg/manifests/driver-storage-ses.mf
+++ b/usr/src/pkg/manifests/driver-storage-ses.mf
@@ -43,7 +43,6 @@ driver name=ses perms="* 0666 bin bin" \
alias=scsiclass,03S \
alias=scsiclass,0d
file path=kernel/drv/$(ARCH64)/ses group=sys
-$(i386_ONLY)file path=kernel/drv/ses group=sys
file path=kernel/drv/ses.conf group=sys
file path=usr/share/man/man7d/ses.7d
legacy pkg=SUNWses desc="SCSI Enclosure Services (ses) Device Driver" \
diff --git a/usr/src/pkg/manifests/driver-storage-si3124.mf b/usr/src/pkg/manifests/driver-storage-si3124.mf
index 6c860d7961..1dce7d33ad 100644
--- a/usr/src/pkg/manifests/driver-storage-si3124.mf
+++ b/usr/src/pkg/manifests/driver-storage-si3124.mf
@@ -44,7 +44,6 @@ driver name=si3124 class=scsi-self-identifying perms="* 0644 root sys" \
alias=pci1095,3132 \
alias=pci1095,3531
file path=kernel/drv/$(ARCH64)/si3124 group=sys
-file path=kernel/drv/si3124 group=sys
file path=usr/share/man/man7d/si3124.7d
legacy pkg=SUNWsi3124 desc="SiliconImage 3124 sata driver" \
name="SiliconImage 3124 sata driver"
diff --git a/usr/src/pkg/manifests/driver-storage-skd.mf b/usr/src/pkg/manifests/driver-storage-skd.mf
index e5cd2f73ae..e4258edd05 100644
--- a/usr/src/pkg/manifests/driver-storage-skd.mf
+++ b/usr/src/pkg/manifests/driver-storage-skd.mf
@@ -38,7 +38,6 @@ dir path=usr/share/man
dir path=usr/share/man/man7d
driver name=skd alias=pciex1b39,1 class=disk perms="* 0600 root sys"
file path=kernel/drv/$(ARCH64)/skd group=sys
-file path=kernel/drv/skd group=sys
file path=kernel/drv/skd.conf group=sys
file path=usr/share/man/man7d/skd.7d
license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-storage-smp.mf b/usr/src/pkg/manifests/driver-storage-smp.mf
index e73f8d2d04..c6c64f6e14 100644
--- a/usr/src/pkg/manifests/driver-storage-smp.mf
+++ b/usr/src/pkg/manifests/driver-storage-smp.mf
@@ -42,7 +42,6 @@ dir path=kernel/drv group=sys
dir path=kernel/drv/$(ARCH64) group=sys
driver name=smp perms="* 0644 root sys"
file path=kernel/drv/$(ARCH64)/smp group=sys
-$(i386_ONLY)file path=kernel/drv/smp group=sys
file path=kernel/drv/smp.conf group=sys
legacy pkg=SUNWsmpd \
desc="Target Driver for Serial SCSI Management Protocol (SMP) Compliant Devices" \
diff --git a/usr/src/pkg/manifests/driver-storage-sv.mf b/usr/src/pkg/manifests/driver-storage-sv.mf
index 25bc6bbf7f..a30d0b8777 100644
--- a/usr/src/pkg/manifests/driver-storage-sv.mf
+++ b/usr/src/pkg/manifests/driver-storage-sv.mf
@@ -70,16 +70,13 @@ driver name=sv devlink=type=ddi_pseudo;name=sv\t\D perms="* 0666 root sys" \
file path=etc/init.d/sv mode=0744
file path=etc/init.d/sv.cluster mode=0744
file path=kernel/kmdb/$(ARCH64)/sv group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/sv group=sys mode=0555
file path=lib/svc/manifest/system/nws_sv.xml group=sys mode=0444
file path=usr/bin/svadm mode=0555
file path=usr/bin/svboot mode=0555
file path=usr/cluster/sbin/sv mode=0744
file path=usr/kernel/drv/$(ARCH64)/sv group=sys
-$(i386_ONLY)file path=usr/kernel/drv/sv group=sys
file path=usr/kernel/drv/sv.conf group=sys
file path=usr/lib/mdb/kvm/$(ARCH64)/sv.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/sv.so group=sys mode=0555
file path=usr/share/man/man1m/svadm.1m
file path=usr/share/man/man7d/sv.7d
hardlink path=lib/svc/method/svc-sv target=../../../etc/init.d/sv
diff --git a/usr/src/pkg/manifests/driver-storage-vioblk.mf b/usr/src/pkg/manifests/driver-storage-vioblk.mf
index f3bc3ef128..55076197c6 100644
--- a/usr/src/pkg/manifests/driver-storage-vioblk.mf
+++ b/usr/src/pkg/manifests/driver-storage-vioblk.mf
@@ -41,5 +41,4 @@ dir path=kernel/drv/$(ARCH64) group=sys
driver name=vioblk alias=pci1af4,1001 clone_perms="vioblk 0666 root sys" \
perms="* 0666 root sys"
file path=kernel/drv/$(ARCH64)/vioblk group=sys
-file path=kernel/drv/vioblk group=sys
license lic_CDDL license=lic_CDDL
diff --git a/usr/src/pkg/manifests/driver-usb-ugen.mf b/usr/src/pkg/manifests/driver-usb-ugen.mf
index 1bcaf3983a..69b58e325a 100644
--- a/usr/src/pkg/manifests/driver-usb-ugen.mf
+++ b/usr/src/pkg/manifests/driver-usb-ugen.mf
@@ -41,7 +41,6 @@ dir path=usr/share/man
dir path=usr/share/man/man7d
driver name=ugen perms="* 0644 root sys"
file path=kernel/drv/$(ARCH64)/ugen group=sys
-$(i386_ONLY)file path=kernel/drv/ugen group=sys
file path=usr/share/man/man7d/ugen.7d
legacy pkg=SUNWugen desc="UGEN (USB Generic Driver)" name="USB Generic Driver"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/driver-usb-usbgem.mf b/usr/src/pkg/manifests/driver-usb-usbgem.mf
index 6e378e5dc8..fe32a99bee 100644
--- a/usr/src/pkg/manifests/driver-usb-usbgem.mf
+++ b/usr/src/pkg/manifests/driver-usb-usbgem.mf
@@ -23,7 +23,6 @@ dir path=kernel group=sys
dir path=kernel/misc group=sys
dir path=kernel/misc/$(ARCH64) group=sys
file path=kernel/misc/$(ARCH64)/usbgem group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/usbgem group=sys mode=0755
license usr/src/uts/common/io/usbgem/THIRDPARTYLICENSE \
license=usr/src/uts/common/io/usbgem/THIRDPARTYLICENSE
depend fmri=driver/usb type=require
diff --git a/usr/src/pkg/manifests/driver-usb.mf b/usr/src/pkg/manifests/driver-usb.mf
index e10e9a2d2a..d0d9f372db 100644
--- a/usr/src/pkg/manifests/driver-usb.mf
+++ b/usr/src/pkg/manifests/driver-usb.mf
@@ -96,43 +96,22 @@ file path=kernel/drv/$(ARCH64)/usb_ia group=sys
file path=kernel/drv/$(ARCH64)/usb_mid group=sys
file path=kernel/drv/$(ARCH64)/usbprn group=sys
$(i386_ONLY)file path=kernel/drv/$(ARCH64)/xhci group=sys
-$(i386_ONLY)file path=kernel/drv/ehci group=sys
file path=kernel/drv/ehci.conf group=sys
-$(i386_ONLY)file path=kernel/drv/hid group=sys
-$(i386_ONLY)file path=kernel/drv/hubd group=sys
-$(i386_ONLY)file path=kernel/drv/ohci group=sys
file path=kernel/drv/ohci.conf group=sys
-$(i386_ONLY)file path=kernel/drv/scsa2usb group=sys
file path=kernel/drv/scsa2usb.conf group=sys \
original_name=SUNWusb:kernel/drv/scsa2usb.conf preserve=true
-$(i386_ONLY)file path=kernel/drv/uhci group=sys
file path=kernel/drv/uhci.conf group=sys
-$(i386_ONLY)file path=kernel/drv/usb_ac group=sys
file path=kernel/drv/usb_ac.conf group=sys
-$(i386_ONLY)file path=kernel/drv/usb_as group=sys
-$(i386_ONLY)file path=kernel/drv/usb_ia group=sys
-$(i386_ONLY)file path=kernel/drv/usb_mid group=sys
-$(i386_ONLY)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/$(ARCH64)/xhci group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/xhci group=sys mode=0555
file path=kernel/misc/$(ARCH64)/hidparser group=sys mode=0755
file path=kernel/misc/$(ARCH64)/usba group=sys mode=0755
file path=kernel/misc/$(ARCH64)/usba10 group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/hidparser group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/usba group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/usba10 group=sys mode=0755
file path=kernel/strmod/$(ARCH64)/usb_ah group=sys mode=0755
file path=kernel/strmod/$(ARCH64)/usbkbm group=sys mode=0755
file path=kernel/strmod/$(ARCH64)/usbms group=sys mode=0755
file path=kernel/strmod/$(ARCH64)/usbwcm group=sys mode=0755
-$(i386_ONLY)file path=kernel/strmod/usb_ah group=sys mode=0755
-$(i386_ONLY)file path=kernel/strmod/usbkbm group=sys mode=0755
-$(i386_ONLY)file path=kernel/strmod/usbms group=sys mode=0755
-$(i386_ONLY)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/mdb/kvm/xhci.so group=sys mode=0555
$(i386_ONLY)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
diff --git a/usr/src/pkg/manifests/driver-x11-winlock.mf b/usr/src/pkg/manifests/driver-x11-winlock.mf
index 8a2a9dd65c..f6b3665af1 100644
--- a/usr/src/pkg/manifests/driver-x11-winlock.mf
+++ b/usr/src/pkg/manifests/driver-x11-winlock.mf
@@ -34,7 +34,6 @@ dir path=usr/kernel/drv group=sys
dir path=usr/kernel/drv/$(ARCH64) group=sys
driver name=winlock perms="* 0666 root sys"
file path=usr/kernel/drv/$(ARCH64)/winlock group=sys
-$(i386_ONLY)file path=usr/kernel/drv/winlock group=sys
file path=usr/kernel/drv/winlock.conf group=sys
legacy pkg=SUNWxwdv desc="kernel device drivers for X Windows System" \
name="X Windows System Window Drivers"
diff --git a/usr/src/pkg/manifests/driver-x11-xsvc.mf b/usr/src/pkg/manifests/driver-x11-xsvc.mf
index 3b8617d664..11a3d8d2a8 100644
--- a/usr/src/pkg/manifests/driver-x11-xsvc.mf
+++ b/usr/src/pkg/manifests/driver-x11-xsvc.mf
@@ -45,10 +45,8 @@ dir path=platform/i86xpv/kernel/drv group=sys
dir path=platform/i86xpv/kernel/drv/$(ARCH64) group=sys
driver name=xsvc devlink=type=ddi_pseudo;name=xsvc\t\M0
file path=platform/i86pc/kernel/drv/$(ARCH64)/xsvc group=sys
-file path=platform/i86pc/kernel/drv/xsvc group=sys
file path=platform/i86pc/kernel/drv/xsvc.conf group=sys
file path=platform/i86xpv/kernel/drv/$(ARCH64)/xsvc group=sys
-file path=platform/i86xpv/kernel/drv/xsvc group=sys
file path=platform/i86xpv/kernel/drv/xsvc.conf group=sys
legacy pkg=SUNWxsvc desc="Sun Xserver pseudo driver" \
name="Sun Xserver pseudo driver" version=11.11.0,REV=2009.11.11
diff --git a/usr/src/pkg/manifests/driver-xvm-pv.mf b/usr/src/pkg/manifests/driver-xvm-pv.mf
index 7992aa5bdc..0dabb54f19 100644
--- a/usr/src/pkg/manifests/driver-xvm-pv.mf
+++ b/usr/src/pkg/manifests/driver-xvm-pv.mf
@@ -50,14 +50,7 @@ file path=platform/$(ARCH32)hvm/kernel/drv/$(ARCH64)/xdf group=sys
file path=platform/$(ARCH32)hvm/kernel/drv/$(ARCH64)/xnf group=sys
file path=platform/$(ARCH32)hvm/kernel/drv/$(ARCH64)/xpv group=sys
file path=platform/$(ARCH32)hvm/kernel/drv/$(ARCH64)/xpvd group=sys
-file path=platform/$(ARCH32)hvm/kernel/drv/cmdk group=sys
-file path=platform/$(ARCH32)hvm/kernel/drv/rtls group=sys
-file path=platform/$(ARCH32)hvm/kernel/drv/sd group=sys
-file path=platform/$(ARCH32)hvm/kernel/drv/xdf group=sys
-file path=platform/$(ARCH32)hvm/kernel/drv/xnf group=sys
-file path=platform/$(ARCH32)hvm/kernel/drv/xpv group=sys
file path=platform/$(ARCH32)hvm/kernel/drv/xpv.conf group=sys
-file path=platform/$(ARCH32)hvm/kernel/drv/xpvd group=sys
file path=platform/$(ARCH32)hvm/kernel/drv/xpvd.conf group=sys
file path=platform/$(ARCH32)hvm/kernel/misc/$(ARCH64)/hvm_bootstrap group=sys \
mode=0755
@@ -65,9 +58,6 @@ file path=platform/$(ARCH32)hvm/kernel/misc/$(ARCH64)/hvm_cmdk group=sys \
mode=0755
file path=platform/$(ARCH32)hvm/kernel/misc/$(ARCH64)/hvm_sd group=sys \
mode=0755
-file path=platform/$(ARCH32)hvm/kernel/misc/hvm_bootstrap group=sys mode=0755
-file path=platform/$(ARCH32)hvm/kernel/misc/hvm_cmdk group=sys mode=0755
-file path=platform/$(ARCH32)hvm/kernel/misc/hvm_sd group=sys mode=0755
legacy pkg=SUNWxvmpv desc="xVM Paravirtualized Drivers" \
name="xVM Paravirtualized Drivers"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/network-ipd.mf b/usr/src/pkg/manifests/network-ipd.mf
index 01e2a41bec..c36323227e 100644
--- a/usr/src/pkg/manifests/network-ipd.mf
+++ b/usr/src/pkg/manifests/network-ipd.mf
@@ -29,7 +29,6 @@ dir path=usr/sbin
dir path=usr/share/man/man1m
driver name=ipd perms="* 0600 root sys"
file path=kernel/drv/$(ARCH64)/ipd group=sys
-$(i386_ONLY)file path=kernel/drv/ipd group=sys
file path=kernel/drv/ipd.conf group=sys
file path=usr/include/libipd.h
file path=usr/include/sys/ipd.h
diff --git a/usr/src/pkg/manifests/network-ipfilter.mf b/usr/src/pkg/manifests/network-ipfilter.mf
index 6f38df0179..3d4dc73d01 100644
--- a/usr/src/pkg/manifests/network-ipfilter.mf
+++ b/usr/src/pkg/manifests/network-ipfilter.mf
@@ -64,7 +64,6 @@ file path=etc/ipf/ipf.conf group=sys original_name=SUNWipf:etc/ipf/ipf.conf \
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/$(ARCH64)/ipf group=sys
-$(i386_ONLY)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/$(ARCH64)/ipftest mode=0555
diff --git a/usr/src/pkg/manifests/network-iscsi-initiator.mf b/usr/src/pkg/manifests/network-iscsi-initiator.mf
index e15913f800..626e9dadc7 100644
--- a/usr/src/pkg/manifests/network-iscsi-initiator.mf
+++ b/usr/src/pkg/manifests/network-iscsi-initiator.mf
@@ -49,7 +49,6 @@ dir path=usr/share/man/man1m
dir path=usr/share/man/man7d
driver name=iscsi class=scsi-self-identify perms="* 0600 root sys"
file path=kernel/drv/$(ARCH64)/iscsi group=sys
-$(i386_ONLY)file path=kernel/drv/iscsi group=sys
file path=kernel/drv/iscsi.conf group=sys \
original_name=SUNWiscsi:kernel/drv/iscsi.conf preserve=true
file path=lib/svc/manifest/network/iscsi/iscsi-initiator.xml group=sys \
diff --git a/usr/src/pkg/manifests/network-iscsi-iser.mf b/usr/src/pkg/manifests/network-iscsi-iser.mf
index 4128a96656..b191bda5b4 100644
--- a/usr/src/pkg/manifests/network-iscsi-iser.mf
+++ b/usr/src/pkg/manifests/network-iscsi-iser.mf
@@ -51,14 +51,10 @@ dir path=usr/share/man
dir path=usr/share/man/man7d
driver name=iser perms="* 0600 root sys"
file path=kernel/drv/$(ARCH64)/iser group=sys
-$(i386_ONLY)file path=kernel/drv/iser group=sys
file path=kernel/drv/iser.conf group=sys
file path=kernel/kmdb/$(ARCH64)/idm group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/idm group=sys mode=0555
file path=kernel/misc/$(ARCH64)/idm group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/idm group=sys mode=0755
file path=usr/lib/mdb/kvm/$(ARCH64)/idm.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/idm.so group=sys mode=0555
file path=usr/share/man/man7d/iser.7d
legacy pkg=SUNWiscsidmr desc="Sun iSCSI Data Mover (Root)" \
name="Sun iSCSI Data Mover (Root)"
diff --git a/usr/src/pkg/manifests/network-iscsi-target.mf b/usr/src/pkg/manifests/network-iscsi-target.mf
index 56c8cee642..fe959e64ba 100644
--- a/usr/src/pkg/manifests/network-iscsi-target.mf
+++ b/usr/src/pkg/manifests/network-iscsi-target.mf
@@ -52,7 +52,6 @@ dir path=usr/share/man/man3iscsit
dir path=usr/share/man/man3lib
driver name=iscsit perms="* 0600 root sys"
file path=kernel/drv/$(ARCH64)/iscsit group=sys
-$(i386_ONLY)file path=kernel/drv/iscsit group=sys
file path=kernel/drv/iscsit.conf group=sys
file path=lib/svc/manifest/network/iscsi/iscsi-target.xml group=sys mode=0444 \
variant.opensolaris.zone=global
diff --git a/usr/src/pkg/manifests/service-fault-management.mf b/usr/src/pkg/manifests/service-fault-management.mf
index e83432f48f..f2176a6a36 100644
--- a/usr/src/pkg/manifests/service-fault-management.mf
+++ b/usr/src/pkg/manifests/service-fault-management.mf
@@ -262,7 +262,6 @@ file path=etc/net-snmp/snmp/mibs/SUN-IREPORT-MIB.mib \
# driver is global-zone only
#
file path=kernel/drv/$(ARCH64)/fm group=sys
-$(i386_ONLY)file path=kernel/drv/fm group=sys
file path=kernel/drv/fm.conf group=sys
#
diff --git a/usr/src/pkg/manifests/service-file-system-nfs.mf b/usr/src/pkg/manifests/service-file-system-nfs.mf
index 8f8a7d0738..7d3a408bac 100644
--- a/usr/src/pkg/manifests/service-file-system-nfs.mf
+++ b/usr/src/pkg/manifests/service-file-system-nfs.mf
@@ -59,7 +59,6 @@ file path=etc/default/nfslogd group=sys \
file path=etc/nfs/nfslog.conf group=sys \
original_name=SUNWnfss:etc/nfs/nfslog.conf preserve=true
file path=kernel/misc/$(ARCH64)/nfssrv group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/nfssrv group=sys mode=0755
file path=lib/svc/manifest/network/nfs/nfslogd.xml group=sys mode=0444
file path=lib/svc/manifest/network/nfs/rquota.xml group=sys mode=0444
file path=lib/svc/manifest/network/nfs/server.xml group=sys mode=0444
diff --git a/usr/src/pkg/manifests/service-file-system-smb.mf b/usr/src/pkg/manifests/service-file-system-smb.mf
index 2cc02917e3..4b349a26bc 100644
--- a/usr/src/pkg/manifests/service-file-system-smb.mf
+++ b/usr/src/pkg/manifests/service-file-system-smb.mf
@@ -69,14 +69,11 @@ driver name=smbsrv perms="* 0640 root sys"
file path=lib/svc/manifest/network/smb/server.xml group=sys mode=0444
file path=lib/svc/method/svc-smbd mode=0555
file path=usr/kernel/drv/$(ARCH64)/smbsrv group=sys
-$(i386_ONLY)file path=usr/kernel/drv/smbsrv group=sys
file path=usr/kernel/drv/smbsrv.conf group=sys
file path=usr/kernel/kmdb/$(ARCH64)/smbsrv group=sys mode=0555
-$(i386_ONLY)file path=usr/kernel/kmdb/smbsrv group=sys mode=0555
file path=usr/lib/fs/smb/$(ARCH64)/libshare_smb.so.1
file path=usr/lib/fs/smb/libshare_smb.so.1
file path=usr/lib/mdb/kvm/$(ARCH64)/smbsrv.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/smbsrv.so group=sys mode=0555
file path=usr/lib/reparse/libreparse_smb.so.1
file path=usr/lib/security/pam_smb_passwd.so.1
file path=usr/lib/smbsrv/dtrace/smbd-all.d mode=0555
diff --git a/usr/src/pkg/manifests/service-resource-pools.mf b/usr/src/pkg/manifests/service-resource-pools.mf
index a3ba7d20ec..c0fa8e43f2 100644
--- a/usr/src/pkg/manifests/service-resource-pools.mf
+++ b/usr/src/pkg/manifests/service-resource-pools.mf
@@ -63,7 +63,6 @@ file path=lib/svc/method/svc-pools mode=0555 variant.opensolaris.zone=global
file path=usr/bin/poolstat mode=0555
file path=usr/include/pool.h
file path=usr/kernel/drv/$(ARCH64)/pool group=sys
-$(i386_ONLY)file path=usr/kernel/drv/pool group=sys
file path=usr/kernel/drv/pool.conf group=sys
file path=usr/lib/$(ARCH64)/libpool.so.1
file path=usr/lib/$(ARCH64)/llib-lpool.ln
diff --git a/usr/src/pkg/manifests/service-storage-avs-cache-management.mf b/usr/src/pkg/manifests/service-storage-avs-cache-management.mf
index abe1364829..c92b461a39 100644
--- a/usr/src/pkg/manifests/service-storage-avs-cache-management.mf
+++ b/usr/src/pkg/manifests/service-storage-avs-cache-management.mf
@@ -79,8 +79,6 @@ file path=etc/dscfg_format group=sys mode=0744
file path=etc/init.d/scm mode=0744
file path=kernel/kmdb/$(ARCH64)/nsctl group=sys mode=0555
file path=kernel/kmdb/$(ARCH64)/sdbc group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/nsctl group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/sdbc group=sys mode=0555
file path=lib/svc/manifest/system/nws_scm.xml group=sys mode=0444
file path=usr/bin/dsbitmap mode=0555
file path=usr/bin/dscfg mode=0555
@@ -96,23 +94,16 @@ file path=usr/kernel/drv/$(ARCH64)/ncall group=sys
file path=usr/kernel/drv/$(ARCH64)/nsctl group=sys
file path=usr/kernel/drv/$(ARCH64)/nskern group=sys
file path=usr/kernel/drv/$(ARCH64)/sdbc group=sys
-$(i386_ONLY)file path=usr/kernel/drv/ncall group=sys
file path=usr/kernel/drv/ncall.conf group=sys
-$(i386_ONLY)file path=usr/kernel/drv/nsctl group=sys
file path=usr/kernel/drv/nsctl.conf group=sys
-$(i386_ONLY)file path=usr/kernel/drv/nskern group=sys
file path=usr/kernel/drv/nskern.conf group=sys
-$(i386_ONLY)file path=usr/kernel/drv/sdbc group=sys
file path=usr/kernel/drv/sdbc.conf group=sys
file path=usr/kernel/misc/$(ARCH64)/spuni group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/misc/spuni group=sys mode=0755
file path=usr/lib/libdscfg.so.1
file path=usr/lib/libnsctl.so.1
file path=usr/lib/libunistat.so.1
file path=usr/lib/mdb/kvm/$(ARCH64)/nsctl.so group=sys mode=0555
file path=usr/lib/mdb/kvm/$(ARCH64)/sdbc.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/nsctl.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/sdbc.so group=sys mode=0555
file path=usr/share/man/man1m/dsbitmap.1m
file path=usr/share/man/man1m/dscfg.1m
file path=usr/share/man/man1m/dscfgadm.1m
diff --git a/usr/src/pkg/manifests/service-storage-virus-scan.mf b/usr/src/pkg/manifests/service-storage-virus-scan.mf
index 6809740b23..bddd839998 100644
--- a/usr/src/pkg/manifests/service-storage-virus-scan.mf
+++ b/usr/src/pkg/manifests/service-storage-virus-scan.mf
@@ -46,7 +46,6 @@ dir path=usr/sbin
dir path=usr/share/man/man1m
driver name=vscan perms="* 0640 root sys"
file path=kernel/drv/$(ARCH64)/vscan group=sys
-$(i386_ONLY)file path=kernel/drv/vscan group=sys
file path=kernel/drv/vscan.conf group=sys
file path=lib/svc/manifest/system/filesystem/vscan.xml group=sys mode=0444
file path=usr/lib/devfsadm/linkmod/SUNW_vscan_link.so group=sys
diff --git a/usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf b/usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf
index f3b55e3b04..a1c40ee323 100644
--- a/usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf
+++ b/usr/src/pkg/manifests/storage-avs-point-in-time-copy.mf
@@ -70,7 +70,6 @@ driver name=ii devlink=type=ddi_pseudo;name=ii\t\D perms="* 0666 root sys" \
file path=etc/init.d/ii mode=0744
file path=etc/init.d/ii.cluster mode=0744
file path=kernel/kmdb/$(ARCH64)/ii group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/ii group=sys mode=0555
file path=lib/svc/manifest/system/nws_ii.xml group=sys mode=0444
file path=usr/bin/iiadm mode=0555
file path=usr/bin/iiboot mode=0555
@@ -78,11 +77,9 @@ file path=usr/bin/iicpbmp mode=0555
file path=usr/bin/iicpshd mode=0555
file path=usr/cluster/sbin/ii mode=0744
file path=usr/kernel/drv/$(ARCH64)/ii group=sys
-$(i386_ONLY)file path=usr/kernel/drv/ii group=sys
file path=usr/kernel/drv/ii.conf group=sys \
original_name=SUNWii:usr/kernel/drv/ii.conf preserve=true
file path=usr/lib/mdb/kvm/$(ARCH64)/ii.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/ii.so group=sys mode=0555
file path=usr/share/man/man1m/iiadm.1m
file path=usr/share/man/man1m/iicpbmp.1m
file path=usr/share/man/man1m/iicpshd.1m
diff --git a/usr/src/pkg/manifests/storage-avs-remote-mirror.mf b/usr/src/pkg/manifests/storage-avs-remote-mirror.mf
index f89a81bb6c..adbf53c0bf 100644
--- a/usr/src/pkg/manifests/storage-avs-remote-mirror.mf
+++ b/usr/src/pkg/manifests/storage-avs-remote-mirror.mf
@@ -73,7 +73,6 @@ file path=etc/init.d/rdc mode=0744
file path=etc/init.d/rdc.cluster mode=0744
file path=etc/init.d/rdcfinish mode=0744
file path=kernel/kmdb/$(ARCH64)/rdc group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/rdc group=sys mode=0555
file path=lib/svc/manifest/system/nws_rdc.xml group=sys mode=0444
file path=lib/svc/manifest/system/nws_rdcsyncd.xml group=sys mode=0444
file path=usr/bin/sndradm mode=0555
@@ -84,14 +83,10 @@ file path=usr/cluster/sbin/rdc mode=0744
file path=usr/kernel/drv/$(ARCH64)/rdc group=sys
file path=usr/kernel/drv/$(ARCH64)/rdcsrv group=sys
file path=usr/kernel/drv/$(ARCH64)/rdcstub group=sys
-$(i386_ONLY)file path=usr/kernel/drv/rdc group=sys
file path=usr/kernel/drv/rdc.conf group=sys \
original_name=SUNWrdc:usr/kernel/drv/rdc.conf preserve=true
-$(i386_ONLY)file path=usr/kernel/drv/rdcsrv group=sys
-$(i386_ONLY)file path=usr/kernel/drv/rdcstub group=sys
file path=usr/lib/librdc.so.1
file path=usr/lib/mdb/kvm/$(ARCH64)/rdc.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/rdc.so group=sys mode=0555
file path=usr/share/man/man1m/sndradm.1m
file path=usr/share/man/man1m/sndrd.1m
file path=usr/share/man/man1m/sndrsyncd.1m
@@ -103,8 +98,6 @@ hardlink path=usr/kernel/misc/$(ARCH64)/rdcsrv \
target=../../drv/$(ARCH64)/rdcsrv
hardlink path=usr/kernel/misc/$(ARCH64)/rdcstub \
target=../../drv/$(ARCH64)/rdcstub
-$(i386_ONLY)hardlink path=usr/kernel/misc/rdcsrv target=../drv/rdcsrv
-$(i386_ONLY)hardlink path=usr/kernel/misc/rdcstub target=../drv/rdcstub
hardlink path=usr/lib/sndrd target=../bin/sndrd
hardlink path=usr/lib/sndrsyncd target=../bin/sndrsyncd
hardlink path=usr/sbin/sndradm target=../bin/sndradm
diff --git a/usr/src/pkg/manifests/storage-stmf.mf b/usr/src/pkg/manifests/storage-stmf.mf
index a3035370cd..f8aa612d63 100644
--- a/usr/src/pkg/manifests/storage-stmf.mf
+++ b/usr/src/pkg/manifests/storage-stmf.mf
@@ -67,20 +67,13 @@ file path=kernel/drv/$(ARCH64)/pppt group=sys
file path=kernel/drv/$(ARCH64)/qlt group=sys
file path=kernel/drv/$(ARCH64)/stmf group=sys
file path=kernel/drv/$(ARCH64)/stmf_sbd group=sys
-$(i386_ONLY)file path=kernel/drv/fct group=sys
file path=kernel/drv/fct.conf group=sys
-$(i386_ONLY)file path=kernel/drv/pppt group=sys
file path=kernel/drv/pppt.conf group=sys
-$(i386_ONLY)file path=kernel/drv/qlt group=sys
file path=kernel/drv/qlt.conf group=sys
-$(i386_ONLY)file path=kernel/drv/stmf group=sys
file path=kernel/drv/stmf.conf group=sys
-$(i386_ONLY)file path=kernel/drv/stmf_sbd group=sys
file path=kernel/drv/stmf_sbd.conf group=sys
file path=kernel/kmdb/$(ARCH64)/stmf group=sys mode=0555
file path=kernel/kmdb/$(ARCH64)/stmf_sbd group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/stmf group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/stmf_sbd group=sys mode=0555
file path=lib/svc/manifest/system/stmf.xml group=sys mode=0444 \
variant.opensolaris.zone=global
file path=lib/svc/method/svc-stmf mode=0555 variant.opensolaris.zone=global
@@ -106,8 +99,6 @@ file path=usr/lib/llib-lstmf
file path=usr/lib/llib-lstmf.ln
file path=usr/lib/mdb/kvm/$(ARCH64)/stmf.so group=sys mode=0555
file path=usr/lib/mdb/kvm/$(ARCH64)/stmf_sbd.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/stmf.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/stmf_sbd.so group=sys mode=0555
file path=usr/sbin/sbdadm mode=0555
file path=usr/sbin/stmfadm mode=0555
file path=usr/share/man/man1m/sbdadm.1m
diff --git a/usr/src/pkg/manifests/system-file-system-nfs.mf b/usr/src/pkg/manifests/system-file-system-nfs.mf
index 345be4c93a..ab6330f834 100644
--- a/usr/src/pkg/manifests/system-file-system-nfs.mf
+++ b/usr/src/pkg/manifests/system-file-system-nfs.mf
@@ -67,13 +67,9 @@ file path=etc/fs/nfs/mount mode=0555
file path=etc/nfssec.conf group=sys original_name=SUNWnfsc:etc/nfssec.conf \
preserve=true
file path=kernel/fs/$(ARCH64)/nfs group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/nfs group=sys mode=0755
file path=kernel/misc/$(ARCH64)/klmmod group=sys mode=0755
file path=kernel/misc/$(ARCH64)/klmops group=sys mode=0755
file path=kernel/misc/$(ARCH64)/nfs_dlboot group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/klmmod group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/klmops group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/nfs_dlboot group=sys mode=0755
file path=lib/svc/manifest/network/nfs/cbd.xml group=sys mode=0444
file path=lib/svc/manifest/network/nfs/client.xml group=sys mode=0444
file path=lib/svc/manifest/network/nfs/mapid.xml group=sys mode=0444
@@ -104,7 +100,6 @@ file path=usr/share/man/man4/nfs.4
file path=usr/share/man/man4/nfssec.conf.4
group groupname=unknown gid=96
hardlink path=kernel/sys/$(ARCH64)/nfs target=../../../kernel/fs/$(ARCH64)/nfs
-$(i386_ONLY)hardlink path=kernel/sys/nfs target=../../kernel/fs/nfs
legacy pkg=SUNWnfsckr \
desc="Network File System (NFS) client kernel support (Root)" \
name="Network File System (NFS) client kernel support (Root)"
diff --git a/usr/src/pkg/manifests/system-file-system-smb.mf b/usr/src/pkg/manifests/system-file-system-smb.mf
index 46504c21bd..b68191317a 100644
--- a/usr/src/pkg/manifests/system-file-system-smb.mf
+++ b/usr/src/pkg/manifests/system-file-system-smb.mf
@@ -67,14 +67,10 @@ file path=lib/svc/manifest/network/smb/client.xml group=sys mode=0444
file path=lib/svc/method/smb-client mode=0555
file path=usr/bin/smbutil mode=0555
file path=usr/kernel/drv/$(ARCH64)/nsmb group=sys
-$(i386_ONLY)file path=usr/kernel/drv/nsmb group=sys
file path=usr/kernel/drv/nsmb.conf group=sys
file path=usr/kernel/fs/$(ARCH64)/smbfs group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/fs/smbfs group=sys mode=0755
file path=usr/kernel/kmdb/$(ARCH64)/nsmb group=sys mode=0555
file path=usr/kernel/kmdb/$(ARCH64)/smbfs group=sys mode=0555
-$(i386_ONLY)file path=usr/kernel/kmdb/nsmb group=sys mode=0555
-$(i386_ONLY)file path=usr/kernel/kmdb/smbfs group=sys mode=0555
file path=usr/lib/$(ARCH64)/libsmbfs.so.1
file path=usr/lib/fs/smbfs/$(ARCH64)/libshare_smbfs.so.1
file path=usr/lib/fs/smbfs/dfshares mode=0555
@@ -86,8 +82,6 @@ file path=usr/lib/fs/smbfs/unshare mode=0555
file path=usr/lib/libsmbfs.so.1
file path=usr/lib/mdb/kvm/$(ARCH64)/nsmb.so mode=0555
file path=usr/lib/mdb/kvm/$(ARCH64)/smbfs.so mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/nsmb.so mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/smbfs.so mode=0555
file path=usr/lib/security/$(ARCH64)/pam_smbfs_login.so.1
file path=usr/lib/security/pam_smbfs_login.so.1
file path=usr/lib/smbfs/smbiod mode=0555
diff --git a/usr/src/pkg/manifests/system-file-system-udfs.mf b/usr/src/pkg/manifests/system-file-system-udfs.mf
index b07d5fcfc4..eb64c94fc0 100644
--- a/usr/src/pkg/manifests/system-file-system-udfs.mf
+++ b/usr/src/pkg/manifests/system-file-system-udfs.mf
@@ -39,7 +39,6 @@ dir path=usr/share/man
dir path=usr/share/man/man1m
dir path=usr/share/man/man7fs
file path=kernel/fs/$(ARCH64)/udfs group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/udfs group=sys mode=0755
file path=usr/lib/fs/udfs/fsck mode=0555
file path=usr/lib/fs/udfs/fsdb mode=0555
file path=usr/lib/fs/udfs/fstyp.so.1 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 43ec74d44f..4e2b5f1add 100644
--- a/usr/src/pkg/manifests/system-file-system-zfs-tests.mf
+++ b/usr/src/pkg/manifests/system-file-system-zfs-tests.mf
@@ -48,7 +48,6 @@ $(i386_ONLY)dir path=usr/sbin/$(ARCH32)
dir path=usr/sbin/$(ARCH64)
driver name=zut perms="* 0666 root sys"
file path=kernel/drv/$(ARCH64)/zut group=sys
-$(i386_ONLY)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
diff --git a/usr/src/pkg/manifests/system-file-system-zfs.mf b/usr/src/pkg/manifests/system-file-system-zfs.mf
index cbe4e4858e..ea76ef54bb 100644
--- a/usr/src/pkg/manifests/system-file-system-zfs.mf
+++ b/usr/src/pkg/manifests/system-file-system-zfs.mf
@@ -81,10 +81,8 @@ file \
path=etc/sysevent/config/SUNW,EC_zfs,ESC_ZFS_bootfs_vdev_attach,sysevent.conf \
group=sys
file path=kernel/drv/$(ARCH64)/zfs group=sys
-$(i386_ONLY)file path=kernel/drv/zfs group=sys
file path=kernel/drv/zfs.conf group=sys
file path=kernel/kmdb/$(ARCH64)/zfs group=sys mode=0555
-$(i386_ONLY)file path=kernel/kmdb/zfs group=sys mode=0555
file path=lib/$(ARCH64)/libzfs.so.1
file path=lib/$(ARCH64)/libzfs_core.so.1
file path=lib/$(ARCH64)/llib-lzfs.ln
@@ -105,7 +103,6 @@ file path=usr/lib/fs/zfs/fstyp.so.1 mode=0555
file path=usr/lib/libzfs_jni.so.1
$(i386_ONLY)file path=usr/lib/libzpool.so.1
file path=usr/lib/mdb/kvm/$(ARCH64)/zfs.so group=sys mode=0555
-$(i386_ONLY)file path=usr/lib/mdb/kvm/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/python$(PYTHON_VERSION)/vendor-packages/zfs/__init__.py
@@ -141,7 +138,6 @@ file path=usr/share/man/man1m/zpool.1m
file path=usr/share/man/man1m/zstreamdump.1m
file path=usr/share/man/man5/zpool-features.5
hardlink path=kernel/fs/$(ARCH64)/zfs target=../../../kernel/drv/$(ARCH64)/zfs
-$(i386_ONLY)hardlink path=kernel/fs/zfs target=../../kernel/drv/zfs
hardlink path=usr/lib/fs/zfs/fstyp target=../../../sbin/fstyp
hardlink path=usr/sbin/zdb target=../../usr/lib/isaexec
legacy pkg=SUNWzfskr desc="ZFS kernel root components" \
diff --git a/usr/src/pkg/manifests/system-io-tests.mf b/usr/src/pkg/manifests/system-io-tests.mf
index 8035c0b117..68d0a51b1a 100644
--- a/usr/src/pkg/manifests/system-io-tests.mf
+++ b/usr/src/pkg/manifests/system-io-tests.mf
@@ -48,14 +48,8 @@ file path=usr/kernel/drv/$(ARCH64)/pshot group=sys
file path=usr/kernel/drv/$(ARCH64)/tclient group=sys
file path=usr/kernel/drv/$(ARCH64)/tphci group=sys
file path=usr/kernel/drv/$(ARCH64)/tvhci group=sys
-$(i386_ONLY)file path=usr/kernel/drv/emul64 group=sys
file path=usr/kernel/drv/emul64.conf group=sys
-$(i386_ONLY)file path=usr/kernel/drv/gen_drv group=sys
-$(i386_ONLY)file path=usr/kernel/drv/pshot group=sys
file path=usr/kernel/drv/pshot.conf group=sys
-$(i386_ONLY)file path=usr/kernel/drv/tclient group=sys
-$(i386_ONLY)file path=usr/kernel/drv/tphci group=sys
-$(i386_ONLY)file path=usr/kernel/drv/tvhci group=sys
file path=usr/lib/scsi/sestopo mode=0555
file path=usr/lib/scsi/smp mode=0555
file path=usr/sbin/devctl mode=0555
diff --git a/usr/src/pkg/manifests/system-kernel-cpu-counters.mf b/usr/src/pkg/manifests/system-kernel-cpu-counters.mf
index 9c3538809a..95aa7a32e6 100644
--- a/usr/src/pkg/manifests/system-kernel-cpu-counters.mf
+++ b/usr/src/pkg/manifests/system-kernel-cpu-counters.mf
@@ -55,7 +55,6 @@ $(sparc_ONLY)dir path=platform/sun4v/kernel/sys group=sys
$(sparc_ONLY)dir path=platform/sun4v/kernel/sys/$(ARCH64) group=sys
driver name=cpc perms="shared 0666 root sys"
$(i386_ONLY)file path=platform/i86pc/kernel/drv/$(ARCH64)/cpc group=sys
-$(i386_ONLY)file path=platform/i86pc/kernel/drv/cpc group=sys
$(i386_ONLY)file path=platform/i86pc/kernel/drv/cpc.conf group=sys
$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/cpc group=sys
$(sparc_ONLY)file path=platform/sun4u/kernel/drv/cpc.conf group=sys
@@ -63,7 +62,6 @@ $(sparc_ONLY)file path=platform/sun4v/kernel/drv/$(ARCH64)/cpc group=sys
$(sparc_ONLY)file path=platform/sun4v/kernel/drv/cpc.conf group=sys
$(i386_ONLY)hardlink path=platform/i86pc/kernel/sys/$(ARCH64)/cpc \
target=../../drv/$(ARCH64)/cpc
-$(i386_ONLY)hardlink path=platform/i86pc/kernel/sys/cpc target=../drv/cpc
$(sparc_ONLY)hardlink path=platform/sun4u/kernel/sys/$(ARCH64)/cpc \
target=../../drv/$(ARCH64)/cpc
$(sparc_ONLY)hardlink path=platform/sun4v/kernel/sys/$(ARCH64)/cpc \
diff --git a/usr/src/pkg/manifests/system-kernel-dtrace-providers-xdt.mf b/usr/src/pkg/manifests/system-kernel-dtrace-providers-xdt.mf
index 04e8ef3346..8a8fd7c420 100644
--- a/usr/src/pkg/manifests/system-kernel-dtrace-providers-xdt.mf
+++ b/usr/src/pkg/manifests/system-kernel-dtrace-providers-xdt.mf
@@ -43,7 +43,6 @@ dir path=platform/i86xpv/kernel/drv group=sys
dir path=platform/i86xpv/kernel/drv/$(ARCH64) group=sys
driver name=xdt
file path=platform/i86xpv/kernel/drv/$(ARCH64)/xdt group=sys
-file path=platform/i86xpv/kernel/drv/xdt group=sys
file path=platform/i86xpv/kernel/drv/xdt.conf group=sys
legacy pkg=SUNWxdt \
desc="DTrace provider for tracing events in the xVM hypervisor" \
diff --git a/usr/src/pkg/manifests/system-kernel-dtrace-providers.mf b/usr/src/pkg/manifests/system-kernel-dtrace-providers.mf
index e68c4e511f..79dd5bc72b 100644
--- a/usr/src/pkg/manifests/system-kernel-dtrace-providers.mf
+++ b/usr/src/pkg/manifests/system-kernel-dtrace-providers.mf
@@ -58,21 +58,13 @@ file path=kernel/drv/$(ARCH64)/lockstat group=sys
file path=kernel/drv/$(ARCH64)/profile group=sys
file path=kernel/drv/$(ARCH64)/sdt group=sys
file path=kernel/drv/$(ARCH64)/systrace group=sys
-$(i386_ONLY)file path=kernel/drv/dcpc group=sys
file path=kernel/drv/dcpc.conf group=sys
-$(i386_ONLY)file path=kernel/drv/dtrace group=sys
file path=kernel/drv/dtrace.conf group=sys
-$(i386_ONLY)file path=kernel/drv/fasttrap group=sys
file path=kernel/drv/fasttrap.conf group=sys
-$(i386_ONLY)file path=kernel/drv/fbt group=sys
file path=kernel/drv/fbt.conf group=sys
-$(i386_ONLY)file path=kernel/drv/lockstat group=sys
file path=kernel/drv/lockstat.conf group=sys
-$(i386_ONLY)file path=kernel/drv/profile group=sys
file path=kernel/drv/profile.conf group=sys
-$(i386_ONLY)file path=kernel/drv/sdt group=sys
file path=kernel/drv/sdt.conf group=sys
-$(i386_ONLY)file path=kernel/drv/systrace group=sys
file path=kernel/drv/systrace.conf group=sys
file path=usr/share/man/man7d/dtrace.7d
file path=usr/share/man/man7d/fasttrap.7d
@@ -95,17 +87,6 @@ hardlink path=kernel/dtrace/$(ARCH64)/sdt \
target=../../../kernel/drv/$(ARCH64)/sdt
hardlink path=kernel/dtrace/$(ARCH64)/systrace \
target=../../../kernel/drv/$(ARCH64)/systrace
-$(i386_ONLY)hardlink path=kernel/dtrace/dcpc target=../../kernel/drv/dcpc
-$(i386_ONLY)hardlink path=kernel/dtrace/fasttrap \
- target=../../kernel/drv/fasttrap
-$(i386_ONLY)hardlink path=kernel/dtrace/fbt target=../../kernel/drv/fbt
-$(i386_ONLY)hardlink path=kernel/dtrace/lockstat \
- target=../../kernel/drv/lockstat
-$(i386_ONLY)hardlink path=kernel/dtrace/profile \
- target=../../kernel/drv/profile
-$(i386_ONLY)hardlink path=kernel/dtrace/sdt target=../../kernel/drv/sdt
-$(i386_ONLY)hardlink path=kernel/dtrace/systrace \
- target=../../kernel/drv/systrace
legacy pkg=SUNWdtrp desc="Dynamic Tracing (DTrace) Providers" \
name="DTrace Providers"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/system-kernel-platform.mf b/usr/src/pkg/manifests/system-kernel-platform.mf
index ccaa252a95..0885299c2b 100644
--- a/usr/src/pkg/manifests/system-kernel-platform.mf
+++ b/usr/src/pkg/manifests/system-kernel-platform.mf
@@ -822,20 +822,8 @@ $(i386_ONLY)file path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu_ms.GenuineIntel \
$(i386_ONLY)file \
path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu_ms.GenuineIntel.6.46 \
group=sys mode=0755
-$(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/cpu/cpu_ms.GenuineIntel.6.46 \
- group=sys mode=0755
$(i386_ONLY)file path=platform/i86pc/kernel/dacf/$(ARCH64)/consconfig_dacf \
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/$(ARCH64)/acpinex group=sys
$(i386_ONLY)file path=platform/i86pc/kernel/drv/$(ARCH64)/acpippm group=sys
$(i386_ONLY)file path=platform/i86pc/kernel/drv/$(ARCH64)/amd_iommu group=sys
@@ -846,20 +834,10 @@ $(i386_ONLY)file path=platform/i86pc/kernel/drv/$(ARCH64)/pci group=sys
$(i386_ONLY)file path=platform/i86pc/kernel/drv/$(ARCH64)/pit_beep group=sys
$(i386_ONLY)file path=platform/i86pc/kernel/drv/$(ARCH64)/ppm group=sys
$(i386_ONLY)file path=platform/i86pc/kernel/drv/$(ARCH64)/rootnex group=sys
-$(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/$(ARCH64)/apix group=sys \
mode=0755
@@ -867,19 +845,10 @@ $(i386_ONLY)file path=platform/i86pc/kernel/mach/$(ARCH64)/pcplusmp group=sys \
mode=0755
$(i386_ONLY)file path=platform/i86pc/kernel/mach/$(ARCH64)/uppc group=sys \
mode=0755
-$(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/$(ARCH64)/acpidev group=sys \
mode=0755
$(i386_ONLY)file path=platform/i86pc/kernel/misc/$(ARCH64)/gfx_private \
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/kernel/unix group=sys mode=0755
-$(i386_ONLY)file path=platform/i86pc/multiboot group=sys mode=0755 \
- reboot-needed=true
$(i386_ONLY)file path=platform/i86pc/ucode/amd-ucode.bin group=sys mode=0444 \
original_name=SUNWcakr:platform/i86pc/ucode/amd-ucode.bin preserve=true \
reboot-needed=true
@@ -897,18 +866,8 @@ $(i386_ONLY)file \
group=sys mode=0755
$(i386_ONLY)file path=platform/i86xpv/kernel/cpu/$(ARCH64)/cpu_ms.GenuineIntel \
group=sys mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/cpu/cpu.generic group=sys \
- mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/cpu/cpu_ms.AuthenticAMD group=sys \
- mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/cpu/cpu_ms.AuthenticAMD.15 \
- group=sys mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/cpu/cpu_ms.GenuineIntel group=sys \
- mode=0755
$(i386_ONLY)file path=platform/i86xpv/kernel/dacf/$(ARCH64)/consconfig_dacf \
group=sys mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/dacf/consconfig_dacf group=sys \
- mode=0755
$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/balloon group=sys
$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/domcaps group=sys
$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/evtchn group=sys
@@ -928,42 +887,20 @@ $(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/xnbu group=sys
$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/xnf group=sys
$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/xpvd group=sys
$(i386_ONLY)file path=platform/i86xpv/kernel/drv/$(ARCH64)/xpvtap group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/balloon group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/domcaps group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/evtchn group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/isa group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/npe group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/pci group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/pit_beep group=sys
$(i386_ONLY)file path=platform/i86xpv/kernel/drv/pit_beep.conf group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/privcmd group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/rootnex group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/xdf group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/xenbus group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/xencons group=sys
$(i386_ONLY)file path=platform/i86xpv/kernel/drv/xencons.conf group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/xnf group=sys
-$(i386_ONLY)file path=platform/i86xpv/kernel/drv/xpvd group=sys
$(i386_ONLY)file path=platform/i86xpv/kernel/mach/$(ARCH64)/xpv_psm group=sys \
mode=0755
$(i386_ONLY)file path=platform/i86xpv/kernel/mach/$(ARCH64)/xpv_uppc group=sys \
mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/mach/xpv_psm group=sys mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/mach/xpv_uppc group=sys mode=0755
$(i386_ONLY)file path=platform/i86xpv/kernel/misc/$(ARCH64)/gfx_private \
group=sys mode=0755
$(i386_ONLY)file path=platform/i86xpv/kernel/misc/$(ARCH64)/xnb group=sys \
mode=0755
$(i386_ONLY)file path=platform/i86xpv/kernel/misc/$(ARCH64)/xpv_autoconfig \
group=sys mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/misc/gfx_private group=sys \
- mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/misc/xpv_autoconfig group=sys \
- mode=0755
$(i386_ONLY)file path=platform/i86xpv/kernel/tod/$(ARCH64)/xpvtod group=sys \
mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/tod/xpvtod group=sys mode=0755
-$(i386_ONLY)file path=platform/i86xpv/kernel/unix group=sys mode=0755
$(sparc_ONLY)file path=platform/sun4u-us3/kernel/crypto/$(ARCH64)/aes \
group=sys mode=0755
$(sparc_ONLY)file path=platform/sun4u/bootlst group=sys reboot-needed=true
@@ -1180,8 +1117,6 @@ $(sparc_ONLY)file path=usr/share/man/man7m/kb.7m
$(i386_ONLY)hardlink \
path=platform/i86pc/kernel/cpu/$(ARCH64)/cpu_ms.GenuineIntel.6.47 \
target=cpu_ms.GenuineIntel.6.46
-$(i386_ONLY)hardlink path=platform/i86pc/kernel/cpu/cpu_ms.GenuineIntel.6.47 \
- target=cpu_ms.GenuineIntel.6.46
$(sparc_ONLY)hardlink path=platform/sun4u/kernel/misc/$(ARCH64)/md5 \
target=../../../kernel/crypto/$(ARCH64)/md5
$(sparc_ONLY)hardlink path=platform/sun4u/kernel/misc/$(ARCH64)/sha1 \
diff --git a/usr/src/pkg/manifests/system-kernel-power.mf b/usr/src/pkg/manifests/system-kernel-power.mf
index 0de41f886d..695ab19399 100644
--- a/usr/src/pkg/manifests/system-kernel-power.mf
+++ b/usr/src/pkg/manifests/system-kernel-power.mf
@@ -63,7 +63,6 @@ file path=lib/svc/manifest/system/power.xml group=sys mode=0444
file path=lib/svc/method/svc-power mode=0555
file path=usr/bin/sys-suspend mode=4555
file path=usr/kernel/drv/$(ARCH64)/pm group=sys
-$(i386_ONLY)file path=usr/kernel/drv/pm group=sys
file path=usr/kernel/drv/pm.conf group=sys
file path=usr/lib/power/powerd mode=0555
file path=usr/sbin/pmconfig mode=4555
diff --git a/usr/src/pkg/manifests/system-kernel-rsmops.mf b/usr/src/pkg/manifests/system-kernel-rsmops.mf
index 672be3d28e..9a3c240318 100644
--- a/usr/src/pkg/manifests/system-kernel-rsmops.mf
+++ b/usr/src/pkg/manifests/system-kernel-rsmops.mf
@@ -40,7 +40,6 @@ dir path=kernel group=sys
dir path=kernel/misc group=sys
dir path=kernel/misc/$(ARCH64) group=sys
file path=kernel/misc/$(ARCH64)/rsmops group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/rsmops group=sys mode=0755
legacy pkg=SUNWrsmo \
desc="Support for network specific implementations of RSMPI" \
name="RSMPI Operations Registration Module"
diff --git a/usr/src/pkg/manifests/system-kernel-secure-rpc.mf b/usr/src/pkg/manifests/system-kernel-secure-rpc.mf
index c08d11f4af..37f2e0f7c1 100644
--- a/usr/src/pkg/manifests/system-kernel-secure-rpc.mf
+++ b/usr/src/pkg/manifests/system-kernel-secure-rpc.mf
@@ -38,7 +38,6 @@ dir path=kernel group=sys
dir path=kernel/misc group=sys
dir path=kernel/misc/$(ARCH64) group=sys
file path=kernel/misc/$(ARCH64)/rpcsec_gss group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/rpcsec_gss group=sys mode=0755
legacy pkg=SUNWrsgk desc="kernel GSS-API services for ONC RPC" \
name="kernel RPCSEC_GSS"
license cr_Sun license=cr_Sun
diff --git a/usr/src/pkg/manifests/system-kernel-security-gss.mf b/usr/src/pkg/manifests/system-kernel-security-gss.mf
index 9a2fe74b33..6d89a9d85b 100644
--- a/usr/src/pkg/manifests/system-kernel-security-gss.mf
+++ b/usr/src/pkg/manifests/system-kernel-security-gss.mf
@@ -43,8 +43,6 @@ dir path=kernel/misc/kgss group=sys
dir path=kernel/misc/kgss/$(ARCH64) group=sys
file path=kernel/misc/$(ARCH64)/kgssapi group=sys mode=0755
file path=kernel/misc/kgss/$(ARCH64)/kmech_krb5 group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/kgss/kmech_krb5 group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/kgssapi group=sys mode=0755
legacy pkg=SUNWgssk \
desc="Generic Security Service Application Program Interface, Version 2 - kernel" \
name="kernel GSSAPI V2"
diff --git a/usr/src/pkg/manifests/system-kernel-suspend-resume.mf b/usr/src/pkg/manifests/system-kernel-suspend-resume.mf
index bf1062e354..75049d64a0 100644
--- a/usr/src/pkg/manifests/system-kernel-suspend-resume.mf
+++ b/usr/src/pkg/manifests/system-kernel-suspend-resume.mf
@@ -53,11 +53,9 @@ dir path=usr/share/man
dir path=usr/share/man/man7
$(i386_ONLY)driver name=srn
$(i386_ONLY)file path=kernel/drv/$(ARCH64)/srn group=sys
-$(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/$(ARCH64)/cpr group=sys \
mode=0755
-$(i386_ONLY)file path=platform/i86pc/kernel/misc/cpr group=sys mode=0755
$(sparc_ONLY)file path=platform/sun4u/cprboot group=sys reboot-needed=true
$(sparc_ONLY)file path=platform/sun4u/kernel/drv/$(ARCH64)/tod group=sys
$(sparc_ONLY)file path=platform/sun4u/kernel/drv/tod.conf group=sys
diff --git a/usr/src/pkg/manifests/system-kernel.mf b/usr/src/pkg/manifests/system-kernel.mf
index cd1e6ed5ab..d9b0c02702 100644
--- a/usr/src/pkg/manifests/system-kernel.mf
+++ b/usr/src/pkg/manifests/system-kernel.mf
@@ -322,23 +322,9 @@ file path=kernel/crypto/$(ARCH64)/sha1 group=sys mode=0755
file path=kernel/crypto/$(ARCH64)/sha2 group=sys mode=0755
file path=kernel/crypto/$(ARCH64)/skein group=sys mode=0755
file path=kernel/crypto/$(ARCH64)/swrand group=sys mode=0755
-$(i386_ONLY)file path=kernel/crypto/aes group=sys mode=0755
-$(i386_ONLY)file path=kernel/crypto/arcfour group=sys mode=0755
-$(i386_ONLY)file path=kernel/crypto/blowfish group=sys mode=0755
-$(i386_ONLY)file path=kernel/crypto/des group=sys mode=0755
-$(i386_ONLY)file path=kernel/crypto/ecc group=sys mode=0755
-$(i386_ONLY)file path=kernel/crypto/edonr group=sys mode=0755
-$(i386_ONLY)file path=kernel/crypto/md4 group=sys mode=0755
-$(i386_ONLY)file path=kernel/crypto/md5 group=sys mode=0755
-$(i386_ONLY)file path=kernel/crypto/rsa group=sys mode=0755
-$(i386_ONLY)file path=kernel/crypto/sha1 group=sys mode=0755
-$(i386_ONLY)file path=kernel/crypto/sha2 group=sys mode=0755
-$(i386_ONLY)file path=kernel/crypto/skein group=sys mode=0755
-$(i386_ONLY)file path=kernel/crypto/swrand group=sys mode=0755
$(sparc_ONLY)file path=kernel/dacf/$(ARCH64)/consconfig_dacf group=sys \
mode=0755
file path=kernel/dacf/$(ARCH64)/net_dacf group=sys mode=0755
-$(i386_ONLY)file path=kernel/dacf/net_dacf group=sys mode=0755
$(i386_ONLY)file path=kernel/drv/$(ARCH64)/acpi_drv group=sys
$(i386_ONLY)file path=kernel/drv/$(ARCH64)/acpi_toshiba group=sys
file path=kernel/drv/$(ARCH64)/aggr group=sys
@@ -423,174 +409,92 @@ file path=kernel/drv/$(ARCH64)/udp6 group=sys
$(i386_ONLY)file path=kernel/drv/$(ARCH64)/vgatext group=sys
file path=kernel/drv/$(ARCH64)/vnic group=sys
file path=kernel/drv/$(ARCH64)/wc group=sys
-$(i386_ONLY)file path=kernel/drv/acpi_drv group=sys
$(i386_ONLY)file path=kernel/drv/acpi_drv.conf group=sys
-$(i386_ONLY)file path=kernel/drv/acpi_toshiba group=sys
-$(i386_ONLY)file path=kernel/drv/aggr group=sys
file path=kernel/drv/aggr.conf group=sys
-$(i386_ONLY)file path=kernel/drv/arp group=sys
file path=kernel/drv/arp.conf group=sys
-$(i386_ONLY)file path=kernel/drv/bl group=sys
file path=kernel/drv/bl.conf group=sys
-$(i386_ONLY)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
-$(i386_ONLY)file path=kernel/drv/clone group=sys
file path=kernel/drv/clone.conf group=sys
-$(i386_ONLY)file path=kernel/drv/cn group=sys
file path=kernel/drv/cn.conf group=sys
-$(i386_ONLY)file path=kernel/drv/conskbd group=sys
file path=kernel/drv/conskbd.conf group=sys
-$(i386_ONLY)file path=kernel/drv/consms group=sys
file path=kernel/drv/consms.conf group=sys
-$(i386_ONLY)file path=kernel/drv/cpuid group=sys
file path=kernel/drv/cpuid.conf group=sys
-$(i386_ONLY)file path=kernel/drv/cpunex group=sys
-$(i386_ONLY)file path=kernel/drv/crypto group=sys
file path=kernel/drv/crypto.conf group=sys
-$(i386_ONLY)file path=kernel/drv/cryptoadm group=sys
file path=kernel/drv/cryptoadm.conf group=sys
$(sparc_ONLY)file path=kernel/drv/dad.conf group=sys
-$(i386_ONLY)file path=kernel/drv/devinfo group=sys
file path=kernel/drv/devinfo.conf group=sys
-$(i386_ONLY)file path=kernel/drv/dld group=sys
file path=kernel/drv/dld.conf group=sys
-$(i386_ONLY)file path=kernel/drv/dlpistub group=sys
file path=kernel/drv/dlpistub.conf group=sys
-$(i386_ONLY)file path=kernel/drv/i8042 group=sys
-$(i386_ONLY)file path=kernel/drv/icmp group=sys
file path=kernel/drv/icmp.conf group=sys
-$(i386_ONLY)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
-$(i386_ONLY)file path=kernel/drv/intel_nhmex group=sys
$(i386_ONLY)file path=kernel/drv/intel_nhmex.conf group=sys
-$(i386_ONLY)file path=kernel/drv/ip group=sys
file path=kernel/drv/ip.conf group=sys
-$(i386_ONLY)file path=kernel/drv/ip6 group=sys
file path=kernel/drv/ip6.conf group=sys
-$(i386_ONLY)file path=kernel/drv/ipnet group=sys
file path=kernel/drv/ipnet.conf group=sys
-$(i386_ONLY)file path=kernel/drv/ippctl group=sys
file path=kernel/drv/ippctl.conf group=sys
-$(i386_ONLY)file path=kernel/drv/ipsecah group=sys
file path=kernel/drv/ipsecah.conf group=sys
-$(i386_ONLY)file path=kernel/drv/ipsecesp group=sys
file path=kernel/drv/ipsecesp.conf group=sys
-$(i386_ONLY)file path=kernel/drv/iptun group=sys
file path=kernel/drv/iptun.conf group=sys
-$(i386_ONLY)file path=kernel/drv/iwscn group=sys
file path=kernel/drv/iwscn.conf group=sys
-$(i386_ONLY)file path=kernel/drv/kb8042 group=sys
-$(i386_ONLY)file path=kernel/drv/keysock group=sys
file path=kernel/drv/keysock.conf group=sys
-$(i386_ONLY)file path=kernel/drv/kmdb group=sys
file path=kernel/drv/kmdb.conf group=sys
-$(i386_ONLY)file path=kernel/drv/kssl group=sys
file path=kernel/drv/kssl.conf group=sys
-$(i386_ONLY)file path=kernel/drv/llc1 group=sys
file path=kernel/drv/llc1.conf group=sys
-$(i386_ONLY)file path=kernel/drv/lofi group=sys
file path=kernel/drv/lofi.conf group=sys
-$(i386_ONLY)file path=kernel/drv/log group=sys
file path=kernel/drv/log.conf group=sys \
original_name=SUNWckr:kernel/drv/log.conf preserve=true
-$(i386_ONLY)file path=kernel/drv/mc-amd group=sys
$(i386_ONLY)file path=kernel/drv/mc-amd.conf group=sys
-$(i386_ONLY)file path=kernel/drv/mm group=sys
file path=kernel/drv/mm.conf group=sys
-$(i386_ONLY)file path=kernel/drv/mouse8042 group=sys
-$(i386_ONLY)file path=kernel/drv/mpt group=sys
$(i386_ONLY)file path=kernel/drv/mpt.conf group=sys \
original_name=SUNWckr:kernel/drv/mpt.conf preserve=true
-$(i386_ONLY)file path=kernel/drv/nulldriver group=sys
-$(i386_ONLY)file path=kernel/drv/openeepr group=sys
file path=kernel/drv/openeepr.conf group=sys
-$(i386_ONLY)file path=kernel/drv/options group=sys
file path=kernel/drv/options.conf group=sys
-$(i386_ONLY)file path=kernel/drv/pci_pci group=sys
-$(i386_ONLY)file path=kernel/drv/pcieb group=sys
file path=kernel/drv/pcieb.conf group=sys
-$(i386_ONLY)file path=kernel/drv/physmem group=sys
file path=kernel/drv/physmem.conf group=sys
-$(i386_ONLY)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
-$(i386_ONLY)file path=kernel/drv/pseudo group=sys
file path=kernel/drv/pseudo.conf group=sys
-$(i386_ONLY)file path=kernel/drv/ptc group=sys
file path=kernel/drv/ptc.conf group=sys
-$(i386_ONLY)file path=kernel/drv/ptsl group=sys
file path=kernel/drv/ptsl.conf group=sys
-$(i386_ONLY)file path=kernel/drv/ramdisk group=sys
file path=kernel/drv/ramdisk.conf group=sys
-$(i386_ONLY)file path=kernel/drv/random group=sys
file path=kernel/drv/random.conf group=sys
-$(i386_ONLY)file path=kernel/drv/rts group=sys
file path=kernel/drv/rts.conf group=sys
-$(i386_ONLY)file path=kernel/drv/sad group=sys
file path=kernel/drv/sad.conf group=sys
-$(i386_ONLY)file path=kernel/drv/scsi_vhci group=sys
file path=kernel/drv/scsi_vhci.conf group=sys \
original_name=SUNWckr:kernel/drv/scsi_vhci.conf preserve=true
-$(i386_ONLY)file path=kernel/drv/sd group=sys
$(sparc_ONLY)file path=kernel/drv/sd.conf group=sys \
original_name=SUNWckr:kernel/drv/sd.conf preserve=true
$(i386_ONLY)file path=kernel/drv/sd.conf group=sys \
original_name=SUNWos86r:kernel/drv/sd.conf preserve=true
-$(i386_ONLY)file path=kernel/drv/sgen group=sys
file path=kernel/drv/sgen.conf group=sys \
original_name=SUNWckr:kernel/drv/sgen.conf preserve=true
-$(i386_ONLY)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
-$(i386_ONLY)file path=kernel/drv/softmac group=sys
file path=kernel/drv/softmac.conf group=sys
-$(i386_ONLY)file path=kernel/drv/spdsock group=sys
file path=kernel/drv/spdsock.conf group=sys
-$(i386_ONLY)file path=kernel/drv/st group=sys
file path=kernel/drv/st.conf group=sys \
original_name=SUNWckr:kernel/drv/st.conf preserve=true
-$(i386_ONLY)file path=kernel/drv/sy group=sys
file path=kernel/drv/sy.conf group=sys
-$(i386_ONLY)file path=kernel/drv/sysevent group=sys
file path=kernel/drv/sysevent.conf group=sys
-$(i386_ONLY)file path=kernel/drv/sysmsg group=sys
file path=kernel/drv/sysmsg.conf group=sys
-$(i386_ONLY)file path=kernel/drv/tcp group=sys
file path=kernel/drv/tcp.conf group=sys
-$(i386_ONLY)file path=kernel/drv/tcp6 group=sys
file path=kernel/drv/tcp6.conf group=sys
-$(i386_ONLY)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
$(sparc_ONLY)file path=kernel/drv/uata.conf group=sys \
original_name=SUNWckr:kernel/drv/uata.conf preserve=true
-$(i386_ONLY)file path=kernel/drv/ucode group=sys
$(i386_ONLY)file path=kernel/drv/ucode.conf group=sys
-$(i386_ONLY)file path=kernel/drv/udp group=sys
file path=kernel/drv/udp.conf group=sys
-$(i386_ONLY)file path=kernel/drv/udp6 group=sys
file path=kernel/drv/udp6.conf group=sys
-$(i386_ONLY)file path=kernel/drv/vgatext group=sys
-$(i386_ONLY)file path=kernel/drv/vnic group=sys
file path=kernel/drv/vnic.conf group=sys
-$(i386_ONLY)file path=kernel/drv/wc group=sys
file path=kernel/drv/wc.conf group=sys
$(sparc_ONLY)file path=kernel/exec/$(ARCH64)/aoutexec group=sys mode=0755
file path=kernel/exec/$(ARCH64)/elfexec group=sys mode=0755
file path=kernel/exec/$(ARCH64)/intpexec group=sys mode=0755
-$(i386_ONLY)file path=kernel/exec/elfexec group=sys mode=0755
-$(i386_ONLY)file path=kernel/exec/intpexec group=sys mode=0755
file path=kernel/fs/$(ARCH64)/autofs group=sys mode=0755
file path=kernel/fs/$(ARCH64)/bootfs group=sys mode=0755
file path=kernel/fs/$(ARCH64)/ctfs group=sys mode=0755
@@ -609,49 +513,18 @@ file path=kernel/fs/$(ARCH64)/sockfs group=sys mode=0755
file path=kernel/fs/$(ARCH64)/specfs group=sys mode=0755
file path=kernel/fs/$(ARCH64)/tmpfs group=sys mode=0755
file path=kernel/fs/$(ARCH64)/ufs group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/autofs group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/bootfs group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/ctfs group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/dcfs group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/dev group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/devfs group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/fifofs group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/hsfs group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/lofs group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/mntfs group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/namefs group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/objfs group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/procfs group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/sharefs group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/sockfs group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/specfs group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/tmpfs group=sys mode=0755
-$(i386_ONLY)file path=kernel/fs/ufs group=sys mode=0755
-$(i386_ONLY)file path=kernel/genunix group=sys mode=0755
file path=kernel/ipp/$(ARCH64)/ipgpc group=sys mode=0755
-$(i386_ONLY)file path=kernel/ipp/ipgpc group=sys mode=0755
file path=kernel/kiconv/$(ARCH64)/kiconv_emea group=sys mode=0755
file path=kernel/kiconv/$(ARCH64)/kiconv_ja group=sys mode=0755
file path=kernel/kiconv/$(ARCH64)/kiconv_ko group=sys mode=0755
file path=kernel/kiconv/$(ARCH64)/kiconv_sc group=sys mode=0755
file path=kernel/kiconv/$(ARCH64)/kiconv_tc group=sys mode=0755
-$(i386_ONLY)file path=kernel/kiconv/kiconv_emea group=sys mode=0755
-$(i386_ONLY)file path=kernel/kiconv/kiconv_ja group=sys mode=0755
-$(i386_ONLY)file path=kernel/kiconv/kiconv_ko group=sys mode=0755
-$(i386_ONLY)file path=kernel/kiconv/kiconv_sc group=sys mode=0755
-$(i386_ONLY)file path=kernel/kiconv/kiconv_tc group=sys mode=0755
file path=kernel/mac/$(ARCH64)/mac_6to4 group=sys mode=0755
file path=kernel/mac/$(ARCH64)/mac_ether group=sys mode=0755
file path=kernel/mac/$(ARCH64)/mac_ib group=sys mode=0755
file path=kernel/mac/$(ARCH64)/mac_ipv4 group=sys mode=0755
file path=kernel/mac/$(ARCH64)/mac_ipv6 group=sys mode=0755
file path=kernel/mac/$(ARCH64)/mac_wifi group=sys mode=0755
-$(i386_ONLY)file path=kernel/mac/mac_6to4 group=sys mode=0755
-$(i386_ONLY)file path=kernel/mac/mac_ether group=sys mode=0755
-$(i386_ONLY)file path=kernel/mac/mac_ib group=sys mode=0755
-$(i386_ONLY)file path=kernel/mac/mac_ipv4 group=sys mode=0755
-$(i386_ONLY)file path=kernel/mac/mac_ipv6 group=sys mode=0755
-$(i386_ONLY)file path=kernel/mac/mac_wifi group=sys mode=0755
$(i386_ONLY)file path=kernel/misc/$(ARCH64)/acpica group=sys mode=0755
file path=kernel/misc/$(ARCH64)/bignum group=sys mode=0755
$(i386_ONLY)file path=kernel/misc/$(ARCH64)/bootdev group=sys mode=0755
@@ -689,38 +562,6 @@ file path=kernel/misc/$(ARCH64)/strplumb group=sys mode=0755
$(sparc_ONLY)file path=kernel/misc/$(ARCH64)/swapgeneric group=sys mode=0755
file path=kernel/misc/$(ARCH64)/tem group=sys mode=0755
file path=kernel/misc/$(ARCH64)/tlimod group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/acpica group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/bignum group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/bootdev group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/busra group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/cardbus group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/cmlb group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/consconfig group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/ctf group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/dls group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/fssnap_if group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/gld group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/hook group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/hpcsvc group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/idmap group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/iommulib group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/ipc group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/kbtrans group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/kcf group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/kmdbmod group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/ksocket group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/mac group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/mii group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/net80211 group=sys mode=0755
-$(i386_ONLY)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
-$(i386_ONLY)file path=kernel/misc/pcihp group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/pcmcia group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/rpcsec group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/sata group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/scsi group=sys mode=0755
file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_asym_emc group=sys \
mode=0755
file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_asym_lsi group=sys \
@@ -736,39 +577,12 @@ file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_tape group=sys mode=0755
file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_tpgs group=sys mode=0755
file path=kernel/misc/scsi_vhci/$(ARCH64)/scsi_vhci_f_tpgs_tape group=sys \
mode=0755
-$(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_asym_emc group=sys \
- mode=0755
-$(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_asym_lsi group=sys \
- mode=0755
-$(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_asym_sun group=sys \
- mode=0755
-$(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_sym group=sys \
- mode=0755
-$(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_sym_emc group=sys \
- mode=0755
-$(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_sym_hds group=sys \
- mode=0755
-$(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_tape group=sys \
- mode=0755
-$(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_tpgs group=sys \
- mode=0755
-$(i386_ONLY)file path=kernel/misc/scsi_vhci/scsi_vhci_f_tpgs_tape group=sys \
- mode=0755
-$(i386_ONLY)file path=kernel/misc/strplumb group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/tem group=sys mode=0755
-$(i386_ONLY)file path=kernel/misc/tlimod group=sys mode=0755
file path=kernel/sched/$(ARCH64)/SDC group=sys mode=0755
file path=kernel/sched/$(ARCH64)/TS group=sys mode=0755
file path=kernel/sched/$(ARCH64)/TS_DPTBL group=sys mode=0755
-$(i386_ONLY)file path=kernel/sched/SDC group=sys mode=0755
-$(i386_ONLY)file path=kernel/sched/TS group=sys mode=0755
-$(i386_ONLY)file path=kernel/sched/TS_DPTBL group=sys mode=0755
file path=kernel/socketmod/$(ARCH64)/ksslf group=sys mode=0755
file path=kernel/socketmod/$(ARCH64)/socksctp group=sys mode=0755
file path=kernel/socketmod/$(ARCH64)/trill group=sys mode=0755
-$(i386_ONLY)file path=kernel/socketmod/ksslf group=sys mode=0755
-$(i386_ONLY)file path=kernel/socketmod/socksctp group=sys mode=0755
-$(i386_ONLY)file path=kernel/socketmod/trill group=sys mode=0755
file path=kernel/strmod/$(ARCH64)/bufmod group=sys mode=0755
file path=kernel/strmod/$(ARCH64)/connld group=sys mode=0755
file path=kernel/strmod/$(ARCH64)/dedump group=sys mode=0755
@@ -785,20 +599,6 @@ file path=kernel/strmod/$(ARCH64)/timod group=sys mode=0755
file path=kernel/strmod/$(ARCH64)/tirdwr group=sys mode=0755
file path=kernel/strmod/$(ARCH64)/ttcompat group=sys mode=0755
$(sparc_ONLY)file path=kernel/strmod/$(ARCH64)/vuid3ps2 group=sys mode=0755
-$(i386_ONLY)file path=kernel/strmod/bufmod group=sys mode=0755
-$(i386_ONLY)file path=kernel/strmod/connld group=sys mode=0755
-$(i386_ONLY)file path=kernel/strmod/dedump group=sys mode=0755
-$(i386_ONLY)file path=kernel/strmod/drcompat group=sys mode=0755
-$(i386_ONLY)file path=kernel/strmod/ldterm group=sys mode=0755
-$(i386_ONLY)file path=kernel/strmod/pckt group=sys mode=0755
-$(i386_ONLY)file path=kernel/strmod/pfmod group=sys mode=0755
-$(i386_ONLY)file path=kernel/strmod/pipemod group=sys mode=0755
-$(i386_ONLY)file path=kernel/strmod/ptem group=sys mode=0755
-$(i386_ONLY)file path=kernel/strmod/redirmod group=sys mode=0755
-$(i386_ONLY)file path=kernel/strmod/rpcmod group=sys mode=0755
-$(i386_ONLY)file path=kernel/strmod/timod group=sys mode=0755
-$(i386_ONLY)file path=kernel/strmod/tirdwr group=sys mode=0755
-$(i386_ONLY)file path=kernel/strmod/ttcompat group=sys mode=0755
file path=kernel/sys/$(ARCH64)/c2audit group=sys mode=0755
file path=kernel/sys/$(ARCH64)/doorfs group=sys mode=0755
file path=kernel/sys/$(ARCH64)/inst_sync group=sys mode=0755
@@ -809,16 +609,6 @@ file path=kernel/sys/$(ARCH64)/portfs group=sys mode=0755
file path=kernel/sys/$(ARCH64)/pset group=sys mode=0755
file path=kernel/sys/$(ARCH64)/semsys group=sys mode=0755
file path=kernel/sys/$(ARCH64)/shmsys group=sys mode=0755
-$(i386_ONLY)file path=kernel/sys/c2audit group=sys mode=0755
-$(i386_ONLY)file path=kernel/sys/doorfs group=sys mode=0755
-$(i386_ONLY)file path=kernel/sys/inst_sync group=sys mode=0755
-$(i386_ONLY)file path=kernel/sys/kaio group=sys mode=0755
-$(i386_ONLY)file path=kernel/sys/msgsys group=sys mode=0755
-$(i386_ONLY)file path=kernel/sys/pipe group=sys mode=0755
-$(i386_ONLY)file path=kernel/sys/portfs group=sys mode=0755
-$(i386_ONLY)file path=kernel/sys/pset group=sys mode=0755
-$(i386_ONLY)file path=kernel/sys/semsys group=sys mode=0755
-$(i386_ONLY)file path=kernel/sys/shmsys group=sys mode=0755
file path=lib/svc/manifest/system/dumpadm.xml group=sys mode=0444
file path=lib/svc/manifest/system/intrd.xml group=sys mode=0444
file path=lib/svc/manifest/system/scheduler.xml group=sys mode=0444
@@ -826,7 +616,6 @@ file path=lib/svc/method/svc-dumpadm mode=0555
file path=lib/svc/method/svc-intrd mode=0555
file path=lib/svc/method/svc-scheduler mode=0555
file path=usr/kernel/drv/$(ARCH64)/signalfd group=sys
-$(i386_ONLY)file path=usr/kernel/drv/signalfd group=sys
file path=usr/kernel/drv/signalfd.conf group=sys
$(sparc_ONLY)file path=usr/share/man/man1m/monitor.1m
$(sparc_ONLY)file path=usr/share/man/man1m/obpsym.1m
@@ -846,11 +635,6 @@ hardlink path=kernel/misc/$(ARCH64)/sha2 \
target=../../../kernel/crypto/$(ARCH64)/sha2
hardlink path=kernel/misc/$(ARCH64)/skein \
target=../../../kernel/crypto/$(ARCH64)/skein
-$(i386_ONLY)hardlink path=kernel/misc/edonr target=../../kernel/crypto/edonr
-$(i386_ONLY)hardlink path=kernel/misc/md5 target=../../kernel/crypto/md5
-$(i386_ONLY)hardlink path=kernel/misc/sha1 target=../../kernel/crypto/sha1
-$(i386_ONLY)hardlink path=kernel/misc/sha2 target=../../kernel/crypto/sha2
-$(i386_ONLY)hardlink path=kernel/misc/skein target=../../kernel/crypto/skein
hardlink path=kernel/socketmod/$(ARCH64)/icmp \
target=../../../kernel/drv/$(ARCH64)/icmp
hardlink path=kernel/socketmod/$(ARCH64)/rts \
@@ -859,10 +643,6 @@ hardlink path=kernel/socketmod/$(ARCH64)/tcp \
target=../../../kernel/drv/$(ARCH64)/tcp
hardlink path=kernel/socketmod/$(ARCH64)/udp \
target=../../../kernel/drv/$(ARCH64)/udp
-$(i386_ONLY)hardlink path=kernel/socketmod/icmp target=../../kernel/drv/icmp
-$(i386_ONLY)hardlink path=kernel/socketmod/rts target=../../kernel/drv/rts
-$(i386_ONLY)hardlink path=kernel/socketmod/tcp target=../../kernel/drv/tcp
-$(i386_ONLY)hardlink path=kernel/socketmod/udp target=../../kernel/drv/udp
hardlink path=kernel/strmod/$(ARCH64)/arp \
target=../../../kernel/drv/$(ARCH64)/arp
hardlink path=kernel/strmod/$(ARCH64)/icmp \
@@ -879,23 +659,10 @@ hardlink path=kernel/strmod/$(ARCH64)/tcp \
target=../../../kernel/drv/$(ARCH64)/tcp
hardlink path=kernel/strmod/$(ARCH64)/udp \
target=../../../kernel/drv/$(ARCH64)/udp
-$(i386_ONLY)hardlink path=kernel/strmod/arp target=../../kernel/drv/arp
-$(i386_ONLY)hardlink path=kernel/strmod/icmp target=../../kernel/drv/icmp
-$(i386_ONLY)hardlink path=kernel/strmod/ip target=../../kernel/drv/ip
-$(i386_ONLY)hardlink path=kernel/strmod/ipsecah \
- target=../../kernel/drv/ipsecah
-$(i386_ONLY)hardlink path=kernel/strmod/ipsecesp \
- target=../../kernel/drv/ipsecesp
-$(i386_ONLY)hardlink path=kernel/strmod/keysock \
- target=../../kernel/drv/keysock
-$(i386_ONLY)hardlink path=kernel/strmod/tcp target=../../kernel/drv/tcp
-$(i386_ONLY)hardlink path=kernel/strmod/udp target=../../kernel/drv/udp
hardlink path=kernel/sys/$(ARCH64)/autofs \
target=../../../kernel/fs/$(ARCH64)/autofs
hardlink path=kernel/sys/$(ARCH64)/rpcmod \
target=../../../kernel/strmod/$(ARCH64)/rpcmod
-$(i386_ONLY)hardlink path=kernel/sys/autofs target=../../kernel/fs/autofs
-$(i386_ONLY)hardlink path=kernel/sys/rpcmod target=../../kernel/strmod/rpcmod
legacy pkg=SUNWckr \
desc="core kernel software for a specific instruction-set architecture" \
name="Core Solaris Kernel (Root)"
@@ -935,4 +702,3 @@ $(i386_ONLY)link path=boot/solaris/bin/root_archive \
link path=dev/dld target=../devices/pseudo/dld@0:ctl
link path=kernel/misc/$(ARCH64)/des \
target=../../../kernel/crypto/$(ARCH64)/des
-$(i386_ONLY)link path=kernel/misc/des target=../../kernel/crypto/des
diff --git a/usr/src/pkg/manifests/system-network-http-cache-accelerator.mf b/usr/src/pkg/manifests/system-network-http-cache-accelerator.mf
index c4e51382b6..aac40bbcce 100644
--- a/usr/src/pkg/manifests/system-network-http-cache-accelerator.mf
+++ b/usr/src/pkg/manifests/system-network-http-cache-accelerator.mf
@@ -74,7 +74,6 @@ file path=etc/nca/ncaport.conf group=sys \
file path=etc/sock2path.d/system%2Fnetwork%2Fhttp%2Fcache%2Faccelerator \
group=sys
file path=kernel/drv/$(ARCH64)/nca group=sys
-$(i386_ONLY)file path=kernel/drv/nca group=sys
file path=kernel/drv/nca.conf group=sys
file path=usr/bin/ncab2clf mode=0555
file path=usr/lib/$(ARCH64)/ncad_addr.so.1
@@ -96,7 +95,6 @@ hardlink path=etc/rc2.d/S94ncalogd target=../../etc/init.d/ncalogd
hardlink path=etc/rcS.d/K34ncalogd target=../../etc/init.d/ncalogd
hardlink path=kernel/strmod/$(ARCH64)/nca \
target=../../../kernel/drv/$(ARCH64)/nca
-$(i386_ONLY)hardlink path=kernel/strmod/nca target=../../kernel/drv/nca
legacy pkg=SUNWncar \
desc="core components to enable the network cache and accelerator" \
name="Solaris Network Cache and Accelerator (Root)"
diff --git a/usr/src/pkg/manifests/system-network-ipqos-ipqos-config.mf b/usr/src/pkg/manifests/system-network-ipqos-ipqos-config.mf
index 61170173a7..5956c7d558 100644
--- a/usr/src/pkg/manifests/system-network-ipqos-ipqos-config.mf
+++ b/usr/src/pkg/manifests/system-network-ipqos-ipqos-config.mf
@@ -49,11 +49,6 @@ file path=kernel/ipp/$(ARCH64)/dscpmk group=sys mode=0755
file path=kernel/ipp/$(ARCH64)/flowacct group=sys mode=0755
file path=kernel/ipp/$(ARCH64)/tokenmt group=sys mode=0755
file path=kernel/ipp/$(ARCH64)/tswtclmt group=sys mode=0755
-$(i386_ONLY)file path=kernel/ipp/dlcosmk group=sys mode=0755
-$(i386_ONLY)file path=kernel/ipp/dscpmk group=sys mode=0755
-$(i386_ONLY)file path=kernel/ipp/flowacct group=sys mode=0755
-$(i386_ONLY)file path=kernel/ipp/tokenmt group=sys mode=0755
-$(i386_ONLY)file path=kernel/ipp/tswtclmt group=sys mode=0755
file path=usr/share/man/man7ipp/dlcosmk.7ipp
file path=usr/share/man/man7ipp/dscpmk.7ipp
file path=usr/share/man/man7ipp/flowacct.7ipp
diff --git a/usr/src/pkg/manifests/system-network-ppp.mf b/usr/src/pkg/manifests/system-network-ppp.mf
index 2acef73c6f..c3e9c88dff 100644
--- a/usr/src/pkg/manifests/system-network-ppp.mf
+++ b/usr/src/pkg/manifests/system-network-ppp.mf
@@ -67,14 +67,10 @@ file path=usr/bin/pppd mode=4555
file path=usr/bin/pppstats mode=0555
file path=usr/kernel/drv/$(ARCH64)/sppp group=sys
file path=usr/kernel/drv/$(ARCH64)/sppptun group=sys
-$(i386_ONLY)file path=usr/kernel/drv/sppp group=sys
file path=usr/kernel/drv/sppp.conf group=sys
-$(i386_ONLY)file path=usr/kernel/drv/sppptun group=sys
file path=usr/kernel/drv/sppptun.conf group=sys
file path=usr/kernel/strmod/$(ARCH64)/spppasyn group=sys mode=0755
file path=usr/kernel/strmod/$(ARCH64)/spppcomp group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/strmod/spppasyn group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/strmod/spppcomp group=sys mode=0755
file path=usr/sbin/asppp2pppd mode=0550
file path=usr/share/man/man1m/chat.1m
file path=usr/share/man/man1m/pppd.1m
@@ -86,7 +82,6 @@ hardlink path=etc/rc2.d/S47pppd target=../../etc/init.d/pppd
hardlink path=etc/rcS.d/K50pppd target=../../etc/init.d/pppd
hardlink path=usr/kernel/strmod/$(ARCH64)/sppptun \
target=../../drv/$(ARCH64)/sppptun
-$(i386_ONLY)hardlink path=usr/kernel/strmod/sppptun target=../drv/sppptun
legacy pkg=SUNWpppd \
desc="Device drivers implementing point-to-point protocol (PPP)" \
name="Solaris PPP Device Drivers"
diff --git a/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf b/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf
index be65a7f85e..0180029796 100644
--- a/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf
+++ b/usr/src/pkg/manifests/system-network-udapl-udapl-tavor.mf
@@ -50,7 +50,6 @@ driver name=daplt perms="* 0644 root sys"
file path=etc/init.d/dodatadm.udaplt group=sys mode=0744 \
original_name=SUNWudaplt:etc/init.d/dodatadm.udaplt preserve=true
file path=kernel/drv/$(ARCH64)/daplt group=sys
-$(i386_ONLY)file path=kernel/drv/daplt group=sys
file path=kernel/drv/daplt.conf group=sys
file path=usr/lib/$(ARCH64)/udapl_tavor.so.1
file path=usr/lib/udapl_tavor.so.1
diff --git a/usr/src/pkg/manifests/system-remote-shared-memory.mf b/usr/src/pkg/manifests/system-remote-shared-memory.mf
index b24311e893..1f9877939e 100644
--- a/usr/src/pkg/manifests/system-remote-shared-memory.mf
+++ b/usr/src/pkg/manifests/system-remote-shared-memory.mf
@@ -40,7 +40,6 @@ dir path=usr/share/man/man3lib
dir path=usr/share/man/man3rsm
driver name=rsm perms="* 0666 root sys"
file path=usr/kernel/drv/$(ARCH64)/rsm group=sys
-$(i386_ONLY)file path=usr/kernel/drv/rsm group=sys
file path=usr/kernel/drv/rsm.conf group=sys
file path=usr/lib/$(ARCH64)/librsm.so.2
file path=usr/lib/librsm.so.2
diff --git a/usr/src/pkg/manifests/system-scheduler-fss.mf b/usr/src/pkg/manifests/system-scheduler-fss.mf
index fa11027f99..0dd32f729b 100644
--- a/usr/src/pkg/manifests/system-scheduler-fss.mf
+++ b/usr/src/pkg/manifests/system-scheduler-fss.mf
@@ -38,7 +38,6 @@ dir path=usr/lib/class/FSS
dir path=usr/share/man
dir path=usr/share/man/man7
file path=usr/kernel/sched/$(ARCH64)/FSS group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/sched/FSS group=sys mode=0755
file path=usr/lib/class/FSS/FSSdispadmin mode=0555
file path=usr/lib/class/FSS/FSSpriocntl mode=0555
file path=usr/share/man/man7/FSS.7
diff --git a/usr/src/pkg/manifests/system-tnf.mf b/usr/src/pkg/manifests/system-tnf.mf
index a7a46ef201..d937eb2c27 100644
--- a/usr/src/pkg/manifests/system-tnf.mf
+++ b/usr/src/pkg/manifests/system-tnf.mf
@@ -50,7 +50,6 @@ file path=usr/bin/$(ARCH64)/prex mode=0555
file path=usr/bin/$(ARCH64)/tnfxtract mode=0555
file path=usr/include/tnf/tnfctl.h
file path=usr/kernel/drv/$(ARCH64)/tnf group=sys
-$(i386_ONLY)file path=usr/kernel/drv/tnf group=sys
file path=usr/kernel/drv/tnf.conf group=sys
file path=usr/lib/$(ARCH64)/libtnfctl.so.1
file path=usr/lib/$(ARCH64)/libtnfprobe.so.1
diff --git a/usr/src/pkg/manifests/system-zones-brand-s10.mf b/usr/src/pkg/manifests/system-zones-brand-s10.mf
index d3330a2305..f507139d5f 100644
--- a/usr/src/pkg/manifests/system-zones-brand-s10.mf
+++ b/usr/src/pkg/manifests/system-zones-brand-s10.mf
@@ -62,7 +62,6 @@ $(sparc_ONLY)file path=platform/sun4u/kernel/brand/$(ARCH64)/s10_brand \
$(sparc_ONLY)file path=platform/sun4v/kernel/brand/$(ARCH64)/s10_brand \
group=sys mode=0755
$(i386_ONLY)file path=usr/kernel/brand/$(ARCH64)/s10_brand group=sys mode=0755
-$(i386_ONLY)file path=usr/kernel/brand/s10_brand group=sys mode=0755
file path=usr/lib/$(ARCH64)/s10_brand.so.1
file path=usr/lib/$(ARCH64)/s10_npreload.so.1
file path=usr/lib/brand/solaris10/$(ARCH64)/solaris10_librtld_db.so.1
diff --git a/usr/src/pkg/manifests/system-zones-brand-sn1.mf b/usr/src/pkg/manifests/system-zones-brand-sn1.mf
index 39d65c655a..7e5d6ac3db 100644
--- a/usr/src/pkg/manifests/system-zones-brand-sn1.mf
+++ b/usr/src/pkg/manifests/system-zones-brand-sn1.mf
@@ -55,7 +55,6 @@ $(sparc_ONLY)file path=platform/sun4u/kernel/brand/$(ARCH64)/sn1_brand \
$(sparc_ONLY)file path=platform/sun4v/kernel/brand/$(ARCH64)/sn1_brand \
group=sys mode=0755
$(i386_ONLY)file path=usr/kernel/brand/$(ARCH64)/sn1_brand group=sys mode=0755
-$(i386_ONLY)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
diff --git a/usr/src/pkg/manifests/system-zones.mf b/usr/src/pkg/manifests/system-zones.mf
index ff5787a608..2b9566accb 100644
--- a/usr/src/pkg/manifests/system-zones.mf
+++ b/usr/src/pkg/manifests/system-zones.mf
@@ -76,7 +76,6 @@ file path=lib/svc/method/svc-zonestat mode=0555 \
variant.opensolaris.zone=global
file path=usr/bin/zonestat mode=0555
file path=usr/kernel/drv/$(ARCH64)/zcons group=sys
-$(i386_ONLY)file path=usr/kernel/drv/zcons group=sys
file path=usr/lib/$(ARCH64)/libbrand.so.1
file path=usr/lib/$(ARCH64)/libzonecfg.so.1
file path=usr/lib/$(ARCH64)/libzonestat.so.1