6289535 build_cscope complains a bit on x86

6303550 xencrypt, xdecrypt no longer mangled
6316770 split the tree into open and closed trees
6321333 Install.sh is over-zealous looking for kmods

4 files changed, 54 insertions, 59 deletions

diff --git a/usr/src/uts/sun/Makefile.files b/usr/src/uts/sun/Makefile.files
index 7905c8264d..a54d45269d 100644
--- a/usr/src/uts/sun/Makefile.files
+++ b/usr/src/uts/sun/Makefile.files
@@ -27,9 +27,9 @@
 #
 # uts/sun/Makefile.files
 #
-#	This Makefile defines all file modules and build rules for the
-# directory uts/sun and it's children. These are the source files which
-# are common to all sun implementations.
+# This Makefile defines file modules and build rules for the directory
+# uts/sun and its children. These are the source files which are
+# common to all sun implementations.
 #
 
 #
@@ -62,14 +62,8 @@ FAS_OBJS +=	fas.o fas_callbacks.o
 
 FD_OBJS += fd.o
 
-IFP_OBJS +=	ifp.o ifp_fw.o
-
-ISP_OBJS +=	isp.o isp_sbus_fw.o isp_1040_fw.o isp_cmds.o
-
 MS_OBJS +=	ms.o
 
-SF_OBJS +=	sf.o
-
 HME_OBJS +=	hme.o
 
 ERI_OBJS +=	eri.o
@@ -80,20 +74,12 @@ SD_OBJS +=	sd.o sd_xbuf.o
 
 CMLB_OBJS +=	cmlb.o
 
-DAD_OBJS +=	dad.o
-
 DADA_OBJS +=	dcd_hba.o       dcd_transport.o \
 		dcd_control.o   dcd_resource.o  dcd_confsubr.o dcd_subr.o \
 		dcd_confdata.o
 
-ATA_OBJS +=	ata_common.o atapi.o ata_disk.o ghd.o ghd_scsi.o \
-		ghd_debug.o ghd_scsa.o ghd_gcmd.o ghd_queue.o ghd_timer.o \
-		ghd_waitq.o cmd.o acersb.o sil.o
-
 SSD_OBJS +=	sd.o sd_xbuf.o
 
-SOCAL_OBJS +=	socal.o	socal_ucode.o
-
 STP4020_OBJS +=	stp4020.o
 
 WSDRV_OBJS += 	wsdrv.o
diff --git a/usr/src/uts/sun/Makefile.rules b/usr/src/uts/sun/Makefile.rules
index 92ba7a77a7..d991468383 100644
--- a/usr/src/uts/sun/Makefile.rules
+++ b/usr/src/uts/sun/Makefile.rules
@@ -60,14 +60,6 @@ $(OBJS_DIR)/%.o:		$(UTSBASE)/sun/io/ttymux/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
 
-$(OBJS_DIR)/%.o:		$(UTSBASE)/sun/io/dada/adapters/%.c
-	$(COMPILE.c) -o $@ $<
-	$(CTFCONVERT_O)
-
-$(OBJS_DIR)/%.o:		$(UTSBASE)/sun/io/dada/adapters/ghd/%.c
-	$(COMPILE.c) -o $@ $<
-	$(CTFCONVERT_O)
-
 $(OBJS_DIR)/%.o:		$(UTSBASE)/sun/io/dada/conf/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
@@ -76,15 +68,9 @@ $(OBJS_DIR)/%.o:		$(UTSBASE)/sun/io/dada/impl/%.c
 	$(COMPILE.c) -o $@ $<
 	$(CTFCONVERT_O)
 
-$(OBJS_DIR)/%.o:		$(UTSBASE)/sun/io/dada/targets/%.c
-	$(COMPILE.c) -o $@ $<
-	$(CTFCONVERT_O)
-
 $(OBJS_DIR)/esp.o	:=	CFLAGS += -dalign
 $(OBJS_DIR)/fas.o	:=	CFLAGS += -dalign
 $(OBJS_DIR)/fas_callbacks.o :=	CFLAGS += -dalign
-$(OBJS_DIR)/ifp.o	:=	CFLAGS += -dalign
-$(OBJS_DIR)/isp.o	:=	CFLAGS += -dalign
 $(OBJS_DIR)/sf.o	:=	CFLAGS += -dalign
 $(OBJS_DIR)/%.o:		$(UTSBASE)/sun/io/scsi/adapters/%.c
 	$(COMPILE.c) -o $@ $<
@@ -116,15 +102,6 @@ $(LINTS_DIR)/%.ln:		$(UTSBASE)/sun/io/scsi/adapters/%.c
 $(LINTS_DIR)/%.ln:		$(UTSBASE)/sun/io/scsi/targets/%.c
 	@($(LHEAD) $(LINT.c) -I. $< $(LTAIL))
 
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/sun/io/dada/targets/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/sun/io/dada/adapters/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(UTSBASE)/sun/io/dada/adapters/ghd/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
 $(LINTS_DIR)/%.ln:		$(UTSBASE)/sun/io/dada/impl/%.c
 	@($(LHEAD) $(LINT.c) $< $(LTAIL))
 
diff --git a/usr/src/uts/sun/io/scsi/inc.flg b/usr/src/uts/sun/io/scsi/inc.flg
index b3e4f5bc61..a416b2c271 100644
--- a/usr/src/uts/sun/io/scsi/inc.flg
+++ b/usr/src/uts/sun/io/scsi/inc.flg
@@ -24,7 +24,7 @@
 #ident	"%Z%%M%	%I%	%E% SMI"
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This file brings down all that is needed to build just 
@@ -34,26 +34,31 @@
 find_files "s.*"	\
 	usr/src/uts/common/io/warlock \
 	usr/src/uts/common/io/scsi \
+	usr/closed/uts/common/io/scsi \
 	usr/src/uts/common/sys \
-	usr/src/uts/sparc/dad	\
+	usr/closed/uts/common/sys \
+	usr/closed/uts/sparc/dad	\
 	usr/src/uts/sparc/dada	\
 	usr/src/uts/sparc/esp	\
 	usr/src/uts/sparc/fas	\
-	usr/src/uts/sparc/glm	\
-	usr/src/uts/sparc/ifp	\
-	usr/src/uts/sparc/isp	\
+	usr/closed/uts/sparc/glm	\
+	usr/closed/uts/sparc/ifp	\
+	usr/closed/uts/sparc/isp	\
 	usr/src/uts/sparc/scsi	\
 	usr/src/uts/sparc/sd	\
 	usr/src/uts/sparc/ses	\
-	usr/src/uts/sparc/sgen	\
-	usr/src/uts/sparc/socal	\
+	usr/closed/uts/sparc/sgen	\
+	usr/closed/uts/sparc/socal	\
 	usr/src/uts/sparc/ssd	\
 	usr/src/uts/sparc/st	\
-	usr/src/uts/sparc/uata	\
+	usr/closed/uts/sparc/uata	\
 	usr/src/uts/sparc/warlock \
 	usr/src/uts/sun/io/dada \
+	usr/closed/uts/sun/io/dada \
 	usr/src/uts/sun/sys/dada \
-	usr/src/uts/sun/sys/scsi
+	usr/closed/uts/sun/sys/dada \
+	usr/src/uts/sun/sys/scsi \
+	usr/closed/uts/sun/sys/scsi
 
 find_files "s.*.h"	\
 	usr/src/uts/sparc/sys \
@@ -73,7 +78,9 @@ echo_file  usr/src/uts/Makefile
 echo_file  usr/src/uts/Makefile.targ
 echo_file  usr/src/uts/Makefile.uts
 echo_file  usr/src/uts/common/Makefile.files
+echo_file  usr/closed/uts/common/Makefile.files
 echo_file  usr/src/uts/common/Makefile.rules
+echo_file  usr/closed/uts/common/Makefile.rules
 echo_file  usr/src/uts/common/vm/as.h
 echo_file  usr/src/uts/common/vm/faultcode.h
 echo_file  usr/src/uts/common/vm/hat.h
@@ -85,18 +92,24 @@ echo_file  usr/src/uts/sparc/Makefile
 echo_file  usr/src/uts/sparc/Makefile.files
 echo_file  usr/src/uts/sparc/Makefile.rules
 echo_file  usr/src/uts/sparc/Makefile.sparc
+echo_file  usr/src/uts/sparc/Makefile.sparc.shared
+echo_file  usr/closed/uts/sparc/Makefile.sparc
 echo_file  usr/src/uts/sparc/Makefile.targ
+echo_file  usr/src/uts/sparc/Makefile.targ.shared
+echo_file  usr/closed/uts/sparc/Makefile.targ
 echo_file  usr/src/uts/sparc/ml/sparc.il
 echo_file  usr/src/uts/sparc/req.flg
 echo_file  usr/src/uts/sun/Makefile.files
+echo_file  usr/closed/uts/sun/Makefile.files
 echo_file  usr/src/uts/sun/Makefile.rules
-echo_file  usr/src/uts/sun/io/socal.c
-echo_file  usr/src/uts/sun/io/socal_ucode.c
+echo_file  usr/closed/uts/sun/Makefile.rules
+echo_file  usr/closed/uts/sun/io/socal.c
+echo_file  usr/closed/uts/sun/io/socal_ucode.c
 echo_file  usr/src/uts/sun/sys/dmaga.h
 echo_file  usr/src/uts/sun/sys/obpdefs.h
 echo_file  usr/src/uts/sun/sys/promif.h
-echo_file  usr/src/uts/sun/sys/socal_cq_defs.h
-echo_file  usr/src/uts/sun/sys/socalmap.h
+echo_file  usr/closed/uts/sun/sys/socal_cq_defs.h
+echo_file  usr/closed/uts/sun/sys/socalmap.h
 echo_file  usr/src/uts/sun/sys/socalreg.h
-echo_file  usr/src/uts/sun/sys/socalvar.h
+echo_file  usr/closed/uts/sun/sys/socalvar.h
 echo_file  usr/src/uts/sun/sys/socalio.h
diff --git a/usr/src/uts/sun/sys/Makefile b/usr/src/uts/sun/sys/Makefile
index ae60e407a2..f16c67c238 100644
--- a/usr/src/uts/sun/sys/Makefile
+++ b/usr/src/uts/sun/sys/Makefile
@@ -55,21 +55,28 @@ obpdefs.h		pixrect.h  \
 pr_impl_util.h		pr_planegroups.h \
 promif.h		promimpl.h \
 ramdac.h 		ser_async.h		ser_zscc.h \
-socalvar.h		socalreg.h		socalmap.h \
-socalio.h 		socal_cq_defs.h \
+socalio.h		socalreg.h \
 stp4020_reg.h		stp4020_var.h \
 ttymux.h		ttymuxuser.h \
 zsdev.h
 
+CLOSED_HDRS= \
+socal_cq_defs.h		socalmap.h		socalvar.h
+
 AUDIOHDRS= \
 audio_4231.h \
 audio1575.h
 
 SCSIADHDRS= \
 espcmd.h	espreg.h	espvar.h	fascmd.h	fasdma.h \
-fasreg.h	fasvar.h	sfvar.h	\
-ifpcmd.h	ifpvar.h	ifpio.h		ifpmail.h	ifpreg.h \
-ispcmd.h	ispmail.h	ispreg.h	ispvar.h
+fasreg.h	fasvar.h	ifpio.h
+
+CLOSED_SCSIAD = $(CLOSED)/uts/sun/sys/scsi/adapters
+
+CLOSED_SCSIADHDRS= \
+ifpcmd.h	ifpmail.h	ifpreg.h	ifpvar.h \
+ispcmd.h	ispmail.h	ispreg.h	ispvar.h \
+sfvar.h
 
 SCSITARGHDRS= \
 
@@ -80,9 +87,12 @@ ROOTDIRS=	$(ROOTDIR) \
 		$(ROOTDIR)/scsi/targets
 
 ROOTHDRS= $(HDRS:%=$(ROOTDIR)/%)
+$(CLOSED_BUILD)ROOTHDRS += $(CLOSED_HDRS:%=$(ROOTDIR)/%)
 ROOTAUDHDRS= $(AUDIOHDRS:%=$(ROOTDIR)/audio/%)
 ROOTFCHDRS= $(FCHDRS:%=$(ROOTDIR)/fc4/%)
 ROOTSCSIADHDRS= $(SCSIADHDRS:%=$(ROOTDIR)/scsi/adapters/%)
+$(CLOSED_BUILD)ROOTSCSIADHDRS += \
+	$(CLOSED_SCSIADHDRS:%=$(ROOTDIR)/scsi/adapters/%)
 ROOTSCSITARGHDRS= $(SCSITARGHDRS:%=$(ROOTDIR)/scsi/targets/%)
 
 
@@ -90,12 +100,18 @@ ROOTSCSITARGHDRS= $(SCSITARGHDRS:%=$(ROOTDIR)/scsi/targets/%)
 $(ROOTDIR)/%: %
 	$(INS.file)
 
+$(ROOTDIR)/%: $(CLOSED)/uts/sun/sys/%
+	$(INS.file)
+
 $(ROOTDIR)/audio/%: audio/%
 	$(INS.file)
 
 $(ROOTDIR)/scsi/adapters/%: scsi/adapters/%
 	$(INS.file)
 
+$(ROOTDIR)/scsi/adapters/%: $(CLOSED_SCSIAD)/%
+	$(INS.file)
+
 $(ROOTDIR)/scsi/targets/%: scsi/targets/%
 	$(INS.file)
 
@@ -117,6 +133,9 @@ CHECKHDRS= \
 	$(SCSIADHDRS:%.h=scsi/adapters/%.check) \
 	$(SCSITARGHDRS:%.h=scsi/targets/%.check)
 
+$(CLOSED_BUILD)CHECKHDRS += \
+	$(CLOSED_HDRS:%.h=$(CLOSED)/uts/sun/sys/%.check) \
+	$(CLOSED_SCSIADHDRS:%.h=$(CLOSED_SCSIAD)/%.check)
 
 # headers which won't quite meet the standards...
 #