Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src config and genassym are not sysadmin tools, they are develop...



details:   https://anonhg.NetBSD.org/src/rev/4baa9ec6d7c0
branches:  trunk
changeset: 581783:4baa9ec6d7c0
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Jun 05 18:19:52 2005 +0000

description:
config and genassym are not sysadmin tools, they are development tools.
As such, they don't belong in /usr/sbin, but rather /usr/bin.  Move them
there.

diffstat:

 distrib/sets/lists/comp/mi    |    20 +-
 tools/config/Makefile         |     4 +-
 tools/genassym/Makefile       |     4 +-
 usr.bin/Makefile              |     8 +-
 usr.bin/config/Makefile       |    14 +
 usr.bin/config/Makefile.boot  |    53 +
 usr.bin/config/config.1       |   240 ++++++
 usr.bin/config/defs.h         |   513 +++++++++++++
 usr.bin/config/files.c        |   581 +++++++++++++++
 usr.bin/config/gram.y         |   710 +++++++++++++++++++
 usr.bin/config/hash.c         |   302 ++++++++
 usr.bin/config/main.c         |  1520 +++++++++++++++++++++++++++++++++++++++++
 usr.bin/config/mkdevsw.c      |   239 ++++++
 usr.bin/config/mkheaders.c    |   444 +++++++++++
 usr.bin/config/mkioconf.c     |   562 +++++++++++++++
 usr.bin/config/mkmakefile.c   |   551 ++++++++++++++
 usr.bin/config/mkswap.c       |   168 ++++
 usr.bin/config/pack.c         |   340 +++++++++
 usr.bin/config/scan.l         |   392 ++++++++++
 usr.bin/config/sem.c          |  1430 ++++++++++++++++++++++++++++++++++++++
 usr.bin/config/sem.h          |    74 +
 usr.bin/config/strerror.c     |    22 +
 usr.bin/config/util.c         |   336 +++++++++
 usr.bin/genassym/Makefile     |     6 +
 usr.bin/genassym/genassym.1   |    92 ++
 usr.bin/genassym/genassym.sh  |   215 +++++
 usr.sbin/Makefile             |     6 +-
 usr.sbin/config/Makefile      |    14 -
 usr.sbin/config/Makefile.boot |    53 -
 usr.sbin/config/config.8      |   240 ------
 usr.sbin/config/defs.h        |   513 -------------
 usr.sbin/config/files.c       |   581 ---------------
 usr.sbin/config/gram.y        |   710 -------------------
 usr.sbin/config/hash.c        |   302 --------
 usr.sbin/config/main.c        |  1520 -----------------------------------------
 usr.sbin/config/mkdevsw.c     |   239 ------
 usr.sbin/config/mkheaders.c   |   444 -----------
 usr.sbin/config/mkioconf.c    |   562 ---------------
 usr.sbin/config/mkmakefile.c  |   551 --------------
 usr.sbin/config/mkswap.c      |   168 ----
 usr.sbin/config/pack.c        |   340 ---------
 usr.sbin/config/scan.l        |   392 ----------
 usr.sbin/config/sem.c         |  1430 --------------------------------------
 usr.sbin/config/sem.h         |    74 -
 usr.sbin/config/strerror.c    |    22 -
 usr.sbin/config/util.c        |   336 ---------
 usr.sbin/genassym/Makefile    |     6 -
 usr.sbin/genassym/genassym.8  |    92 --
 usr.sbin/genassym/genassym.sh |   215 -----
 49 files changed, 8828 insertions(+), 8822 deletions(-)

diffs (truncated from 17948 to 300 lines):

diff -r 9d3393260a94 -r 4baa9ec6d7c0 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Sun Jun 05 17:56:31 2005 +0000
+++ b/distrib/sets/lists/comp/mi        Sun Jun 05 18:19:52 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mi,v 1.788 2005/05/31 11:38:31 christos Exp $
+#      $NetBSD: mi,v 1.789 2005/06/05 18:19:53 thorpej Exp $
 ./etc/mtree/set.comp                           comp-sys-root
 ./usr/bin/addr2line                            comp-debug-bin          bfd
 ./usr/bin/ar                                   comp-util-bin           bfd
@@ -8,6 +8,7 @@
 ./usr/bin/c++filt                              comp-cxx-bin            bfd
 ./usr/bin/c89                                  comp-c-bin
 ./usr/bin/cc                                   comp-c-bin              gcccmds
+./usr/bin/config                               comp-util-bin
 ./usr/bin/crunchgen                            comp-c-bin
 ./usr/bin/crunchide                            comp-c-bin
 ./usr/bin/cvs                                  comp-cvs-bin            cvs
@@ -24,6 +25,7 @@
 ./usr/bin/gcore                                        comp-debug-bin
 ./usr/bin/gcov                                 comp-debug-bin          gcccmds
 ./usr/bin/gdb                                  comp-debug-bin          gdb
+./usr/bin/genassym                             comp-util-bin
 ./usr/bin/genclass                             comp-obsolete           obsolete
 ./usr/bin/gettext                              comp-c-bin
 ./usr/bin/gettextize                           comp-obsolete           obsolete
@@ -1768,9 +1770,9 @@
 ./usr/libexec/f771                             comp-fortran-bin        gcccmds
 ./usr/libexec/lint1                            comp-c-bin
 ./usr/libexec/lint2                            comp-c-bin
-./usr/sbin/config                              comp-sysutil-sbin
+./usr/sbin/config                              comp-obsolete           obsolete
 ./usr/sbin/config.new                          comp-obsolete           obsolete
-./usr/sbin/genassym                            comp-sysutil-sbin
+./usr/sbin/genassym                            comp-obsolete           obsolete
 ./usr/sbin/gspa                                        comp-util-sbin
 ./usr/sbin/gspahextoc                          comp-obsolete           obsolete
 ./usr/sbin/kgmon                               comp-debug-sbin
@@ -1924,6 +1926,7 @@
 ./usr/share/man/cat1/c89.0                     comp-c-catman           .cat
 ./usr/share/man/cat1/cc.0                      comp-c-catman           .cat
 ./usr/share/man/cat1/cccp.0                    comp-util-catman        .cat
+./usr/share/man/cat1/config.0                  comp-util-catman        .cat
 ./usr/share/man/cat1/crunchgen.0               comp-c-catman           .cat
 ./usr/share/man/cat1/crunchide.0               comp-c-catman           .cat
 ./usr/share/man/cat1/cvs.0                     comp-cvs-catman         cvs,.cat
@@ -1942,6 +1945,7 @@
 ./usr/share/man/cat1/gcov.0                    comp-debug-catman       .cat
 ./usr/share/man/cat1/gdb.0                     comp-debug-catman       gdb,.cat
 ./usr/share/man/cat1/gprof.0                   comp-debug-catman       bfd,.cat
+./usr/share/man/cat1/genassym.0                        comp-util-catman        .cat
 ./usr/share/man/cat1/ld.0                      comp-util-catman        bfd,.cat
 ./usr/share/man/cat1/lex.0                     comp-c-catman           .cat
 ./usr/share/man/cat1/lexdoc.0                  comp-obsolete           obsolete
@@ -4776,10 +4780,10 @@
 ./usr/share/man/cat5/ranlib.0                  comp-util-catman        .cat
 ./usr/share/man/cat5/statvfs.0                 comp-util-catman        .cat
 ./usr/share/man/cat7/operator.0                        comp-c-catman           .cat
-./usr/share/man/cat8/config.0                  comp-sysutil-catman     .cat
+./usr/share/man/cat8/config.0                  comp-obsolete           obsolete
 ./usr/share/man/cat8/config.new.0              comp-obsolete           obsolete
 ./usr/share/man/cat8/cvsbug.0                  comp-cvs-catman         cvs,.cat
-./usr/share/man/cat8/genassym.0                        comp-sysutil-catman     .cat
+./usr/share/man/cat8/genassym.0                        comp-obsolete           obsolete
 ./usr/share/man/cat8/kgmon.0                   comp-sysutil-catman     .cat
 ./usr/share/man/cat9/CALLOUT_INITIALIZER.0     comp-sys-catman         .cat
 ./usr/share/man/cat9/CALLOUT_INITIALIZER_SETFUNC.0     comp-sys-catman         .cat
@@ -5796,6 +5800,7 @@
 ./usr/share/man/man1/c89.1                     comp-c-man              .man
 ./usr/share/man/man1/cc.1                      comp-c-man              .man
 ./usr/share/man/man1/cccp.1                    comp-util-man           .man
+./usr/share/man/man1/config.1                  comp-util-man           .man
 ./usr/share/man/man1/crunchgen.1               comp-c-man              .man
 ./usr/share/man/man1/crunchide.1               comp-c-man              .man
 ./usr/share/man/man1/cvs.1                     comp-cvs-man            cvs,.man
@@ -5813,6 +5818,7 @@
 ./usr/share/man/man1/gcov.1                    comp-debug-man          .man
 ./usr/share/man/man1/gdb.1                     comp-debug-man          gdb,.man
 ./usr/share/man/man1/gprof.1                   comp-debug-man          bfd,.man
+./usr/sahre/man/man1/genassym.1                        comp-util-man           .man
 ./usr/share/man/man1/ld.1                      comp-util-man           bfd,.man
 ./usr/share/man/man1/lex.1                     comp-c-man              .man
 ./usr/share/man/man1/lint.1                    comp-c-man              .man
@@ -8640,9 +8646,9 @@
 ./usr/share/man/man5/ranlib.5                  comp-util-man           .man
 ./usr/share/man/man5/statvfs.5                 comp-util-man           .man
 ./usr/share/man/man7/operator.7                        comp-c-man              .man
-./usr/share/man/man8/config.8                  comp-sysutil-man        .man
+./usr/share/man/man8/config.8                  comp-obsolete           obsolete
 ./usr/share/man/man8/cvsbug.8                  comp-cvs-man            cvs,.man
-./usr/share/man/man8/genassym.8                        comp-sysutil-man        .man
+./usr/share/man/man8/genassym.8                        comp-obsolete           obsolete
 ./usr/share/man/man8/kgmon.8                   comp-sysutil-man        .man
 ./usr/share/man/man9/CALLOUT_INITIALIZER.9     comp-sys-man            .man
 ./usr/share/man/man9/CALLOUT_INITIALIZER_SETFUNC.9     comp-sys-man            .man
diff -r 9d3393260a94 -r 4baa9ec6d7c0 tools/config/Makefile
--- a/tools/config/Makefile     Sun Jun 05 17:56:31 2005 +0000
+++ b/tools/config/Makefile     Sun Jun 05 18:19:52 2005 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile,v 1.5 2002/12/08 20:19:59 thorpej Exp $
+#      $NetBSD: Makefile,v 1.6 2005/06/05 18:19:53 thorpej Exp $
 
 HOSTPROGNAME=  ${_TOOL_PREFIX}config
-HOST_SRCDIR=   usr.sbin/config
+HOST_SRCDIR=   usr.bin/config
 
 HOST_CPPFLAGS+=        -DMAKE_BOOTSTRAP
 
diff -r 9d3393260a94 -r 4baa9ec6d7c0 tools/genassym/Makefile
--- a/tools/genassym/Makefile   Sun Jun 05 17:56:31 2005 +0000
+++ b/tools/genassym/Makefile   Sun Jun 05 18:19:52 2005 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile,v 1.2 2005/05/31 03:53:59 christos Exp $
+#      $NetBSD: Makefile,v 1.3 2005/06/05 18:19:53 thorpej Exp $
 
 .include <bsd.own.mk>
 
-.PATH.sh:      ${.CURDIR}/../../usr.sbin/genassym
+.PATH.sh:      ${.CURDIR}/../../usr.bin/genassym
 
 COMPATOBJ!=    cd ${.CURDIR}/../compat && ${PRINTOBJDIR}
 .-include      "${COMPATOBJ}/defs.mk"
diff -r 9d3393260a94 -r 4baa9ec6d7c0 usr.bin/Makefile
--- a/usr.bin/Makefile  Sun Jun 05 17:56:31 2005 +0000
+++ b/usr.bin/Makefile  Sun Jun 05 18:19:52 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.145 2005/03/09 05:20:05 atatat Exp $
+#      $NetBSD: Makefile,v 1.146 2005/06/05 18:19:52 thorpej Exp $
 #      from: @(#)Makefile      8.3 (Berkeley) 1/7/94
 
 .include <bsd.own.mk>
@@ -6,11 +6,11 @@
 SUBDIR= apply apropos asa at audio awk banner basename biff \
        bzip2 bzip2recover cal calendar cap_mkdb cdplay \
        checknr chflags chpass cksum cmp col colcrt colrm \
-       column comm compress crontab crunch ctags cut \
+       column comm compress config crontab crunch ctags cut \
        db dirname du eject elf2aout elf2ecoff env error expand extattr \
        false fdformat fgen file find finger fmt fold fpr from \
-       fsplit fstat ftp gcore gencat getconf getent getopt gprof gzip \
-       head hexdump iconv id indent innetgr ipcrm ipcs join jot \
+       fsplit fstat ftp gcore genassym gencat getconf getent getopt gprof \
+       gzip head hexdump iconv id indent innetgr ipcrm ipcs join jot \
        kdump ktrace ktruss lam last lastcomm ldd leave less \
        lex locale locate lock logger login logname look lorder m4 \
        machine mail make man menuc mesg midiplay mixerctl mkcsmapper \
diff -r 9d3393260a94 -r 4baa9ec6d7c0 usr.bin/config/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/config/Makefile   Sun Jun 05 18:19:52 2005 +0000
@@ -0,0 +1,14 @@
+#      $NetBSD: Makefile,v 1.1 2005/06/05 18:19:53 thorpej Exp $
+#      from: @(#)Makefile      8.2 (Berkeley) 4/19/94
+
+PROG=  config
+BINDIR=        /usr/sbin
+SRCS=  files.c gram.y hash.c main.c mkdevsw.c mkheaders.c mkioconf.c \
+       mkmakefile.c mkswap.c pack.c scan.l sem.c util.c
+MAN=   config.1
+YHEADER=1
+CPPFLAGS+=-I${.CURDIR} -I.
+
+CWARNFLAGS+=-Wno-format-y2k
+
+.include <bsd.prog.mk>
diff -r 9d3393260a94 -r 4baa9ec6d7c0 usr.bin/config/Makefile.boot
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/config/Makefile.boot      Sun Jun 05 18:19:52 2005 +0000
@@ -0,0 +1,53 @@
+#      $NetBSD: Makefile.boot,v 1.1 2005/06/05 18:19:53 thorpej Exp $
+#      from: @(#)Makefile      8.2 (Berkeley) 4/19/94
+#
+# a very simple makefile...
+#
+# You only want to use this if you aren't running NetBSD.
+#
+CC=gcc -O
+CFLAGS= -I. -DMAKE_BOOTSTRAP
+
+# Uncomment this if your system does not have strtoul (i.e. SunOS)
+# STRTOUL= -Dstrtoul=strtol
+
+# Note: The scanner here uses features specific to "flex" so
+# do not bother even trying to make lex build the scanner.
+# If you do not have flex, the source can be found in:
+# src/usr.bin/lex (See Makefile.boot)
+LEX=flex -l
+
+YACC=yacc
+
+OBJS=  files.o hash.o main.o mkdevsw.o mkheaders.o mkioconf.o \
+       mkmakefile.o mkswap.o pack.o sem.o util.o \
+       gram.o lex.yy.o strerror.o
+
+config: ${OBJS}
+       ${CC} -o $@ ${OBJS}
+
+gram.o : gram.c
+       ${CC} ${CFLAGS} -c gram.c
+
+gram.c gram.h : gram.y
+       ${YACC} -d gram.y
+       -mv -f y.tab.c gram.c
+       -mv -f y.tab.h gram.h
+
+lex.yy.o : lex.yy.c gram.h
+       ${CC} ${CFLAGS} ${STRTOUL} -c lex.yy.c
+
+lex.yy.c : scan.l
+       ${LEX} scan.l
+
+${OBJS} : defs.h
+
+y.tab.o mkmakefile.o mkswap.o sem.o : sem.h
+lex.yy.o : gram.h
+
+.c.o:
+       ${CC} ${CFLAGS} -c $<
+
+clean:
+       rm -f *.o config lex.yy.c y.tab.[ch] gram.[ch]
+
diff -r 9d3393260a94 -r 4baa9ec6d7c0 usr.bin/config/config.1
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.bin/config/config.1   Sun Jun 05 18:19:52 2005 +0000
@@ -0,0 +1,240 @@
+.\"    $NetBSD: config.1,v 1.1 2005/06/05 18:19:53 thorpej Exp $
+.\"
+.\" Copyright (c) 1980, 1991, 1993
+.\"    The Regents of the University of California.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     from: @(#)config.8     8.2 (Berkeley) 4/19/94
+.\"
+.Dd April 26, 2003
+.Dt CONFIG 8
+.Os
+.Sh NAME
+.Nm config
+.Nd build kernel compilation directories
+.Sh SYNOPSIS
+.Nm
+.Op Fl Ppv
+.Op Fl b Ar builddir
+.Op Fl s Ar srcdir
+.Op Ar config-file
+.Nm
+.Fl x
+.Op Ar kernel-file
+.Sh DESCRIPTION
+In its first synopsis form,
+.Nm
+creates a kernel build directory from the machine description file
+.Ar config-file ,
+which describes the system to configure.
+.Pp
+There are several different ways to run the
+.Nm
+program.
+The traditional way is to run
+.Nm
+from the
+.Pa conf
+subdirectory of the machine-specific directory of the system source
+(usually
+.Pa /sys/arch/MACHINE/conf ,
+where
+.Pa MACHINE
+is one of
+.Pa vax ,
+.Pa hp300 ,
+and so forth), and to specify as the
+.Ar config-file
+the name of a machine description file located in that directory.
+.Nm
+will by default create files in the directory
+.Pa ../compile/SYSTEMNAME ,
+where
+.Pa SYSTEMNAME



Home | Main Index | Thread Index | Old Index