diff options
| -rw-r--r-- | README | 42 | ||||
| -rw-r--r-- | TODO | 71 | ||||
| -rw-r--r-- | exception_lists/closed-bins | 42 | ||||
| -rw-r--r-- | exception_lists/packaging | 24 | ||||
| -rw-r--r-- | exception_lists/packaging.closed | 50 | ||||
| -rw-r--r-- | exception_lists/packaging.ihv | 39 | ||||
| -rw-r--r-- | exception_lists/packaging.open | 65 | ||||
| -rw-r--r-- | usr/src/Makefile | 5 | ||||
| -rw-r--r-- | usr/src/Makefile.master | 1 | ||||
| -rw-r--r-- | usr/src/Targetdirs | 3 | ||||
| -rw-r--r-- | usr/src/lib/pkcs11/libpkcs11/Makefile.com | 2 | ||||
| -rw-r--r-- | usr/src/lib/pkcs11/libpkcs11/common/pkcs11Conf.c | 1 | ||||
| -rw-r--r-- | usr/src/pkg/Makefile | 10 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/SUNWcs.mf | 3 | ||||
| -rw-r--r-- | usr/src/tools/scripts/checkpaths.sh | 5 | ||||
| -rw-r--r-- | usr/src/tools/scripts/nightly.sh | 5 | ||||
| -rw-r--r-- | usr/src/uts/common/io/ib/inc.flg | 2 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/io/pciex/inc.flg | 2 |
18 files changed, 87 insertions, 285 deletions
@@ -1,32 +1,33 @@ -Illumos Gate README - July 29, 2010. +illumos gate README - Sept 12, 2010. -This is the Illumos gate. It contains the following subdirectories: +This is the illumos gate. This is the illumos source tree. It contains +the following subdirectories: - - usr/src -- this is a clone (with changes) of the Oracle ONNV gate. - We should avoid making too many disruptive changes here. It - will be periodically synced with ONNV. + usr/src - The actual source code - - usr/illumos -- this is the set of bits that we deliver, which are not - yet integrated into the onnv tree. This may include various - testing bits, etc. These bits (for whatever reason), are things - that we think are inappropriate for inclusion in the upstream and - really are specific to illumos. + exception_lists - These are lists of exceptional cases + used to limit noise during builds. + Ideally this directory would consist of + only empty files. Integration Rules: - All changes must have been reviewed, and (for the interim only!) - approved by the gatekeeper (below). A code review may be performed - by someone other than the gatekeeper, but the final integration should - still be approved by the gatekeeper. (Think CRT advocate for now.) - The gatekeeper will want to see your webrev and hg outgoing -v. + All changes must have been reviewed, and approved by and advocate + (below). A code review may be performed by someone other than the + advocate, but the final integration should still be approved by the + advocate. + + The advocate will want to see your webrev and hg outgoing -v. The + advocate will also ask about your testing, and may ask to see your + build logs. All changes must adhere to typical ON style and quality rules. For example, pass full cstyle, applicable lint rules, etc. - All commits must include either a CDDL or BSD/MIT license, unless - approved otherwise by the gatekeeper. CDDL licensed changes must - be backed by a Sun Contributor Agreement, so that the changes can - be contributed to the upstream OpenSolaris consolidation. + All commits must include either a CDDL license, unless + approved otherwise by the gatekeeper, or the modified code + already carries a different license. Exceptions shall require + the approval of the gatekeeper. Hg commits should have comments of the following form: @@ -35,6 +36,9 @@ Integration Rules: Reviewed by: codereviewer@somewhere.net Approved by: gatekeeper@somewhere.else.com + Each commit must have at least one bug id that is listed in the + illumos-gate project at www.illumos.org. + Branches: Please talk to the gatekeeper about personal branches. In general, @@ -1,71 +0,0 @@ - -These are the following bits that were closed source, for which we need -open replacements: - -libc_i18n -- This is probably the most critical part. We should be able to - leverage code from one of the BSDs. - -drivers -- - glm Legacy Symbios/NCR SCSI - ncrs Legacy Symbios/NCR SCSI (EOF? Merge with glm?) - mpt LSI 1068 style SCSI - bcm_sata Broadcom HT-1000 SATA - marvell88sx Marvell SATA - iprb Intel Pro/100 ethernet - ixgb Intel 10GbE (1st gen?) - pcn AMD PC-Net (questionable value) - spwr SMC EPIC/100 (questionable value) - lsimega Mega-RAID - acpi_toshiba Toshiba Tecra M-series ACPI extensions - intel_nhm - intel_nhmex - intel_nb5000 - adpu320 ADP UltraSCSI 320 - bmc IPMI BMC controller -- (OpenIPMI instead?) - bnx Broadcom 1GbE - bnxe Broadcom 10GbE (not sure the difference) - pcser PCMCIA Serial support (questionable value) - se Serial support on legacy SPARC h/w - ce Cassini gigE - ge Sun GEM gigE (derive from eri) - cpqary3 Compaq HBA? - klmmod NFS lock manager - usbser_edge Edgeport USB serial - llc2 LLC2 STREAMS module (not needed?) - Others? - -Platform support: - Various SPARC platform bits - -Crypto: - kcfd -- the crypto framework daemon, implements module signing - ike -- maybe ikev2 (Racoon) - -Commands: - more - sed - tail - patch - printf - pax (Not critical?) - others? - localedef - iconv - snmpd ? - labeld ? - fwflash modules - -Others? - raidcfg plugins? - - -There are other tasks we would like to see done: - - * Support for alternative compilers (gcc, including boot up) - * Self hosting (be able to compile with minimal cross dependencies) - * Increase lint coverage - * Increase 64-bit cleanliness - * Overall Makefile cleanup - -Some of these tasks may conflict with overall goals to minimize differences -with upstream. So that will need to be discussed. diff --git a/exception_lists/closed-bins b/exception_lists/closed-bins new file mode 100644 index 0000000000..3d3f230a27 --- /dev/null +++ b/exception_lists/closed-bins @@ -0,0 +1,42 @@ +./etc/init.d/llc2 +./etc/rc1.d/K52llc2 +./etc/rc0.d/K52llc2 +./etc/rcS.d/K52llc2 +./etc/llc2 +./etc/llc2/llc2_start.default +./etc/rc2.d/S40llc2 +./lib/crypto/kcfd +./lib/libc_i18n.a +./lib/amd64/libc_i18n.a +./lib/sparcv9/libc_i18n.a +./usr/kernel/drv/amd64/llc2 +./usr/kernel/drv/sparcv9/llc2 +./usr/kernel/drv/llc2.conf +./usr/kernel/drv/llc2 +./usr/lib/llc2 +./usr/lib/llc2/llc2_config +./usr/lib/llc2/llc2_loop3 +./usr/lib/llc2/llc2_autoconfig +./usr/lib/llc2/llc2_loop4 +./usr/lib/llc2/llc2_stats +./usr/lib/llc2/llc2_tparser +./usr/lib/llc2/llc2_tcap +./usr/lib/llc2/llc2_loop2 +./usr/lib/locale/iso_8859_1 +./usr/lib/locale/iso_8859_1/LC_CTYPE +./usr/lib/locale/iso_8859_1/amd64 +./usr/lib/locale/iso_8859_1/sparcv9 +./usr/lib/locale/C/locale_description +./usr/lib/localedef +./usr/lib/localedef/extensions +./usr/lib/localedef/extensions/generic_eucbc.x +./usr/lib/localedef/extensions/single_byte.x +./usr/lib/localedef/src +./usr/lib/localedef/src/iso_8859_1 +./usr/lib/localedef/src/iso_8859_1/charmap.src +./usr/lib/localedef/src/iso_8859_1/extension.src +./usr/lib/localedef/src/iso_8859_1/localedef.src +./usr/bin/localedef +./usr/bin/tr +./usr/xpg4/bin/tr +./usr/xpg6/bin/tr diff --git a/exception_lists/packaging b/exception_lists/packaging index 062daa4267..dd766b95ea 100644 --- a/exception_lists/packaging +++ b/exception_lists/packaging @@ -526,13 +526,6 @@ usr/include/sys/mdesc_impl.h sparc usr/platform/sun4v/include/sys/mach_descrip.h sparc # # The following files are installed in the proto area by the build of -# libc_i18n. libc_i18n.a is used only when linking libc.so.1. -# -lib/libc_i18n.a -lib/amd64/libc_i18n.a i386 -lib/sparcv9/libc_i18n.a sparc -# -# The following files are installed in the proto area by the build of # libpcp. libpcp contains interfaces which are all private. # Only the shared object is shipped. # @@ -947,3 +940,20 @@ licenses # Libbe is private # usr/include/libbe_priv.h +# +# Exception List for packaging during an open-only build - I'm not +# sure why we even have dprov given that it isn't packaged. It looks +# like it exists to emulate a real hardware provider probably for test. +# +kernel/crypto/amd64/dprov i386 +kernel/crypto/dprov i386 +kernel/crypto/sparcv9/dprov sparc +kernel/drv/amd64/dprov i386 +kernel/drv/dprov i386 +kernel/drv/dprov.conf +kernel/drv/sparcv9/dprov sparc +# +# Probably we should nuke this one, along with any other vestiges of +# ksh88. +# +usr/has/bin/pfksh diff --git a/exception_lists/packaging.closed b/exception_lists/packaging.closed deleted file mode 100644 index 6541b19dd7..0000000000 --- a/exception_lists/packaging.closed +++ /dev/null @@ -1,50 +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 (c) 2010, Oracle and/or its affiliates. All rights reserved. -# - -# -# Exception List for packaging of closed source objects -# - -usr/include/nfs/lm_impl.h -usr/include/nfs/lm_nlm.h -usr/include/nfs/lm_server.h -usr/include/sys/llc2.h - -usr/include/ike - -# -# bmc (IPMI) interfaces shared within ON. -# -usr/include/sys/bmc_cmd.h - -# closed HBA header files -usr/include/sys/scsi/adapters/glmreg.h sparc -usr/include/sys/scsi/adapters/glmvar.h sparc -usr/include/sys/scsi/adapters/mptreg.h sparc -usr/include/sys/scsi/adapters/mptvar.h sparc -usr/include/sys/scsi/adapters/quscmd.h sparc -usr/include/sys/scsi/adapters/qusmail.h sparc -usr/include/sys/scsi/adapters/qusreg.h sparc -usr/include/sys/scsi/adapters/qusvar.h sparc diff --git a/exception_lists/packaging.ihv b/exception_lists/packaging.ihv deleted file mode 100644 index 57e2a0949d..0000000000 --- a/exception_lists/packaging.ihv +++ /dev/null @@ -1,39 +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 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -# -# Exception List for packaging during an ihv-copy build -# - -kernel/drv/adp i386 -kernel/drv/adp.conf i386 -kernel/drv/cadp i386 -kernel/drv/cadp.conf i386 -kernel/drv/cpqhpc i386 -kernel/drv/cpqhpc.conf i386 -platform/i86pc/kernel/drv/amd64/cadp160 i386 -platform/i86pc/kernel/drv/cadp160 i386 -platform/i86pc/kernel/drv/cadp160.conf i386 diff --git a/exception_lists/packaging.open b/exception_lists/packaging.open deleted file mode 100644 index 98c6bc7166..0000000000 --- a/exception_lists/packaging.open +++ /dev/null @@ -1,65 +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 (c) 2010, Oracle and/or its affiliates. All rights reserved. -# - -# -# Exception List for packaging during an open-only build -# - -kernel/crypto/amd64/dprov i386 -kernel/crypto/dprov i386 -kernel/crypto/sparcv9/dprov sparc -kernel/drv/amd64/dprov i386 -kernel/drv/dprov i386 -kernel/drv/dprov.conf -kernel/drv/sparcv9/dprov sparc - -usr/has/bin/pfksh - -# -# we don't deliver these closed bits anymore... this -# list can go away once we purge closed from illumos entirely. -# -# llc2 -etc/init.d/llc2 -etc/llc2 -etc/llc2/default -etc/llc2/llc2_start.default -etc/rc0.d/K52llc2 -etc/rc1.d/K52llc2 -etc/rc2.d/S40llc2 -etc/rcS.d/K52llc2 -usr/kernel/drv/llc2 i386 -usr/kernel/drv/amd64/llc2 i386 -usr/kernel/drv/sparcv9/llc2 sparc -usr/kernel/drv/llc2.conf -usr/lib/llc2 -usr/lib/llc2/llc2_autoconfig -usr/lib/llc2/llc2_config -usr/lib/llc2/llc2_loop2 -usr/lib/llc2/llc2_loop3 -usr/lib/llc2/llc2_loop4 -usr/lib/llc2/llc2_stats -usr/lib/llc2/llc2_tcap -usr/lib/llc2/llc2_tparser diff --git a/usr/src/Makefile b/usr/src/Makefile index 3322c85431..0bcd5533ce 100644 --- a/usr/src/Makefile +++ b/usr/src/Makefile @@ -136,8 +136,9 @@ closedbins: FRC $(ROOTDIRS) exit 1; \ fi; \ $(ECHO) "Copying closed binaries from $$CLOSED_ROOT"; \ - (cd $$CLOSED_ROOT; tar cf - .) | \ - (cd $(ROOT); tar xBpf -); \ + (cd $$CLOSED_ROOT; \ + $(TAR) cfX - $(CODEMGR_WS)/exception_lists/closed-bins .) | \ + (cd $(ROOT); $(TAR) xBpf -); \ fi # diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master index b884aa261e..8ef4f464c3 100644 --- a/usr/src/Makefile.master +++ b/usr/src/Makefile.master @@ -187,6 +187,7 @@ ELFEDIT= /usr/bin/elfedit ELFSIGN= /usr/bin/elfsign DTRACE= /usr/sbin/dtrace UNIQ= /usr/bin/uniq +TAR= /usr/bin/tar FILEMODE= 644 DIRMODE= 755 diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs index d50cd3776a..abf5503457 100644 --- a/usr/src/Targetdirs +++ b/usr/src/Targetdirs @@ -276,9 +276,6 @@ DIRS= \ /usr/lib/krb5 \ /usr/lib/link_audit \ /usr/lib/libp \ - /usr/lib/localedef \ - /usr/lib/localedef/extensions \ - /usr/lib/localedef/src \ /usr/lib/lwp \ /usr/lib/mdb \ /usr/lib/mdb/kvm \ diff --git a/usr/src/lib/pkcs11/libpkcs11/Makefile.com b/usr/src/lib/pkcs11/libpkcs11/Makefile.com index e5921da349..bf99fa50df 100644 --- a/usr/src/lib/pkcs11/libpkcs11/Makefile.com +++ b/usr/src/lib/pkcs11/libpkcs11/Makefile.com @@ -68,7 +68,7 @@ INCDIR= ../../include LIBS = $(DYNLIB) $(LINTLIB) $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC) -LDLIBS += -lcryptoutil -lc -lscf +LDLIBS += -lcryptoutil -lc CFLAGS += $(CCVERBOSE) CPPFLAGS += -I$(INCDIR) -I$(SRCDIR) -D_REENTRANT diff --git a/usr/src/lib/pkcs11/libpkcs11/common/pkcs11Conf.c b/usr/src/lib/pkcs11/libpkcs11/common/pkcs11Conf.c index 36ef98d6d7..dd66f6b808 100644 --- a/usr/src/lib/pkcs11/libpkcs11/common/pkcs11Conf.c +++ b/usr/src/lib/pkcs11/libpkcs11/common/pkcs11Conf.c @@ -36,7 +36,6 @@ #include <errno.h> #include <pthread.h> #include <sys/mman.h> -#include <libscf.h> #include <sys/crypto/elfsign.h> #include <cryptoutil.h> diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile index ee7f7b3769..3e1538a8d0 100644 --- a/usr/src/pkg/Makefile +++ b/usr/src/pkg/Makefile @@ -107,9 +107,6 @@ PKGDEST= $(PKGDEST.cmd:sh) # This matches the conditions under which the internal key and cert # are needed for the packaged objects. # -# We use X_FLAG, as exported by nightly and bldenv, to decide when we -# need IHV-related exceptions for protocmp. -# $(CLOSED_BUILD)OPEN_ONLY_BUILD= $(POUND_SIGN) USE_INTERNAL_CRYPTO= $(POUND_SIGN) @@ -119,15 +116,8 @@ $(CLOSED_BUILD)USE_INTERNAL_CRYPTO= $(UI1)$(UI2) USE_SIGNED_CRYPTO= $(USE_INTERNAL_CRYPTO)USE_SIGNED_CRYPTO= $(POUND_SIGN) -X_FLAG= n -IHV_COPY_BUILD1= $(X_FLAG:n%=$(POUND_SIGN)%) -IHV_COPY_BUILD= $(IHV_COPY_BUILD1:y%=%) - EXCEPTIONS= packaging -$(CLOSED_BUILD)EXCEPTIONS += packaging.closed -$(OPEN_ONLY_BUILD)EXCEPTIONS += packaging.open -$(IHV_COPY_BUILD)EXCEPTIONS += packaging.ihv PKGMOGRIFY= pkgmogrify diff --git a/usr/src/pkg/manifests/SUNWcs.mf b/usr/src/pkg/manifests/SUNWcs.mf index 0c4f9a851b..94fda1400d 100644 --- a/usr/src/pkg/manifests/SUNWcs.mf +++ b/usr/src/pkg/manifests/SUNWcs.mf @@ -1248,9 +1248,6 @@ file path=usr/lib/isaexec mode=0555 file path=usr/lib/kssladm mode=0555 $(sparc_ONLY)file path=usr/lib/ld.so file path=usr/lib/libshare.so.1 -file path=usr/lib/locale/C/locale_description mode=0444 -file path=usr/lib/localedef/extensions/generic_eucbc.x mode=0444 -file path=usr/lib/localedef/extensions/single_byte.x mode=0444 file path=usr/lib/makekey mode=0555 file path=usr/lib/more.help file path=usr/lib/newsyslog group=sys mode=0555 diff --git a/usr/src/tools/scripts/checkpaths.sh b/usr/src/tools/scripts/checkpaths.sh index b3227c8b72..7582e728dd 100644 --- a/usr/src/tools/scripts/checkpaths.sh +++ b/usr/src/tools/scripts/checkpaths.sh @@ -91,11 +91,6 @@ do # from the repository-wide exception_lists/ directory. # e="$CODEMGR_WS/exception_lists/packaging" - if [ "$CLOSED_IS_PRESENT" = "yes" ]; then - e="$e $CODEMGR_WS/exception_lists/packaging.closed" - else - e="$e $CODEMGR_WS/exception_lists/packaging.open" - fi for f in $e; do if [ -f $f ]; then nawk 'NF == 1 || /[ ]\+'$arch'$/ { print; }' \ diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh index ac20b31291..3d75ae04d6 100644 --- a/usr/src/tools/scripts/nightly.sh +++ b/usr/src/tools/scripts/nightly.sh @@ -2774,11 +2774,6 @@ if [ "$build_ok" = "y" ]; then f2= if [ -d "$SRC/pkg" ]; then f2="$f2 exceptions/packaging" - if [ "$CLOSED_IS_PRESENT" = "no" ]; then - f2="$f2 exceptions/packaging.open" - else - f2="$f2 exceptions/packaging.closed" - fi fi for f in $f2; do diff --git a/usr/src/uts/common/io/ib/inc.flg b/usr/src/uts/common/io/ib/inc.flg index 0594e95ace..19641d2763 100644 --- a/usr/src/uts/common/io/ib/inc.flg +++ b/usr/src/uts/common/io/ib/inc.flg @@ -138,6 +138,4 @@ echo_file usr/src/cmd/Makefile.cmd echo_file usr/src/cmd/Makefile.targ echo_file usr/src/pkg/Makefile echo_file exception_lists/packaging -echo_file exception_lists/packaging.closed -echo_file exception_lists/packaging.open find_files "s.*" usr/src/common/mapfiles diff --git a/usr/src/uts/i86pc/io/pciex/inc.flg b/usr/src/uts/i86pc/io/pciex/inc.flg index acb99ac40b..f4dabc3144 100644 --- a/usr/src/uts/i86pc/io/pciex/inc.flg +++ b/usr/src/uts/i86pc/io/pciex/inc.flg @@ -114,6 +114,4 @@ echo_file usr/src/cmd/Makefile.cmd echo_file usr/src/cmd/Makefile.targ echo_file usr/src/pkg/Makefile echo_file exception_lists/packaging -echo_file exception_lists/packaging.closed -echo_file exception_lists/packaging.open find_files "s.*" usr/src/common/mapfiles |