Mercurial > illumos > illumos-gate

changeset 4167:c12aee7caf8a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6217259 A sun4u specific kmech_krb5 is unnecessary
author mp153739
date Fri, 04 May 2007 00:56:46 -0700
parents fff6cd460b66
children 7a68e9a5dc29
files deleted_files/usr/src/uts/sun4u/kmech_krb5/Makefile deleted_files/usr/src/uts/sun4u/kmech_krb5/inc.flg deleted_files/usr/src/uts/sun4u/kmech_krb5/req.flg usr/src/pkgdefs/SUNWcakr.u/prototype_com usr/src/uts/common/gssapi/mechs/krb5/krb5mech.c usr/src/uts/sun4u/Makefile.rules usr/src/uts/sun4u/Makefile.sun4u.shared usr/src/uts/sun4u/kmech_krb5/Makefile usr/src/uts/sun4u/kmech_krb5/inc.flg usr/src/uts/sun4u/kmech_krb5/req.flg
diffstat 10 files changed, 209 insertions(+), 238 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/uts/sun4u/kmech_krb5/Makefile	Fri May 04 00:56:46 2007 -0700
@@ -0,0 +1,120 @@
+#
+# 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 2007 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 gl_kmech_krb5 kernel module.
+#
+#	sun4u implementation architecture dependent
+#
+#
+#	Path to the base of the uts directory tree (usually /usr/src/uts).
+#
+UTSBASE	= ../..
+
+#
+#	Define the module and object file sets.
+#
+MODULE		= kmech_krb5
+OBJECTS		= $(KGSS_KRB5_OBJS:%=$(OBJS_DIR)/%)
+LINTS		= $(KGSS_KRB5_OBJS:%.o=$(LINTS_DIR)/%.ln)
+ROOTMODULE	= $(ROOT_PSM_KGSS_DIR)/$(MODULE)
+
+#
+#	Include common rules.
+#
+include $(UTSBASE)/sun4u/Makefile.sun4u
+
+#
+#	Define targets
+#
+ALL_TARGET	= $(BINARY)
+LINT_TARGET	= $(MODULE).lint
+INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
+
+#
+# lint pass one enforcement
+#
+CFLAGS += $(CCVERBOSE)
+
+#
+# For now, disable these lint checks; maintainers should endeavor
+# to investigate and remove these for maximum lint coverage.
+# Please do not carry these forward to new Makefiles.
+#
+LINTTAGS	+= -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
+LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
+LINTTAGS	+= -erroff=E_STATIC_UNUSED
+
+
+#
+# Files need to be compiled v8+ or v9
+#
+AS_XARCH_32 = -xarch=v8plus
+
+#
+#	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)
+
+KMECHKRB5_BASE=$(UTSBASE)/common/gssapi/mechs/krb5
+KGSSDFLAGS=-I $(UTSBASE)/common/gssapi/include
+KGSSDFLAGS += $(KRB5_DEFS)
+
+$(OBJS_DIR)/%.o:		$(KMECHKRB5_BASE)/crypto/crc32/%.c
+	$(COMPILE.c) $(KGSSDFLAGS) -o $@ $<
+	$(CTFCONVERT_O)
+
+$(LINTS_DIR)/%.ln:		$(KMECHKRB5_BASE)/crypto/crc32/%.c
+	@($(LHEAD) $(LINT.c) $(KGSSDFLAGS) $< $(LTAIL))
+
+#
+#	Include common targets.
+#
+include $(UTSBASE)/sun4u/Makefile.targ
+
+INC_PATH += \
+	-I$(UTSBASE)/common/gssapi \
+	-I$(UTSBASE)/common/gssapi/include \
+	-I$(UTSBASE)/common/gssapi/mechs/krb5/include \
+	-I$(SRC)/lib/gss_mechs/mech_krb5/include \
+	-I$(SRC)/lib/gss_mechs/mech_krb5/krb5/krb
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/uts/sun4u/kmech_krb5/inc.flg	Fri May 04 00:56:46 2007 -0700
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# 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.
+#
+# 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
+#
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+find_files "s.*.h" usr/src/uts/common/sys
+find_files "s.*.h" usr/src/uts/common/rpc
+find_files "s.*.h" usr/src/uts/common/gssapi
+find_files "s.*.h" usr/src/uts/common/vm
+find_files "s.*.h" usr/src/uts/common/netinet
+find_files "s.*.h" usr/src/uts/common/net
+find_files "s.*.h" usr/src/uts/sun4u/sys
+find_files "s.*.h" usr/src/uts/sparc/sys
+find_files "s.*.h" usr/src/uts/sparc/v7
+find_files "s.*.h" usr/src/uts/sparc/v9
+find_files "s.*.h" usr/src/lib/krb5/kadm5
+find_files "s.*" usr/src/uts/sun4u/ml
+find_files "s.*" usr/src/uts/sparc/ml
+find_files "s.*" usr/src/uts/sfmmu
+find_files "s.*" usr/src/uts/common/gssapi/mechs/krb5
+find_files "s.*" usr/src/lib/gss_mechs/mech_krb5
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deleted_files/usr/src/uts/sun4u/kmech_krb5/req.flg	Fri May 04 00:56:46 2007 -0700
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# 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.
+#
+# 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
+#
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+echo_file usr/src/uts/sun4u/Makefile
+echo_file usr/src/uts/sun4u/Makefile.files
+echo_file usr/src/uts/sun4u/Makefile.sun4u
+echo_file usr/src/uts/sun4u/Makefile.sun4u.shared
+echo_file usr/src/uts/sun4u/Makefile.rules
+echo_file usr/src/uts/sun4u/Makefile.targ
+echo_file usr/src/uts/sun4u/Makefile.targ.shared
+echo_file usr/src/uts/sun4u/Makefile.workarounds
+echo_file usr/src/uts/sparc/Makefile.rules
+echo_file usr/src/uts/sparc/Makefile.files
+echo_file usr/src/uts/sun/Makefile.files
+echo_file usr/src/uts/sun/Makefile.rules
+echo_file usr/src/uts/sparc/v9/Makefile.files
+echo_file usr/src/uts/sparc/v9/Makefile.rules
+echo_file usr/src/uts/common/Makefile.files
+echo_file usr/src/uts/common/Makefile.rules
--- a/usr/src/pkgdefs/SUNWcakr.u/prototype_com	Fri May 04 00:47:17 2007 -0700
+++ b/usr/src/pkgdefs/SUNWcakr.u/prototype_com	Fri May 04 00:56:46 2007 -0700
@@ -485,9 +485,6 @@
 f none platform/sun4u/kernel/drv/trapstat.conf 644 root sys
 f none platform/sun4u/kernel/drv/zsh.conf 644 root sys
 d none platform/sun4u/kernel/misc 755 root sys
-d none platform/sun4u/kernel/misc/kgss 755 root sys
-d none platform/sun4u/kernel/misc/kgss/sparcv9 755 root sys
-f none platform/sun4u/kernel/misc/kgss/sparcv9/kmech_krb5 755 root sys
 d none platform/sun4u/kernel/misc/sparcv9 755 root sys
 f none platform/sun4u/kernel/misc/sparcv9/kmdbmod 755 root sys
 f none platform/sun4u/kernel/misc/sparcv9/bootdev 755 root sys
--- a/usr/src/uts/common/gssapi/mechs/krb5/krb5mech.c	Fri May 04 00:47:17 2007 -0700
+++ b/usr/src/uts/common/gssapi/mechs/krb5/krb5mech.c	Fri May 04 00:56:46 2007 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  * A module for Kerberos V5  security mechanism.
@@ -68,20 +68,10 @@
  */
 extern struct mod_ops mod_miscops;
 
-#if defined(sun4u)
-
-static struct modlmisc modlmisc = {
-	&mod_miscops, "Krb5 GSS mech, sun4u optimized"
-};
-
-#else
-
 static struct modlmisc modlmisc = {
 	&mod_miscops, "Krb5 GSS mechanism"
 };
 
-#endif
-
 static struct modlinkage modlinkage = {
 	MODREV_1,
 	(void *)&modlmisc,
--- a/usr/src/uts/sun4u/Makefile.rules	Fri May 04 00:47:17 2007 -0700
+++ b/usr/src/uts/sun4u/Makefile.rules	Fri May 04 00:56:46 2007 -0700
@@ -168,15 +168,6 @@
 $(OBJS_DIR)/%.o:		$(SRC)/common/atomic/sparcv9/%.s
 	$(COMPILE.s) -o $@ $<
 
-KMECHKRB5_BASE=$(UTSBASE)/common/gssapi/mechs/krb5
-
-$(OBJS_DIR)/%.o:		$(KMECHKRB5_BASE)/crypto/des/sparc/sun4u/%.c
-	$(COMPILE.c) -o $@ $<
-	$(CTFCONVERT_O)
-
-$(OBJS_DIR)/%.o:		$(KMECHKRB5_BASE)/crypto/des/sparc/sun4u/%.s
-	$(COMPILE.s) -o $@ $<
-
 $(OBJS_DIR)/dtracestubs.s:	$(UNIX_O) $(LIBS)
 	nm -u $(UNIX_O) $(LIBS) | grep __dtrace_probe_ | sort | uniq | nawk '{ \
 	    printf("\t.global %s\n\t.type %s, #function\n%s:\n", \
@@ -287,11 +278,5 @@
 $(LINTS_DIR)/%.ln:		$(UTSBASE)/sun4u/rsa/%.s
 	@($(LHEAD) $(LINT.s) $< $(LTAIL))
 
-$(LINTS_DIR)/%.ln:		$(KMECHKRB5_BASE)/crypto/des/sparc/sun4u/%.c
-	@($(LHEAD) $(LINT.c) $< $(LTAIL))
-
-$(LINTS_DIR)/%.ln:		$(KMECHKRB5_BASE)/crypto/des/sparc/sun4u/%.s
-	@($(LHEAD) $(LINT.s) $< $(LTAIL))
-
 $(LINTS_DIR)/%.ln:		$(SRC)/common/atomic/%.c
 	@($(LHEAD) $(LINT.c) $< $(LTAIL))
--- a/usr/src/uts/sun4u/Makefile.sun4u.shared	Fri May 04 00:47:17 2007 -0700
+++ b/usr/src/uts/sun4u/Makefile.sun4u.shared	Fri May 04 00:56:46 2007 -0700
@@ -446,7 +446,6 @@
 MISC_KMODS	+= sbd
 
 MISC_KMODS	+= opl_cfg
-MISC_KMODS	+= kmech_krb5
 MISC_KMODS	+= zuluvm
 MISC_KMODS	+= gptwo_cpu gptwocfg
 
--- a/usr/src/uts/sun4u/kmech_krb5/Makefile	Fri May 04 00:47:17 2007 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +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 2007 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 gl_kmech_krb5 kernel module.
-#
-#	sun4u implementation architecture dependent
-#
-#
-#	Path to the base of the uts directory tree (usually /usr/src/uts).
-#
-UTSBASE	= ../..
-
-#
-#	Define the module and object file sets.
-#
-MODULE		= kmech_krb5
-OBJECTS		= $(KGSS_KRB5_OBJS:%=$(OBJS_DIR)/%)
-LINTS		= $(KGSS_KRB5_OBJS:%.o=$(LINTS_DIR)/%.ln)
-ROOTMODULE	= $(ROOT_PSM_KGSS_DIR)/$(MODULE)
-
-#
-#	Include common rules.
-#
-include $(UTSBASE)/sun4u/Makefile.sun4u
-
-#
-#	Define targets
-#
-ALL_TARGET	= $(BINARY)
-LINT_TARGET	= $(MODULE).lint
-INSTALL_TARGET	= $(BINARY) $(ROOTMODULE)
-
-#
-# lint pass one enforcement
-#
-CFLAGS += $(CCVERBOSE)
-
-#
-# For now, disable these lint checks; maintainers should endeavor
-# to investigate and remove these for maximum lint coverage.
-# Please do not carry these forward to new Makefiles.
-#
-LINTTAGS	+= -erroff=E_SUPPRESSION_DIRECTIVE_UNUSED
-LINTTAGS	+= -erroff=E_ASSIGN_NARROW_CONV
-LINTTAGS	+= -erroff=E_STATIC_UNUSED
-
-
-#
-# Files need to be compiled v8+ or v9
-#
-AS_XARCH_32 = -xarch=v8plus
-
-#
-#	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)
-
-KMECHKRB5_BASE=$(UTSBASE)/common/gssapi/mechs/krb5
-KGSSDFLAGS=-I $(UTSBASE)/common/gssapi/include
-KGSSDFLAGS += $(KRB5_DEFS)
-
-$(OBJS_DIR)/%.o:		$(KMECHKRB5_BASE)/crypto/crc32/%.c
-	$(COMPILE.c) $(KGSSDFLAGS) -o $@ $<
-	$(CTFCONVERT_O)
-
-$(LINTS_DIR)/%.ln:		$(KMECHKRB5_BASE)/crypto/crc32/%.c
-	@($(LHEAD) $(LINT.c) $(KGSSDFLAGS) $< $(LTAIL))
-
-#
-#	Include common targets.
-#
-include $(UTSBASE)/sun4u/Makefile.targ
-
-INC_PATH += \
-	-I$(UTSBASE)/common/gssapi \
-	-I$(UTSBASE)/common/gssapi/include \
-	-I$(UTSBASE)/common/gssapi/mechs/krb5/include \
-	-I$(SRC)/lib/gss_mechs/mech_krb5/include \
-	-I$(SRC)/lib/gss_mechs/mech_krb5/krb5/krb
--- a/usr/src/uts/sun4u/kmech_krb5/inc.flg	Fri May 04 00:47:17 2007 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-# 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
-#
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-find_files "s.*.h" usr/src/uts/common/sys
-find_files "s.*.h" usr/src/uts/common/rpc
-find_files "s.*.h" usr/src/uts/common/gssapi
-find_files "s.*.h" usr/src/uts/common/vm
-find_files "s.*.h" usr/src/uts/common/netinet
-find_files "s.*.h" usr/src/uts/common/net
-find_files "s.*.h" usr/src/uts/sun4u/sys
-find_files "s.*.h" usr/src/uts/sparc/sys
-find_files "s.*.h" usr/src/uts/sparc/v7
-find_files "s.*.h" usr/src/uts/sparc/v9
-find_files "s.*.h" usr/src/lib/krb5/kadm5
-find_files "s.*" usr/src/uts/sun4u/ml
-find_files "s.*" usr/src/uts/sparc/ml
-find_files "s.*" usr/src/uts/sfmmu
-find_files "s.*" usr/src/uts/common/gssapi/mechs/krb5
-find_files "s.*" usr/src/lib/gss_mechs/mech_krb5
--- a/usr/src/uts/sun4u/kmech_krb5/req.flg	Fri May 04 00:47:17 2007 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# 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.
-#
-# 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
-#
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-echo_file usr/src/uts/sun4u/Makefile
-echo_file usr/src/uts/sun4u/Makefile.files
-echo_file usr/src/uts/sun4u/Makefile.sun4u
-echo_file usr/src/uts/sun4u/Makefile.sun4u.shared
-echo_file usr/src/uts/sun4u/Makefile.rules
-echo_file usr/src/uts/sun4u/Makefile.targ
-echo_file usr/src/uts/sun4u/Makefile.targ.shared
-echo_file usr/src/uts/sun4u/Makefile.workarounds
-echo_file usr/src/uts/sparc/Makefile.rules
-echo_file usr/src/uts/sparc/Makefile.files
-echo_file usr/src/uts/sun/Makefile.files
-echo_file usr/src/uts/sun/Makefile.rules
-echo_file usr/src/uts/sparc/v9/Makefile.files
-echo_file usr/src/uts/sparc/v9/Makefile.rules
-echo_file usr/src/uts/common/Makefile.files
-echo_file usr/src/uts/common/Makefile.rules