From 5c60adfb7915647f372e2ddb0c4b967d3d03f779 Mon Sep 17 00:00:00 2001 From: Richard Lowe Date: Wed, 24 Jan 2018 20:02:15 +0000 Subject: [PATCH] 8990 /opt/onbld/gk is useless Reviewed by: Toomas Soome Reviewed by: Peter Tribble Reviewed by: Andy Fiddaman Approved by: Dan McDonald --- usr/src/pkg/manifests/developer-build-onbld.mf | 4 -- usr/src/tools/Makefile | 2 - usr/src/tools/Makefile.tools | 9 ---- usr/src/tools/README.tools | 14 +----- usr/src/tools/gk/Makefile | 50 ------------------- usr/src/tools/gk/cshrc.sh | 53 -------------------- usr/src/tools/gk/gen_make.machines.sh | 48 ------------------ usr/src/tools/gk/login.sh | 69 -------------------------- 8 files changed, 2 insertions(+), 247 deletions(-) delete mode 100644 usr/src/tools/gk/Makefile delete mode 100644 usr/src/tools/gk/cshrc.sh delete mode 100644 usr/src/tools/gk/gen_make.machines.sh delete mode 100644 usr/src/tools/gk/login.sh diff --git a/usr/src/pkg/manifests/developer-build-onbld.mf b/usr/src/pkg/manifests/developer-build-onbld.mf index 8d861f2366..ed7db1bb3e 100644 --- a/usr/src/pkg/manifests/developer-build-onbld.mf +++ b/usr/src/pkg/manifests/developer-build-onbld.mf @@ -47,7 +47,6 @@ dir path=opt/onbld/bin/$(ARCH) dir path=opt/onbld/env dir path=opt/onbld/etc dir path=opt/onbld/etc/exception_lists -dir path=opt/onbld/gk dir path=opt/onbld/lib dir path=opt/onbld/lib/$(ARCH) dir path=opt/onbld/lib/$(ARCH)/64 @@ -140,9 +139,6 @@ file path=opt/onbld/etc/exception_lists/interface_cmp file path=opt/onbld/etc/hgstyle file path=opt/onbld/etc/its.conf file path=opt/onbld/etc/its.reg -file path=opt/onbld/gk/.cshrc -file path=opt/onbld/gk/.login -file path=opt/onbld/gk/gen_make.machines mode=0755 file path=opt/onbld/lib/$(ARCH)/64/libmakestate.so.1 file path=opt/onbld/lib/$(ARCH)/libdwarf.so.1 file path=opt/onbld/lib/$(ARCH)/libmakestate.so.1 diff --git a/usr/src/tools/Makefile b/usr/src/tools/Makefile index 573e407036..faa8aa4705 100644 --- a/usr/src/tools/Makefile +++ b/usr/src/tools/Makefile @@ -42,7 +42,6 @@ COMMON_SUBDIRS= \ depcheck \ env \ findunref \ - gk \ install.bin \ lintdump \ make \ @@ -109,7 +108,6 @@ ROOTDIRS= \ $(ROOTONBLD)/etc \ $(ROOTONBLD)/etc/exception_lists \ $(ROOTONBLD)/share \ - $(ROOTONBLD)/gk \ $(ROOTONBLD)/man \ $(ROOTONBLD)/man/man1onbld diff --git a/usr/src/tools/Makefile.tools b/usr/src/tools/Makefile.tools index 2b6cf225ca..8ca9845018 100644 --- a/usr/src/tools/Makefile.tools +++ b/usr/src/tools/Makefile.tools @@ -40,7 +40,6 @@ ROOTONBLDLIBMACH64= $(ROOTONBLD)/lib/$(MACH)/64 ROOTONBLDLIBPERL= $(ROOTONBLD)/lib/perl ROOTONBLDLIBPY= $(ROOTONBLD)/lib/python ROOTONBLDENV= $(ROOTONBLD)/env -ROOTONBLDGK= $(ROOTONBLD)/gk ROOTONBLDMAN= $(ROOTONBLD)/man ROOTONBLDMAN1ONBLD= $(ROOTONBLD)/man/man1onbld ROOTONBLDETCABI= $(ROOTONBLD)/etc/abi @@ -61,8 +60,6 @@ ROOTONBLDMACHSHFILES= $(SHFILES:%=$(ROOTONBLDBINMACH)/%) ROOTONBLDMACHBINARIES= $(BINARIES:%=$(ROOTONBLDBINMACH)/%) ROOTONBLDETCFILES= $(ETCFILES:%=$(ROOTONBLDETC)/%) ROOTONBLDENVFILES= $(ENVFILES:%=$(ROOTONBLDENV)/%) -ROOTONBLDGKFILES= $(GKFILES:%=$(ROOTONBLDGK)/.%) -ROOTONBLDGKSHFILES= $(SHFILES:%=$(ROOTONBLDGK)/%) ROOTONBLDPERLFILES= $(PERLFILES:%=$(ROOTONBLDBIN)/%) ROOTONBLDPERLMODULES= $(PERLMODULES:%=$(ROOTONBLDLIBPERL)/%) ROOTONBLDPYFILES= $(PYFILES:%=$(ROOTONBLDBIN)/%) @@ -96,9 +93,3 @@ $(ROOTONBLDMAN1ONBLD)/%: % $(ROOTONBLDENV)/%: % $(INS.file) - -$(ROOTONBLDGK)/.%: % - $(INS.rename) - -$(ROOTONBLDGK)/%: % - $(INS.file) diff --git a/usr/src/tools/README.tools b/usr/src/tools/README.tools index 59f66a1fb6..4980bf0d2d 100644 --- a/usr/src/tools/README.tools +++ b/usr/src/tools/README.tools @@ -25,13 +25,7 @@ This directory contains the tools used to do a full build of the OS/Net workspace. They usually live in the /opt/onbld directory on build machines. From here, 'make install' will build and install the tools -in $ROOT/opt/onbld. If you like, 'make pkg' will build the SUNWonbld -package in $(PKGARCHIVE). Installing that package will populate the -/opt/onbld directory, and create a root account for building called 'gk', -which uses csh and has a home directory of /opt/onbld/gk. You can -use this account to do full builds with 'nightly'. You don't have to, -but the 'gk' account has the path setup properly, has a .make.machines -file for dmake, and has a .login that sets up for dmake. +in $ROOT/opt/onbld. Layout of /opt/onbld -------------------- @@ -40,9 +34,6 @@ Layout of /opt/onbld contains Solaris ABI database (ABI_*.db) and exceptions for ABI Auditing tool (interface_check, interface_cmp). -/opt/onbld/gk - gk account's home directory. - /opt/onbld/bin basic bin directory - contains scripts. @@ -279,8 +270,7 @@ How to do a full build edit the file and tailor it to your workspace. Remember that this file is a shell script, so it can do more than set environment variables. -2. Login as 'gk' (or root, but your PATH and .make.machines for dmake will - not be right). Run 'nightly' and give it your environment file as an +2. Run 'nightly' and give it your environment file as an option. 'nightly' will first look for your environment file in /opt/onbld/env, and if it's not there then it will look for it as an absolute or relative path. Some people put their environment files in diff --git a/usr/src/tools/gk/Makefile b/usr/src/tools/gk/Makefile deleted file mode 100644 index 0ba98fd187..0000000000 --- a/usr/src/tools/gk/Makefile +++ /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 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# - -GKFILES= \ - cshrc \ - login - -SHFILES = gen_make.machines -ROOTONBLDGKSHFILES = $(SHFILES) - -CLEANFILES += $(GKFILES) $(SHFILES) - -include ../Makefile.tools - -.KEEP_STATE: - -FILEMODE = 0644 -$(ROOTONBLDGKSHFILES):= FILEMODE= 755 - -all: $(GKFILES) $(SHFILES) - -install: all .WAIT $(ROOTONBLDGKFILES) \ - $(ROOTONBLDGKSHFILES) - -clean: - $(RM) $(CLEANFILES) - -include ../Makefile.targ diff --git a/usr/src/tools/gk/cshrc.sh b/usr/src/tools/gk/cshrc.sh deleted file mode 100644 index a058f3737f..0000000000 --- a/usr/src/tools/gk/cshrc.sh +++ /dev/null @@ -1,53 +0,0 @@ -# -# 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 -# -# -# Copyright (c) 1993-1998 by Sun Microsystems, Inc. -# All rights reserved. -# -#ident "%Z%%M% %I% %E% SMI" -# -# example .cshrc for root build user (often 'gk'). - -set filec -set history=100 -set noclobber -set ignoreeof -set notify - -unset nse1 -unset nse2 - -umask 002 - -# if ($?USER == 0 || $?prompt == 0) exit - -alias ls "ls -aF" - -if ( ! $?HOSTNAME ) then - setenv HOSTNAME `uname -n` -endif - -if ( ! $?TERM ) then - setenv TERM sun -endif - -set prompt="{${USER}:${HOSTNAME}:\!} " diff --git a/usr/src/tools/gk/gen_make.machines.sh b/usr/src/tools/gk/gen_make.machines.sh deleted file mode 100644 index 8d3fc4d9b8..0000000000 --- a/usr/src/tools/gk/gen_make.machines.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/ksh93 -# -# 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 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# script to generate example .make.machines for build users -# - - -PATH=/usr/bin:/usr/sbin - -THISHOST=$(uname -n) - -cpus=$(psrinfo | grep on-line | wc -l) -max=$(((cpus + 1) * 2)) - -EXISTING=$(grep "^$THISHOST" $HOME/.make.machines |awk -F"=" '{print $2}') - -if [[ -n "$EXISTING" ]] then - printf "Your existing \$HOME/.make.machines has a concurrency " - printf "setting of $EXISTING for host\n" - printf "$THISHOST. If you wish to change the setting then this " - printf "script suggests\nsetting concurrency to $max for a single-user " - printf "machine. Multi-user machines might\nrequire different values.\n" -else - printf "$THISHOST max=$max\n" >> $HOME/.make.machines - printf "dmake concurrency for host $THISHOST set to $max.\n" -fi diff --git a/usr/src/tools/gk/login.sh b/usr/src/tools/gk/login.sh deleted file mode 100644 index f623467520..0000000000 --- a/usr/src/tools/gk/login.sh +++ /dev/null @@ -1,69 +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" -# -# example .login for root build user (often 'gk'). -# sets up for potential dmake use in parallel-make mode - -unset ignoreeof -umask 002 -stty erase  werase  kill  intr  - -setenv NIS_PATH 'org_dir.$:$' -setenv EDITOR /usr/bin/vi -setenv MACH `uname -p` - -set noglob; eval `/usr/ucb/tset -Q -s -e -k - -m dialup:vt102`; unset noglob -setenv MANPATH /usr/man:/usr/local/man:/usr/local/doctools/man:/opt/onbld/man -setenv DMAKE_MODE parallel -set hostname=`uname -n` -if ( ! -f ~/.make.machines ) then - set maxjobs=4 -else - set maxjobs="`grep $hostname ~/.make.machines | tail -1 | awk -F= '{print $ 2;}'`" - if ( "$maxjobs" == "" ) then - set maxjobs=4 - endif -endif -setenv DMAKE_MAX_JOBS $maxjobs - - -set path=( \ - /opt/onbld/bin \ - /opt/onbld/bin/${MACH} \ - /opt/SUNWspro/bin \ - /opt/teamware/bin \ - /usr/ccs/bin \ - /usr/proc/bin \ - /usr/openwin/bin \ - /bin \ - /usr/bin \ - /usr/sbin \ - /sbin \ - /usr/local/bin \ - /usr/ucb \ - /etc \ - /usr/etc \ -) -- 2.11.4.GIT