Mercurial > illumos > illumos-gate
changeset 10030:93a7ff2e6767
PSARC 2009/161 EOF of SUNWn2cpact.v
6807849 need to bring n2cp module up to first class crypto citizen status
| author | Valerie Bubb Fenwick <Valerie.Fenwick@Sun.COM> |
|---|---|
| date | Thu, 02 Jul 2009 16:15:03 -0700 |
| parents | 8377504a53e1 |
| children | 7c57d4b0e54f |
| files | usr/src/Makefile.master usr/src/pkgdefs/Makefile usr/src/pkgdefs/SUNWn2cpact.v/Makefile usr/src/pkgdefs/SUNWn2cpact.v/depend usr/src/pkgdefs/SUNWn2cpact.v/pkginfo.tmpl usr/src/pkgdefs/SUNWn2cpact.v/prototype_com usr/src/pkgdefs/SUNWn2cpact.v/prototype_sparc usr/src/tools/scripts/bfu.sh usr/src/uts/Makefile.targ usr/src/uts/Makefile.uts |
| diffstat | 10 files changed, 14 insertions(+), 272 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/Makefile.master Thu Jul 02 15:41:03 2009 -0700 +++ b/usr/src/Makefile.master Thu Jul 02 16:15:03 2009 -0700 @@ -828,18 +828,12 @@ ELFSIGN_O= $(TRUE) ELFSIGN_CRYPTO= $(ELFSIGN_O) ELFSIGN_OBJECT= $(ELFSIGN_O) -ELFSIGN_CRYPTO_LIMITED= $(ELFSIGN_O) $(EXPORT_RELEASE_BUILD)ELFSIGN_O = $(ELFSIGN) $(EXPORT_RELEASE_BUILD)ELFSIGN_CFNAME = SUNWosnetCF $(EXPORT_RELEASE_BUILD)ELFSIGN_KEY = \ $(CLOSED)/cmd/cmd-crypto/etc/keys/$(ELFSIGN_CFNAME) $(EXPORT_RELEASE_BUILD)ELFSIGN_CERT= \ $(CLOSED)/cmd/cmd-crypto/etc/certs/$(ELFSIGN_CFNAME) -$(EXPORT_RELEASE_BUILD)ELFSIGN_CLNAME = SUNWosnetCFLimited -$(EXPORT_RELEASE_BUILD)ELFSIGN_KEY_LIMITED = \ - $(CLOSED)/cmd/cmd-crypto/etc/keys/$(ELFSIGN_CLNAME) -$(EXPORT_RELEASE_BUILD)ELFSIGN_CERT_LIMITED= \ - $(CLOSED)/cmd/cmd-crypto/etc/certs/$(ELFSIGN_CLNAME) $(EXPORT_RELEASE_BUILD)ELFSIGN_SENAME = SUNWosnetSE $(EXPORT_RELEASE_BUILD)ELFSIGN_SEKEY = \ $(CLOSED)/cmd/cmd-crypto/etc/keys/$(ELFSIGN_SENAME) @@ -848,10 +842,6 @@ $(EXPORT_RELEASE_BUILD)ELFSIGN_CRYPTO= $(ELFSIGN_O) sign \ $(ELFSIGN_FORMAT_OPTION) \ -k $(ELFSIGN_KEY) -c $(ELFSIGN_CERT) -e $@ -$(EXPORT_RELEASE_BUILD)ELFSIGN_CRYPTO_LIMITED= $(ELFSIGN_O) sign \ - $(ELFSIGN_FORMAT_OPTION) \ - -k $(ELFSIGN_KEY_LIMITED) -c $(ELFSIGN_CERT_LIMITED) \ - -e $@ $(EXPORT_RELEASE_BUILD)ELFSIGN_OBJECT= $(ELFSIGN_O) sign \ $(ELFSIGN_FORMAT_OPTION) \ -k $(ELFSIGN_SEKEY) -c $(ELFSIGN_SECERT) -e $@
--- a/usr/src/pkgdefs/Makefile Thu Jul 02 15:41:03 2009 -0700 +++ b/usr/src/pkgdefs/Makefile Thu Jul 02 16:15:03 2009 -0700 @@ -101,9 +101,6 @@ SUNWust2.v \ SUNWwbsd -sparc_XMODS= \ - SUNWn2cpact.v - i386_SUBDIRS= \ SUNWad810 \ SUNWadixp \
--- a/usr/src/pkgdefs/SUNWn2cpact.v/Makefile Thu Jul 02 15:41:03 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +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 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -include ../Makefile.com - -.KEEP_STATE: - -all: $(FILES) - -install: all pkg - -include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWn2cpact.v/depend Thu Jul 02 15:41:03 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +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 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -#ident "%Z%%M% %I% %E% SMI" -# -# This package information file defines software dependencies associated -# with the pkg. You can define three types of pkg dependencies with this file: -# P indicates a prerequisite for installation -# I indicates an incompatible package -# R indicates a reverse dependency -# <pkg.abbr> see pkginfo(4), PKG parameter -# <name> see pkginfo(4), NAME parameter -# <version> see pkginfo(4), VERSION parameter -# <arch> see pkginfo(4), ARCH parameter -# <type> <pkg.abbr> <name> -# (<arch>)<version> -# (<arch>)<version> -# ... -# <type> <pkg.abbr> <name> -# ... - -P SUNWcakr Core Solaris Kernel Architecture (Root) -P SUNWn2cp UltraSPARC-T2 Crypto Provider
--- a/usr/src/pkgdefs/SUNWn2cpact.v/pkginfo.tmpl Thu Jul 02 15:41:03 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +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 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -# -# This required package information file describes characteristics of the -# package, such as package abbreviation, full package name, package version, -# and package architecture. -# -PKG="SUNWn2cpact" -NAME="UltraSPARC-T2 Crypto Provider Activation File" -ARCH="sparc.sun4v" -VERSION="ONVERS,REV=0.0.0" -SUNW_PRODNAME="SunOS" -SUNW_PRODVERS="RELEASE/VERSION" -SUNW_PKGTYPE="root" -MAXINST="1000" -CATEGORY="system" -DESC="UltraSPARC-T2 Crypto Provider Activation File" -VENDOR="Sun Microsystems, Inc." -HOTLINE="Please contact your local service provider" -EMAIL="" -CLASSES="none" -BASEDIR=/ -SUNW_PKGVERS="1.0" -SUNW_PKG_ALLZONES="true" -SUNW_PKG_HOLLOW="true" -SUNW_PKG_THISZONE="false" -#VSTOCK="<reserved by Release Engineering for package part #>" -#ISTATES="<developer defined>" -#RSTATES='<developer defined>' -#ULIMIT="<developer defined>" -#ORDER="<developer defined>" -#PSTAMP="<developer defined>" -#INTONLY="<developer defined>"
--- a/usr/src/pkgdefs/SUNWn2cpact.v/prototype_com Thu Jul 02 15:41:03 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +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 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# -# This required package information file contains a list of package contents. -# The 'pkgmk' command uses this file to identify the contents of a package -# and their location on the development machine when building the package. -# Can be created via a text editor or through use of the 'pkgproto' command. -# - -#!search <pathname pathname ...> # where to find pkg objects -#!include <filename> # include another 'prototype' file -#!default <mode> <owner> <group> # default used if not specified on entry -#!<param>=<value> # puts parameter in pkg environment - -# packaging files -i pkginfo -i copyright -i depend -# -# source locations relative to the prototype file -# -# SUNWn2cpact.v -# -d none platform 755 root sys -d none platform/sun4v 755 root sys -d none platform/sun4v/kernel 755 root sys -d none platform/sun4v/kernel/drv 755 root sys -d none platform/sun4v/kernel/drv/sparcv9 755 root sys -f none platform/sun4v/kernel/drv/sparcv9/n2cp.esa 644 root sys
--- a/usr/src/pkgdefs/SUNWn2cpact.v/prototype_sparc Thu Jul 02 15:41:03 2009 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,48 +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 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# -# This required package information file contains a list of package contents. -# The 'pkgmk' command uses this file to identify the contents of a package -# and their location on the development machine when building the package. -# Can be created via a text editor or through use of the 'pkgproto' command. -# - -#!search <pathname pathname ...> # where to find pkg objects -#!include <filename> # include another 'prototype' file -#!default <mode> <owner> <group> # default used if not specified on entry -#!<param>=<value> # puts parameter in pkg environment - -# -# Include ISA independent files (prototype_com) -# -!include prototype_com -# -# List files which are SPARC specific here -# -# source locations relative to the prototype file -# -# SUNWn2cpact.v -#
--- a/usr/src/tools/scripts/bfu.sh Thu Jul 02 15:41:03 2009 -0700 +++ b/usr/src/tools/scripts/bfu.sh Thu Jul 02 16:15:03 2009 -0700 @@ -3893,9 +3893,12 @@ print "\n" } -remove_eof_SUNWcry() +crypto_cleanup() { - print "SUNWcry/SUNWcryr removal cleanup...\n" + # This function will remove no longer needed cryptography + # related packages. + + print "SUNWcry, SUNWcryr, SUNWn2cpact.v removal cleanup...\n" # This clean up of ipsecalgs is not directly related to the EOF # of SUNWcry and SUWNcryr, but due to mistakes in this file seen @@ -3913,7 +3916,7 @@ mv -f ${ipsecalgs}.tmp $ipsecalgs # Packages to remove. - typeset -r sunwcry_pkgs='SUNWcry SUNWcryr' + typeset -r crypt_pkgs='SUNWcry SUNWcryr SUNWn2cpact.v' typeset pkg # @@ -3922,7 +3925,7 @@ # in the packages being removed should be run even if they # will run as root. - typeset -r admfile='/tmp/sunwcry_eof.$$' + typeset -r admfile='/tmp/crypt_eof.$$' cat > $admfile <<- EOF mail= instance=overwrite @@ -3938,7 +3941,7 @@ EOF printf ' Removing packages...' - for pkg in $sunwcry_pkgs + for pkg in $crypt_pkgs do if pkginfo $pkgroot -q $pkg; then printf ' %s' $pkg @@ -3989,6 +3992,10 @@ rm -f $rootprefix/usr/sfw/lib/libssl_extra.so.0.9.8 rm -f $rootprefix/usr/sfw/lib/libcrypto_extra.so.0.9.8 + # SUNWn2cpact.v contents go away, if pkgrm didn't take + # care of them + rm -f $rootprefix/platform/sun4v/kernel/drv/sparcv9/n2cp.esa + print "\n" } @@ -7992,8 +7999,8 @@ done # - # Remove EOF SUNWcry/SUNWcryr - remove_eof_SUNWcry + # Remove EOF Crypto packages + crypto_cleanup # Add uCF's metaslot feature if [ -f $rootprefix/etc/crypto/pkcs11.conf ] ; then
--- a/usr/src/uts/Makefile.targ Thu Jul 02 15:41:03 2009 -0700 +++ b/usr/src/uts/Makefile.targ Thu Jul 02 16:15:03 2009 -0700 @@ -270,12 +270,6 @@ $(INS.conffile) # -# Targets for '.esa' (activation) file installation. -# -$(ROOT_ACTFILE): - $(INS.actfile) - -# # Targets for creating links between common platforms. ROOT_PLAT_LINKS # are are the /platform level while ROOT_PLAT_LINKS_2 are one level # down (/platform/`uname -i`/{lib|sbin|kernel}.
--- a/usr/src/uts/Makefile.uts Thu Jul 02 15:41:03 2009 -0700 +++ b/usr/src/uts/Makefile.uts Thu Jul 02 16:15:03 2009 -0700 @@ -291,18 +291,12 @@ ROOT_CONFFILE_64 = $(ROOTMODULE:%/$(SUBDIR64)/$(MODULE)=%/$(MODULE)).conf ROOT_CONFFILE = $(ROOT_CONFFILE_$(CLASS)) -$(EXPORT_RELEASE_BUILD)ROOT_ACTFILE = $(ROOTMODULE).esa - INS.conffile= \ $(RM) $@; $(INS) -s -m $(CFILEMODE) -f $(@D) $(SRC_CONFFILE) $(CH)INS.conffile= \ $(INS) -s -m $(CFILEMODE) -u $(OWNER) -g $(GROUP) -f $(@D) $(SRC_CONFFILE) -INS.actfile= \ - $(RM) $@; $(INS) -s -m $(CFILEMODE) -f $(@D) $(BINARY).esa -$(CH)INS.actfile= \ - $(INS) -s -m $(CFILEMODE) -u $(OWNER) -g $(GROUP) -f $(@D) $(BINARY).esa # # The CTF merge of child kernel modules is performed against one of the genunix