diff options
Diffstat (limited to 'usr/src/uts')
23 files changed, 26 insertions, 767 deletions
diff --git a/usr/src/uts/Makefile.uts b/usr/src/uts/Makefile.uts index 071ffe890e..d263a1df2a 100644 --- a/usr/src/uts/Makefile.uts +++ b/usr/src/uts/Makefile.uts @@ -20,7 +20,7 @@ # # -# Copyright 2007 Sun Microsystems, Inc. All rights reserved. +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -587,7 +587,7 @@ PARALLEL_KMODS = $(DRV_KMODS) $(EXEC_KMODS) $(FS_KMODS) $(SCHED_KMODS) \ $(TOD_KMODS) $(STRMOD_KMODS) $(SYS_KMODS) $(MISC_KMODS) \ $(NLMISC_KMODS) $(MACH_KMODS) $(CPU_KMODS) $(GSS_KMODS) \ $(MMU_KMODS) $(DACF_KMODS) $(EXPORT_KMODS) $(IPP_KMODS) \ - $(CRYPTO_KMODS) $(CRYPTO_EK_KMODS) $(PCBE_KMODS) \ + $(CRYPTO_KMODS) $(PCBE_KMODS) \ $(DRV_KMODS_$(CLASS)) $(MISC_KMODS_$(CLASS)) $(MAC_KMODS) \ $(DEVNAME_KMODS) $(BRAND_KMODS) $(KICONV_KMODS) diff --git a/usr/src/uts/intel/Makefile b/usr/src/uts/intel/Makefile index f646565c24..6fdbaf2bd2 100644 --- a/usr/src/uts/intel/Makefile +++ b/usr/src/uts/intel/Makefile @@ -49,23 +49,10 @@ $(CLOSED_BUILD)LINT_CLOSED_XMOD1 = $(LINT_CLOSED_XMOD2:adpu320=) $(CLOSED_BUILD)LINT_LIBS += $(LINT_XMODLIBS:%=$(LINT_LIB_DIR)/llib-l%.ln) # -# dprov is delivered in the SUNWcrtptoint package. +# dprov is delivered in the SUNWcryptoint package. # DRV_KMODS += dprov -# -# CRYPTO_EK_KMODS modules go in the encryption pack (SUNWcry*) -# They need to be listed separately since they duplicate global symbols -# causing the 2nd pass of lint on the kernel to complain. CRYPTO_EK_KMODS -# should not be listed in the lint target. -# -# Don't build these for OpenSolaris, since they will be replaced by -# binaries that are signed by Sun RE. -# -$(CLOSED_BUILD)CRYPTO_EK_KMODS += aes256 -$(CLOSED_BUILD)CRYPTO_EK_KMODS += arcfour2048 -$(CLOSED_BUILD)CRYPTO_EK_KMODS += blowfish448 - # EXPORT DELETE END # diff --git a/usr/src/uts/sparc/Makefile b/usr/src/uts/sparc/Makefile index 10154b6098..de3781feac 100644 --- a/usr/src/uts/sparc/Makefile +++ b/usr/src/uts/sparc/Makefile @@ -50,23 +50,8 @@ $(CLOSED_BUILD)LINT_LIBS += $(CLOSED_XMODS:%=$(LINT_LIB_DIR)/llib-l%.ln) DRV_KMODS += dprov -# -# CRYPTO_EK_KMODS modules go in the encryption pack (SUNWcry*) -# They need to be listed separately since they duplicate global symbols -# causing the 2nd pass of lint on the kernel to complain. CRYPTO_EK_KMODS -# should not be listed in the lint target. -# -# Don't build these for OpenSolaris, since they will be replaced by -# binaries that are signed by Sun RE. -# -$(CLOSED_BUILD)CRYPTO_EK_KMODS += aes256 -$(CLOSED_BUILD)CRYPTO_EK_KMODS += arcfour2048 -$(CLOSED_BUILD)CRYPTO_EK_KMODS += blowfish448 # EXPORT DELETE END -# -# -# def := TARGET= def all := TARGET= all install := TARGET= install diff --git a/usr/src/uts/sparc/aes256/Makefile b/usr/src/uts/sparc/aes256/Makefile deleted file mode 100644 index d765d1ddd3..0000000000 --- a/usr/src/uts/sparc/aes256/Makefile +++ /dev/null @@ -1,97 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" -# -# This makefile drives the production of the AES KEF provider. -# -# sparc implementation architecture dependent -# - -# -# Path to the base of the uts directory tree (usually /usr/src/uts). -# -UTSBASE = ../.. -COM_DIR = $(COMMONBASE)/crypto/aes - -# -# Define the module and object file sets. -# -MODULE = aes256 -OBJECTS = $(AESPROV_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(AESPROV_OBJS:%.o=$(LINTS_DIR)/%.ln) -ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) - -# -# Include common rules. -# -include $(UTSBASE)/sparc/Makefile.sparc - -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - -# -# Define targets -# -ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint -INSTALL_TARGET = $(BINARY) $(ROOTMODULE) - -# -# Linkage dependencies -# -LDFLAGS += -dy - -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) -I$(COM_DIR) -LINTFLAGS += -I$(COM_DIR) -CPPFLAGS += -DCRYPTO_UNLIMITED -DCRYPTO_PROVIDER_NAME=\"$(MODULE)\" - -# -# Default build targets. -# -.KEEP_STATE: - -def: $(DEF_DEPS) - -all: $(ALL_DEPS) - -clean: $(CLEAN_DEPS) - -clobber: $(CLOBBER_DEPS) - -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - -install: $(INSTALL_DEPS) - -# -# Include common targets. -# -include $(UTSBASE)/sparc/Makefile.targ diff --git a/usr/src/uts/sparc/arcfour2048/Makefile b/usr/src/uts/sparc/arcfour2048/Makefile deleted file mode 100644 index 282da19dfd..0000000000 --- a/usr/src/uts/sparc/arcfour2048/Makefile +++ /dev/null @@ -1,92 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" -# -# This makefile drives the production of the ARCFOUR KEF provider. -# -# sparc implementation architecture dependent -# - -# -# Path to the base of the uts directory tree (usually /usr/src/uts). -# -UTSBASE = ../.. -COM_DIR = $(COMMONBASE)/crypto/arcfour - -# -# Define the module and object file sets. -# -MODULE = arcfour2048 -OBJECTS = $(ARCFOURPROV_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(ARCFOURPROV_OBJS:%.o=$(LINTS_DIR)/%.ln) -ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) - -# -# Include common rules. -# -include $(UTSBASE)/sparc/Makefile.sparc - -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - -# -# Define targets -# -ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint -INSTALL_TARGET = $(BINARY) $(ROOTMODULE) - -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) -I$(COM_DIR) -LINTFLAGS += -I$(COM_DIR) -CPPFLAGS += -DCRYPTO_UNLIMITED - -# -# Default build targets. -# -.KEEP_STATE: - -def: $(DEF_DEPS) - -all: $(ALL_DEPS) - -clean: $(CLEAN_DEPS) - -clobber: $(CLOBBER_DEPS) - -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - -install: $(INSTALL_DEPS) - -# -# Include common targets. -# -include $(UTSBASE)/sparc/Makefile.targ diff --git a/usr/src/uts/sparc/blowfish448/Makefile b/usr/src/uts/sparc/blowfish448/Makefile deleted file mode 100644 index 23a94c8ba6..0000000000 --- a/usr/src/uts/sparc/blowfish448/Makefile +++ /dev/null @@ -1,97 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" -# -# This makefile drives the production of the blowfish KEF provider. -# -# sparc implementation architecture dependent -# - -# -# Path to the base of the uts directory tree (usually /usr/src/uts). -# -UTSBASE = ../.. -COM_DIR = $(COMMONBASE)/crypto/blowfish - -# -# Define the module and object file sets. -# -MODULE = blowfish448 -OBJECTS = $(BLOWFISHPROV_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(BLOWFISHPROV_OBJS:%.o=$(LINTS_DIR)/%.ln) -ROOTMODULE = $(ROOT_CRYPTO_DIR)/$(MODULE) - -# -# Include common rules. -# -include $(UTSBASE)/sparc/Makefile.sparc - -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - -# -# Define targets -# -ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint -INSTALL_TARGET = $(BINARY) $(ROOTMODULE) - -# -# Linkage dependencies -# -LDFLAGS += -dy - -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) -I$(COM_DIR) -LINTFLAGS += -I$(COM_DIR) -CPPFLAGS += -DCRYPTO_UNLIMITED -DCRYPTO_PROVIDER_NAME=\"$(MODULE)\" - -# -# Default build targets. -# -.KEEP_STATE: - -def: $(DEF_DEPS) - -all: $(ALL_DEPS) - -clean: $(CLEAN_DEPS) - -clobber: $(CLOBBER_DEPS) - -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - -install: $(INSTALL_DEPS) - -# -# Include common targets. -# -include $(UTSBASE)/sparc/Makefile.targ diff --git a/usr/src/uts/sun4u/aes256/Makefile b/usr/src/uts/sun4u/aes256/Makefile deleted file mode 100644 index 4811efd19e..0000000000 --- a/usr/src/uts/sun4u/aes256/Makefile +++ /dev/null @@ -1,115 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# -# -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" -# -# This makefile drives the production of the AES KEF provider. -# -# sparc implementation architecture dependent -# - -# -# Path to the base of the uts directory tree (usually /usr/src/uts). -# -UTSBASE = ../.. -COM_DIR = $(COMMONBASE)/crypto/aes - -# -# Define the module and object file sets. -# -MODULE = aes256 -OBJECTS = $(AES_OBJS:%=$(OBJS_DIR)/%) -LINTS = $(AES_OBJS:%.o=$(LINTS_DIR)/%.ln) -ROOTMODULE = $(ROOT_US3_CRYPTO_DIR)/$(MODULE) - -# -# Include common rules. -# -include $(UTSBASE)/sun4u/Makefile.sun4u - -# set signing mode -ELFSIGN_MOD = $(ELFSIGN_CRYPTO) - -# -# Define targets -# -ALL_TARGET = $(BINARY) -LINT_TARGET = $(MODULE).lint -INSTALL_TARGET = $(BINARY) $(ROOTMODULE) - -# -# Linkage dependencies -# -LDFLAGS += -dy - -# -# lint pass one enforcement -# -CFLAGS += $(CCVERBOSE) -I$(COM_DIR) -LINTFLAGS += -I$(COM_DIR) -CPPFLAGS += -DCRYPTO_UNLIMITED -DCRYPTO_PROVIDER_NAME=\"$(MODULE)\" - -# -# Turn on doubleword alignment for 64 bit registers -# -CFLAGS += -dalign - -# -# Default build targets. -# -.KEEP_STATE: - -def: $(DEF_DEPS) - -all: $(ALL_DEPS) - -clean: $(CLEAN_DEPS) - -clobber: $(CLOBBER_DEPS) - -lint: $(LINT_DEPS) - -modlintlib: $(MODLINTLIB_DEPS) - -clean.lint: $(CLEAN_LINT_DEPS) - -install: $(INSTALL_DEPS) - -# -# Include common targets. -# -include $(UTSBASE)/sun4u/Makefile.targ - -$(ROOT_US3_DIR): $(ROOT_PLAT_DIR) - -$(INS.dir.root.sys) - -$(ROOT_US3_MOD_DIR): $(ROOT_US3_DIR) - -$(INS.dir.root.sys) - -$(ROOT_US3_CRYPTO_DIR): $(ROOT_US3_MOD_DIR) - -$(INS.dir.root.sys) - -$(ROOT_US3_CRYPTO_DIR)/%: $(OBJS_DIR)/% $(ROOT_US3_CRYPTO_DIR) - -$(INS.file) - diff --git a/usr/src/uts/sun4u/boston/Makefile b/usr/src/uts/sun4u/boston/Makefile index 5b9dd24fa8..ccb371db65 100644 --- a/usr/src/uts/sun4u/boston/Makefile +++ b/usr/src/uts/sun4u/boston/Makefile @@ -66,14 +66,6 @@ def all clean clean.lint clobber modlist: $(BOSTON_KMODS) modlintlib: $(BOSTON_KMODS) -# EXPORT DELETE START -# -# aes256 is delivered in the SUNWcryr package which is removed from -# the EXPORT_SRC build. -# -BOSTON_CRYPTO_LINKS += aes256 -# EXPORT DELETE END - install: $(ROOT_BOSTON_DIR) \ $(USR_BOSTON_DIR) \ $(USR_BOSTON_INC_DIR) \ @@ -111,17 +103,6 @@ $(BOSTON_CRYPTO_LINKS): $(ROOT_BOSTON_CRYPTO_DIR_64) -$(RM) $(ROOT_BOSTON_CRYPTO_DIR_64)/$@; $(SYMLINK) $(ROOT_US3_CRYPTO_LINK)/$@ $(ROOT_BOSTON_CRYPTO_DIR_64)/$@ -# EXPORT DELETE START - -EXPORT_SRC: - $(RM) Makefile+ - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile - -# EXPORT DELETE END - # # # Include common targets. diff --git a/usr/src/uts/sun4u/cherrystone/Makefile b/usr/src/uts/sun4u/cherrystone/Makefile index 00e5d760a9..415c9b4021 100644 --- a/usr/src/uts/sun4u/cherrystone/Makefile +++ b/usr/src/uts/sun4u/cherrystone/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -21,7 +20,7 @@ # # # uts/sun4u/cherrystone/Makefile -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -67,14 +66,6 @@ IMPLEMENTED_PLATFORM = SUNW,Sun-Fire-480R LINKED_PLATFORMS = SUNW,Sun-Fire-V490 -# EXPORT DELETE START -# -# aes256 is delivered in the SUNWcryr package which is removed -# from the EXPORT_SRC build. -# -CHERRYSTONE_CRYPTO_LINKS += aes256 -# EXPORT DELETE END - install: $(ROOT_CHERRYSTONE_DIR) $(USR_CHERRYSTONE_DIR) \ $(USR_CHERRYSTONE_INC_DIR) \ $(USR_CHERRYSTONE_SBIN_DIR) \ @@ -109,17 +100,6 @@ lint.platmod: modlintlib $(CHERRYSTONE_KMODS): FRC @cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET) -# EXPORT DELETE START - -EXPORT_SRC: - $(RM) Makefile+ - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile - -# EXPORT DELETE END - # # # Include common targets. diff --git a/usr/src/uts/sun4u/chicago/Makefile b/usr/src/uts/sun4u/chicago/Makefile index 3681031039..683b077445 100644 --- a/usr/src/uts/sun4u/chicago/Makefile +++ b/usr/src/uts/sun4u/chicago/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -66,14 +65,6 @@ def all clean clean.lint clobber modlist: $(CHICAGO_KMODS) modlintlib: $(CHICAGO_KMODS) -# EXPORT DELETE START -# -# aes256 is delivered in the SUNWcryr package which is removed from -# the EXPORT_SRC build. -# -CHICAGO_CRYPTO_LINKS += aes256 -# EXPORT DELETE END - install: $(ROOT_CHICAGO_DIR) \ $(USR_CHICAGO_DIR) \ $(USR_CHICAGO_INC_DIR) \ @@ -109,18 +100,6 @@ $(CHICAGO_CRYPTO_LINKS): $(ROOT_CHICAGO_CRYPTO_DIR_64) -$(RM) $(ROOT_CHICAGO_CRYPTO_DIR_64)/$@; $(SYMLINK) $(ROOT_US3_CRYPTO_LINK)/$@ $(ROOT_CHICAGO_CRYPTO_DIR_64)/$@ -# EXPORT DELETE START - -EXPORT_SRC: - $(RM) Makefile+ - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile - -# EXPORT DELETE END - -# # # Include common targets. # diff --git a/usr/src/uts/sun4u/daktari/Makefile b/usr/src/uts/sun4u/daktari/Makefile index 47d290e5ae..2e5a318a1f 100644 --- a/usr/src/uts/sun4u/daktari/Makefile +++ b/usr/src/uts/sun4u/daktari/Makefile @@ -20,7 +20,7 @@ # # # uts/sun4u/daktari/Makefile -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # @@ -68,14 +68,6 @@ IMPLEMENTED_PLATFORM = SUNW,Sun-Fire-880 LINKED_PLATFORMS = SUNW,Sun-Fire-V890 -# EXPORT DELETE START -# -# aes256 is delivered in the SUNWcryr package which is removed from -# the EXPORT_SRC build. -# -DAKTARI_CRYPTO_LINKS += aes256 -# EXPORT DELETE END - install: $(ROOT_DAKTARI_DIR) $(USR_DAKTARI_DIR) \ $(USR_DAKTARI_INC_DIR) \ $(USR_DAKTARI_SBIN_DIR) \ @@ -116,17 +108,6 @@ lint.platmod: modlintlib $(DAKTARI_KMODS): FRC @cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET) -# EXPORT DELETE START - -EXPORT_SRC: - $(RM) Makefile+ - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile - -# EXPORT DELETE END - # # # Include common targets. diff --git a/usr/src/uts/sun4u/enchilada/Makefile b/usr/src/uts/sun4u/enchilada/Makefile index 8803fa4703..6e918ce045 100644 --- a/usr/src/uts/sun4u/enchilada/Makefile +++ b/usr/src/uts/sun4u/enchilada/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ident "%Z%%M% %I% %E% SMI" @@ -66,14 +65,6 @@ def all clean clean.lint clobber modlist: $(ENCHILADA_KMODS) modlintlib: $(ENCHILADA_KMODS) -# EXPORT DELETE START -# -# aes256 is delivered in the SUNWcryr package which is removed from -# the EXPORT_SRC build. -# -ENCHILADA_CRYPTO_LINKS += aes256 -# EXPORT DELETE END - install: $(ROOT_ENCHILADA_DIR) \ $(USR_ENCHILADA_DIR) \ $(USR_ENCHILADA_INC_DIR) \ @@ -109,17 +100,6 @@ $(ENCHILADA_CRYPTO_LINKS): $(ROOT_ENCHILADA_CRYPTO_DIR_64) -$(RM) $(ROOT_ENCHILADA_CRYPTO_DIR_64)/$@; $(SYMLINK) $(ROOT_US3_CRYPTO_LINK)/$@ $(ROOT_ENCHILADA_CRYPTO_DIR_64)/$@ -# EXPORT DELETE START - -EXPORT_SRC: - $(RM) Makefile+ - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile - -# EXPORT DELETE END - # # # Include common targets. diff --git a/usr/src/uts/sun4u/excalibur/Makefile b/usr/src/uts/sun4u/excalibur/Makefile index 3e5a0f0138..9c110d7809 100644 --- a/usr/src/uts/sun4u/excalibur/Makefile +++ b/usr/src/uts/sun4u/excalibur/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -22,7 +21,7 @@ # # uts/sun4u/excalibur/Makefile # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #pragma ident "%Z%%M% %I% %E% SMI" @@ -66,14 +65,6 @@ def all clean clean.lint clobber modlist: $(EXCALIBUR_KMODS) modlintlib: $(EXCALIBUR_KMODS) -# EXPORT DELETE START -# -# aes256 is delivered in the SUNWcryr package which is removed from -# the EXPORT_SRC build. -# -EXCALIBUR_CRYPTO_LINKS += aes256 -# EXPORT DELETE END - install: $(ROOT_EXCALIBUR_DIR) \ $(USR_EXCALIBUR_DIR) \ $(USR_EXCALIBUR_INC_DIR) \ @@ -109,17 +100,6 @@ $(EXCALIBUR_CRYPTO_LINKS): $(ROOT_EXCALIBUR_CRYPTO_DIR_64) -$(RM) $(ROOT_EXCALIBUR_CRYPTO_DIR_64)/$@; $(SYMLINK) $(ROOT_US3_CRYPTO_LINK)/$@ $(ROOT_EXCALIBUR_CRYPTO_DIR_64)/$@ -# EXPORT DELETE START - -EXPORT_SRC: - $(RM) Makefile+ - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile - -# EXPORT DELETE END - # # Include common targets. # diff --git a/usr/src/uts/sun4u/littleneck/Makefile b/usr/src/uts/sun4u/littleneck/Makefile index 45809decc0..134c28b1d8 100644 --- a/usr/src/uts/sun4u/littleneck/Makefile +++ b/usr/src/uts/sun4u/littleneck/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -21,7 +20,7 @@ # # # uts/sun4u/littleneck/Makefile -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -63,14 +62,6 @@ def all clean.lint clean clobber modlist: $(LITTLENECK_KMODS) modlintlib: $(LITTLENECK_KMODS) -# EXPORT DELETE START -# -# aes256 is delivered in the SUNWcryr package which is removed from -# the EXPORT_SRC build. -# -LITTLENECK_CRYPTO_LINKS += aes256 -# EXPORT DELETE END - install: $(ROOT_LITTLENECK_DIR) $(USR_LITTLENECK_DIR) \ $(USR_LITTLENECK_INC_DIR) \ $(USR_LITTLENECK_SBIN_DIR) \ @@ -100,17 +91,6 @@ $(LITTLENECK_CRYPTO_LINKS): $(ROOT_LITTLENECK_CRYPTO_DIR_64) $(SYMLINK) $(ROOT_US3_CRYPTO_LINK)/$@ \ $(ROOT_LITTLENECK_CRYPTO_DIR_64)/$@ -# EXPORT DELETE START - -EXPORT_SRC: - $(RM) Makefile+ - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile - -# EXPORT DELETE END - # # # Include common targets. diff --git a/usr/src/uts/sun4u/lw2plus/Makefile b/usr/src/uts/sun4u/lw2plus/Makefile index e6db2ac4dd..809a242fea 100644 --- a/usr/src/uts/sun4u/lw2plus/Makefile +++ b/usr/src/uts/sun4u/lw2plus/Makefile @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -72,14 +72,6 @@ LINKS2DESTDIR = ../../../../SUNW,Sun-Fire-280R/kernel/misc/sparcv9 LW2PLUS_LINKS_2 = SUNW,Netra-T4/kernel/misc/sparcv9/platmod LW2PLUS_PLAT_LINKS_2 = $(LW2PLUS_LINKS_2:%=$(ROOT_PLAT_DIR)/%) -# EXPORT DELETE START -# -# aes256 is delivered in the SUNWcryr package which is removed from -# the EXPORT_SRC build. -# -LW2PLUS_CRYPTO_LINKS += aes256 -# EXPORT DELETE END - install: $(ROOT_LW2PLUS_DIR) $(USR_LW2PLUS_DIR) \ $(ROOT_LW2PLUS_MISC_DIR_64) \ $(USR_LW2PLUS_INC_DIR) \ @@ -108,17 +100,6 @@ $(LW2PLUS_CRYPTO_LINKS): $(ROOT_LW2PLUS_CRYPTO_DIR_64) -$(RM) $(ROOT_LW2PLUS_CRYPTO_DIR_64)/$@; $(SYMLINK) $(ROOT_US3_CRYPTO_LINK)/$@ $(ROOT_LW2PLUS_CRYPTO_DIR_64)/$@ -# EXPORT DELETE START - -EXPORT_SRC: - $(RM) Makefile+ - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile - -# EXPORT DELETE END - # # # Include common targets. diff --git a/usr/src/uts/sun4u/lw8/Makefile b/usr/src/uts/sun4u/lw8/Makefile index 704ad8ef6d..ea0046617a 100644 --- a/usr/src/uts/sun4u/lw8/Makefile +++ b/usr/src/uts/sun4u/lw8/Makefile @@ -20,7 +20,7 @@ # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -80,14 +80,6 @@ LW8_PLAT_LINKS_2 = $(LW8_LINKS_2:%=$(ROOT_PLAT_DIR)/%) LW8_PLAT_LINKS_3 = $(LW8_LINKS_3:%=$(ROOT_PLAT_DIR)/%) LW8_PLAT_LINKS_4 = $(LW8_LINKS_4:%=$(ROOT_PLAT_DIR)/%) -# EXPORT DELETE START -# -# aes256 is delivered in the SUNWcryr package which is removed from -# the EXPORT_SRC build. -# -LW8_CRYPTO_LINKS += aes256 -# EXPORT DELETE END - install: $(ROOT_LW8_DIR) $(USR_LW8_DIR) \ $(USR_LW8_INC_DIR) \ $(USR_LW8_SBIN_DIR) \ @@ -126,17 +118,6 @@ $(LW8_CRYPTO_LINKS): $(ROOT_LW8_CRYPTO_DIR_64) -$(RM) $(ROOT_LW8_CRYPTO_DIR_64)/$@; $(SYMLINK) $(ROOT_US3_CRYPTO_LINK)/$@ $(ROOT_LW8_CRYPTO_DIR_64)/$@ -# EXPORT DELETE START - -EXPORT_SRC: - $(RM) Makefile+ - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile - -# EXPORT DELETE END - # # # Include common targets. diff --git a/usr/src/uts/sun4u/mpxu/Makefile b/usr/src/uts/sun4u/mpxu/Makefile index 371dc0a151..d444b48d0f 100644 --- a/usr/src/uts/sun4u/mpxu/Makefile +++ b/usr/src/uts/sun4u/mpxu/Makefile @@ -75,14 +75,6 @@ LINKED_PLATFORMS += SUNW,Netra-240 LINKED_PLATFORMS += SUNW,Netra-210 -# EXPORT DELETE START -# -# aes256 is delivered in the SUNWcryr package which is removed from -# the EXPORT_SRC build. -# -MPXU_CRYPTO_LINKS += aes256 -# EXPORT DELETE END - install: $(ROOT_MPXU_DIR) $(USR_MPXU_DIR) \ $(USR_MPXU_INC_DIR) \ $(USR_MPXU_SBIN_PRTDIAG) \ @@ -121,17 +113,6 @@ lint.platmod: modlintlib @-$(ECHO) "\nMPXU Platform-dependent module: global crosschecks:" @-$(LINT) $(LINTFLAGS) $(LINT_LIBS) 2>&1 | $(LGREP.2) -# EXPORT DELETE START - -EXPORT_SRC: - $(RM) Makefile+ - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile - -# EXPORT DELETE END - # # # Include common targets. diff --git a/usr/src/uts/sun4u/opl/Makefile b/usr/src/uts/sun4u/opl/Makefile index 5a739329d4..009f820be3 100644 --- a/usr/src/uts/sun4u/opl/Makefile +++ b/usr/src/uts/sun4u/opl/Makefile @@ -71,14 +71,6 @@ modlintlib: $(OPL_KMODS) $(CLOSED_OPL_KMODS) IMPLEMENTED_PLATFORM = SUNW,SPARC-Enterprise -# EXPORT DELETE START -# -# aes256 is delivered in the SUNWcryr package which is removed from -# the EXPORT_SRC build. -# -OPL_CRYPTO_LINKS += aes256 -# EXPORT DELETE END - install: $(ROOT_OPL_DIR) $(USR_OPL_DIR) \ $(USR_OPL_INC_DIR) \ $(USR_OPL_SBIN_DIR) \ @@ -127,17 +119,6 @@ lint.platmod: modlintlib @-$(ECHO) "\nOpl Platform-dependent module: global crosschecks:" @-$(LINT) $(LINTFLAGS) $(LINT_LIBS) 2>&1 | $(LGREP.2) -# EXPORT DELETE START - -EXPORT_SRC: - $(RM) Makefile+ - $(SED) -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile - -# EXPORT DELETE END - # # # Include common targets. diff --git a/usr/src/uts/sun4u/schumacher/Makefile b/usr/src/uts/sun4u/schumacher/Makefile index f44163dc26..6b5fcc772e 100644 --- a/usr/src/uts/sun4u/schumacher/Makefile +++ b/usr/src/uts/sun4u/schumacher/Makefile @@ -62,14 +62,6 @@ def all clean clean.lint clobber modlist: $(SCHUMACHER_KMODS) modlintlib: $(SCHUMACHER_KMODS) -# EXPORT DELETE START -# -# aes256 is delivered in the SUNWcryr package which is removed from -# the EXPORT_SRC build. -# -SCHUMACHER_CRYPTO_LINKS += aes256 -# EXPORT DELETE END - install: $(ROOT_SCHUMACHER_DIR) \ $(USR_SCHUMACHER_DIR) \ $(USR_SCHUMACHER_INC_DIR) \ @@ -107,17 +99,6 @@ $(SCHUMACHER_CRYPTO_LINKS): $(ROOT_SCHUMACHER_CRYPTO_DIR_64) -$(RM) $(ROOT_SCHUMACHER_CRYPTO_DIR_64)/$@; $(SYMLINK) $(ROOT_US3_CRYPTO_LINK)/$@ $(ROOT_SCHUMACHER_CRYPTO_DIR_64)/$@ -# EXPORT DELETE START - -EXPORT_SRC: - $(RM) Makefile+ - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile - -# EXPORT DELETE END - # # Include common targets. # diff --git a/usr/src/uts/sun4u/seattle/Makefile b/usr/src/uts/sun4u/seattle/Makefile index 60e3ed6d6a..4d8d97c7b1 100644 --- a/usr/src/uts/sun4u/seattle/Makefile +++ b/usr/src/uts/sun4u/seattle/Makefile @@ -68,14 +68,6 @@ modlintlib: $(SEATTLE_KMODS) LINKED_PLATFORMS = SUNW,Sun-Fire-V245 -# EXPORT DELETE START -# -# aes256 is delivered in the SUNWcryr package which is removed from -# the EXPORT_SRC build. -# -SEATTLE_CRYPTO_LINKS += aes256 -# EXPORT DELETE END - install: $(ROOT_SEATTLE_DIR) \ $(USR_SEATTLE_DIR) \ $(USR_SEATTLE_INC_DIR) \ @@ -115,18 +107,7 @@ $(SEATTLE_CRYPTO_LINKS): $(ROOT_SEATTLE_CRYPTO_DIR_64) -$(RM) $(ROOT_SEATTLE_CRYPTO_DIR_64)/$@; $(SYMLINK) $(ROOT_US3_CRYPTO_LINK)/$@ $(ROOT_SEATTLE_CRYPTO_DIR_64)/$@ -# EXPORT DELETE START -EXPORT_SRC: - $(RM) Makefile+ - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile - -# EXPORT DELETE END - -# # # Include common targets. # diff --git a/usr/src/uts/sun4u/serengeti/Makefile b/usr/src/uts/sun4u/serengeti/Makefile index 20c15adf0e..cbfc558322 100644 --- a/usr/src/uts/sun4u/serengeti/Makefile +++ b/usr/src/uts/sun4u/serengeti/Makefile @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # @@ -70,14 +70,6 @@ modlintlib: $(SERENGETI_KMODS) IMPLEMENTED_PLATFORM = SUNW,Sun-Fire -# EXPORT DELETE START -# -# aes256 is delivered in the SUNWcryr package which is removed from -# the EXPORT_SRC build. -# -SERENGETI_CRYPTO_LINKS += aes256 -# EXPORT DELETE END - install: $(ROOT_SERENGETI_DIR) $(USR_SERENGETI_DIR) \ $(USR_SERENGETI_INC_DIR) \ $(USR_SERENGETI_SBIN_DIR) \ @@ -115,18 +107,6 @@ lint.platmod: modlintlib @-$(ECHO) "\nSerengeti Platform-dependent module: global crosschecks:" @-$(LINT) $(LINTFLAGS) $(LINT_LIBS) 2>&1 | $(LGREP.2) -# EXPORT DELETE START - -EXPORT_SRC: - $(RM) Makefile+ - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile - -# EXPORT DELETE END - -# # # Include common targets. # diff --git a/usr/src/uts/sun4u/starcat/Makefile b/usr/src/uts/sun4u/starcat/Makefile index dd9c6424bc..d3793ce364 100644 --- a/usr/src/uts/sun4u/starcat/Makefile +++ b/usr/src/uts/sun4u/starcat/Makefile @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #pragma ident "%Z%%M% %I% %E% SMI" @@ -72,14 +72,6 @@ modlintlib: $(STARCAT_KMODS) IMPLEMENTED_PLATFORM = SUNW,Sun-Fire-15000 -# EXPORT DELETE START -# -# aes256 is delivered in the SUNWcryr package which is removed from -# the EXPORT_SRC build. -# -STARCAT_CRYPTO_LINKS += aes256 -# EXPORT DELETE END - install: $(ROOT_STARCAT_DIR) $(USR_STARCAT_DIR) \ $(USR_STARCAT_INC_DIR) \ $(USR_STARCAT_SBIN_DIR) \ @@ -119,18 +111,7 @@ lint.platmod: modlintlib @-$(ECHO) "\nStarcat Platform-dependent module: global crosschecks:" @-$(LINT) $(LINTFLAGS) $(LINT_LIBS) 2>&1 | $(LGREP.2) -# EXPORT DELETE START -EXPORT_SRC: - $(RM) Makefile+ - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile - -# EXPORT DELETE END - -# # # Include common targets. # diff --git a/usr/src/uts/sun4u/taco/Makefile b/usr/src/uts/sun4u/taco/Makefile index 6302ecaed2..827f82a215 100644 --- a/usr/src/uts/sun4u/taco/Makefile +++ b/usr/src/uts/sun4u/taco/Makefile @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -21,7 +20,7 @@ # # # uts/sun4u/taco/Makefile -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. +# Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #pragma ident "%Z%%M% %I% %E% SMI" @@ -65,14 +64,6 @@ def all clean clean.lint clobber modlist: $(TACO_KMODS) modlintlib: $(TACO_KMODS) -# EXPORT DELETE START -# -# aes256 is delivered in the SUNWcryr package which is removed from -# the EXPORT_SRC build. -# -TACO_CRYPTO_LINKS += aes256 -# EXPORT DELETE END - install: $(ROOT_TACO_DIR) \ $(USR_TACO_DIR) \ $(USR_TACO_INC_DIR) \ @@ -109,17 +100,6 @@ $(TACO_CRYPTO_LINKS): $(ROOT_TACO_CRYPTO_DIR_64) $(SYMLINK) $(ROOT_US3_CRYPTO_LINK)/$@ $(ROOT_TACO_CRYPTO_DIR_64)/$@ -# EXPORT DELETE START - -EXPORT_SRC: - $(RM) Makefile+ - sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \ - < Makefile > Makefile+ - $(MV) Makefile+ Makefile - $(CHMOD) 444 Makefile - -# EXPORT DELETE END - # # Include common targets. # |