head	1.27;
access;
symbols
	RELENG_5_5_0_RELEASE:1.26
	RELENG_5_5:1.26.0.8
	RELENG_5_5_BP:1.26
	RELENG_5_4_0_RELEASE:1.26
	RELENG_5_4:1.26.0.6
	RELENG_5_4_BP:1.26
	RELENG_4_11_0_RELEASE:1.12.2.2
	RELENG_4_11:1.12.2.2.0.16
	RELENG_4_11_BP:1.12.2.2
	RELENG_5_3_0_RELEASE:1.26
	RELENG_5_3:1.26.0.4
	RELENG_5_3_BP:1.26
	RELENG_5:1.26.0.2
	RELENG_5_BP:1.26
	RELENG_4_10_0_RELEASE:1.12.2.2
	RELENG_4_10:1.12.2.2.0.14
	RELENG_4_10_BP:1.12.2.2
	RELENG_5_2_1_RELEASE:1.25
	RELENG_5_2_0_RELEASE:1.25
	RELENG_5_2:1.25.0.4
	RELENG_5_2_BP:1.25
	RELENG_4_9_0_RELEASE:1.12.2.2
	RELENG_4_9:1.12.2.2.0.12
	RELENG_4_9_BP:1.12.2.2
	RELENG_5_1_0_RELEASE:1.25
	RELENG_5_1:1.25.0.2
	RELENG_5_1_BP:1.25
	RELENG_4_8_0_RELEASE:1.12.2.2
	RELENG_4_8:1.12.2.2.0.10
	RELENG_4_8_BP:1.12.2.2
	RELENG_5_0_0_RELEASE:1.24
	RELENG_5_0:1.24.0.2
	RELENG_5_0_BP:1.24
	RELENG_4_7_0_RELEASE:1.12.2.2
	RELENG_4_7:1.12.2.2.0.8
	RELENG_4_7_BP:1.12.2.2
	RELENG_4_6_2_RELEASE:1.12.2.2
	RELENG_4_6_1_RELEASE:1.12.2.2
	RELENG_4_6_0_RELEASE:1.12.2.2
	RELENG_4_6:1.12.2.2.0.6
	RELENG_4_6_BP:1.12.2.2
	RELENG_4_5_0_RELEASE:1.12.2.2
	RELENG_4_5:1.12.2.2.0.4
	RELENG_4_5_BP:1.12.2.2
	RELENG_4_4_0_RELEASE:1.12.2.2
	RELENG_4_4:1.12.2.2.0.2
	RELENG_4_4_BP:1.12.2.2
	RELENG_4_3_0_RELEASE:1.12
	RELENG_4_3:1.12.0.4
	RELENG_4_3_BP:1.12
	RELENG_4_2_0_RELEASE:1.12
	RELENG_4_1_1_RELEASE:1.12
	PRE_SMPNG:1.16
	RELENG_4_1_0_RELEASE:1.12
	RELENG_3_5_0_RELEASE:1.6.2.5
	RELENG_4_0_0_RELEASE:1.12
	RELENG_4:1.12.0.2
	RELENG_4_BP:1.12
	RELENG_3_4_0_RELEASE:1.6.2.5
	RELENG_3_3_0_RELEASE:1.6.2.5
	RELENG_3_2_PAO:1.6.2.4.0.2
	RELENG_3_2_PAO_BP:1.6.2.4
	RELENG_3_2_0_RELEASE:1.6.2.4
	RELENG_3_1_0_RELEASE:1.6.2.3
	RELENG_2_2:1.6.0.4
	RELENG_3:1.6.0.2
	RELENG_3_BP:1.6
	RELENG_3_0_0_RELEASE:1.1.1.1
	v1_0:1.1.1.1
	VINUM:1.1.1;
locks; strict;
comment	@# @;


1.27
date	2004.11.04.12.46.46;	author phk;	state dead;
branches;
next	1.26;

1.26
date	2004.02.23.20.13.57;	author johan;	state Exp;
branches;
next	1.25;

1.25
date	2003.05.01.07.19.29;	author grog;	state Exp;
branches;
next	1.24;

1.24
date	2001.12.04.02.19.58;	author obrien;	state Exp;
branches;
next	1.23;

1.23
date	2001.10.15.01.32.48;	author grog;	state Exp;
branches;
next	1.22;

1.22
date	2001.08.04.18.25.48;	author tmm;	state Exp;
branches;
next	1.21;

1.21
date	2001.05.23.23.25.50;	author grog;	state Exp;
branches;
next	1.20;

1.20
date	2001.05.23.05.24.53;	author grog;	state Exp;
branches;
next	1.19;

1.19
date	2001.03.26.14.33.27;	author ru;	state Exp;
branches;
next	1.18;

1.18
date	2001.03.20.18.13.31;	author ru;	state Exp;
branches;
next	1.17;

1.17
date	2001.02.20.22.07.34;	author alfred;	state Exp;
branches;
next	1.16;

1.16
date	2000.09.06.04.18.16;	author grog;	state Exp;
branches;
next	1.15;

1.15
date	2000.09.03.01.29.28;	author grog;	state Exp;
branches;
next	1.14;

1.14
date	2000.04.16.00.16.52;	author grog;	state Exp;
branches;
next	1.13;

1.13
date	2000.03.27.18.38.29;	author bde;	state Exp;
branches;
next	1.12;

1.12
date	2000.01.03.12.01.26;	author marcel;	state Exp;
branches
	1.12.2.1;
next	1.11;

1.11
date	99.08.28.00.14.34;	author peter;	state Exp;
branches;
next	1.10;

1.10
date	99.04.09.01.14.35;	author grog;	state Exp;
branches;
next	1.9;

1.9
date	99.02.11.06.12.06;	author grog;	state Exp;
branches;
next	1.8;

1.8
date	99.01.31.23.24.07;	author grog;	state Exp;
branches;
next	1.7;

1.7
date	99.01.30.00.57.40;	author grog;	state Exp;
branches;
next	1.6;

1.6
date	99.01.21.00.43.00;	author grog;	state Exp;
branches
	1.6.2.1
	1.6.4.1;
next	1.5;

1.5
date	99.01.13.23.05.26;	author grog;	state Exp;
branches;
next	1.4;

1.4
date	98.12.28.16.32.39;	author peter;	state Exp;
branches;
next	1.3;

1.3
date	98.12.28.11.06.21;	author sos;	state Exp;
branches;
next	1.2;

1.2
date	98.10.17.13.48.37;	author bde;	state Exp;
branches;
next	1.1;

1.1
date	98.09.16.05.57.36;	author grog;	state Exp;
branches
	1.1.1.1;
next	;

1.12.2.1
date	2001.04.25.10.58.55;	author ru;	state Exp;
branches;
next	1.12.2.2;

1.12.2.2
date	2001.08.01.09.13.24;	author obrien;	state Exp;
branches;
next	1.12.2.3;

1.12.2.3
date	2012.11.17.07.24.37;	author svnexp;	state Exp;
branches;
next	;

1.6.2.1
date	99.01.30.01.00.19;	author grog;	state Exp;
branches;
next	1.6.2.2;

1.6.2.2
date	99.01.31.23.25.22;	author grog;	state Exp;
branches;
next	1.6.2.3;

1.6.2.3
date	99.02.11.05.12.38;	author grog;	state Exp;
branches;
next	1.6.2.4;

1.6.2.4
date	99.04.06.08.59.35;	author grog;	state Exp;
branches;
next	1.6.2.5;

1.6.2.5
date	99.08.29.15.16.03;	author peter;	state Exp;
branches;
next	;

1.6.4.1
date	99.01.25.04.32.35;	author grog;	state Exp;
branches;
next	1.6.4.2;

1.6.4.2
date	99.09.05.11.24.16;	author peter;	state Exp;
branches;
next	;

1.1.1.1
date	98.09.16.05.57.36;	author grog;	state Exp;
branches;
next	;


desc
@@


1.27
log
@Ups!  Forgot to put "sbin" on the commit line:

Remove userland vinum(8) stuff.
@
text
@# $FreeBSD: src/sbin/vinum/Makefile,v 1.26 2004/02/23 20:13:57 johan Exp $

PROG=	vinum
SRCS=	v.c list.c vinumparser.c vinumutil.c vext.h commands.c
MAN=	vinum.8

CFLAGS+=	-I${.CURDIR}/../../sys
WARNS?=	0

DPADD=	${LIBREADLINE} ${LIBTERMCAP} ${LIBDEVSTAT} ${LIBKVM}
LDADD=	-lreadline -ltermcap -ldevstat -lkvm

.PATH: ${.CURDIR}/../../sys/dev/vinum

.include <bsd.prog.mk>
@


1.26
log
@style.Makefile(5):
	Use WARNS?= instead of WARNS=.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.25
log
@Remove VINUMDEBUG.  vinum(8) always compiles with VINUMDEBUG to be able
to cope with kernel modules with VINUMDEBUG.
@
text
@d8 1
a8 1
WARNS=	0
@


1.24
log
@Default to WARNS=2.
Binary builds that cannot handle this must explicitly set WARNS=0.

Reviewed by:	mike
@
text
@d7 1
a7 1
CFLAGS+=	-I${.CURDIR}/../../sys -DVINUMDEBUG
@


1.23
log
@Reinstate VINUMDEBUG.  Removing it also removes some diagnostic commands.
I should reconsider whether I just leave them in without #ifdef VINUMDEBUG.
@
text
@d7 2
a8 1
CFLAGS+=	-I${.CURDIR}/../../sys -Wall -DVINUMDEBUG
@


1.22
log
@Add some features to libdevstat, and overhaul the interface a bit:

1.) prefix all functions in the library with devstat_ (compatability
    functions are available for all functions that were chaned in an
    incompatible way, but are deprecated).
2.) Add a pointer to a kvm_t as the first argument to functions that
    used to get their information via sysctl; they behave the same
    as before when NULL is passed as this argument, otherwise, the
    information is obtained via libkvm using the supplied handle.
3.) Add a new function, devstat_compute_statistics(), that is intended
    to replace the old compute_stats() function. It offers more
    statistics data, and has a more flexible interface.

libdevstat does now require libkvm; a library depedency is added, so
that libkvm only needs to be explicitely specified for statically linked
programs.
The library major version number is bumped.

Submitted by:	Sergey A. Osokin <osa@@freebsd.org.ru>, ken (3)
Reviewed by:	ken
@
text
@d1 1
a1 1
# $FreeBSD: src/sbin/vinum/Makefile,v 1.21 2001/05/23 23:25:50 grog Exp $
d7 1
a7 1
CFLAGS+=	-I${.CURDIR}/../../sys -Wall
@


1.21
log
@Remove cruft.
@
text
@d1 1
a1 1
# $FreeBSD: src/sbin/vinum/Makefile,v 1.20 2001/05/23 05:24:53 grog Exp $
d9 2
a10 2
DPADD=	${LIBREADLINE} ${LIBTERMCAP} ${LIBDEVSTAT}
LDADD=	-lreadline -ltermcap -ldevstat
@


1.20
log
@Remove -DVINUMDEBUG.  vinum(8) now always supports debug options if
the kernel module is built that way.
@
text
@d1 1
a1 1
# $FreeBSD: src/sbin/vinum/Makefile,v 1.19 2001/03/26 14:33:27 ru Exp $
a7 3

# Print __FILE__ and __LINE__ when doing perror()
#CFLAGS+=	-DDEVBUG
@


1.19
log
@- Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/sbin/vinum/Makefile,v 1.18 2001/03/20 18:13:31 ru Exp $
d7 1
a7 1
CFLAGS+=	-I${.CURDIR}/../../sys -Wall -DVINUMDEBUG
@


1.18
log
@Set the default manual section for sbin/ to 8.
@
text
@d1 1
a1 1
# $FreeBSD: src/sbin/vinum/Makefile,v 1.17 2001/02/20 22:07:34 alfred Exp $
d5 1
@


1.17
log
@Fix vinum for both devfs and non-devfs systems.

userland tool:

  Use the vfs.devfs.generation sysctl to test for devfs presense
  (thanks phk!) when devfs is active it will not try to create the
  device nodes in /dev and therefore will not complain about the
  failure to do so.

  Revert the change in the #define for VINUM_DIR in the kernel
  header so that vinum can find its device nodes.

  Replace perror() with vinum_perror() to print file/line when
  DEVBUG is defined (not defined by default).

kernel:

  Don't use the #define names for the "superdev" creation since
  they will be prepended by "/dev/" (based on VINUM_DIR), instead
  use string constants.

  Create both debug and non-debug "superdev" nodes in the devfs.

Problem noticed and fix tested by: Martin Blapp <mblapp@@fuchur.lan.attic.ch>
@
text
@d1 1
a1 1
# $FreeBSD$
a4 1
MAN8=	vinum.8
@


1.16
log
@Bring LDADD in line with DPADD.

Reported by:	bde
@
text
@d1 1
a1 1
# $FreeBSD: src/sbin/vinum/Makefile,v 1.15 2000/09/03 01:29:28 grog Exp $
d8 4
@


1.15
log
@Clean up now that setproctitle() is in libc.

Submitted by: 	brian
@
text
@d1 1
a1 1
# $FreeBSD: src/sbin/vinum/Makefile,v 1.14 2000/04/16 00:16:52 grog Exp $
d9 1
a9 1
LDADD=	-lutil -lreadline -ltermcap -ldevstat
@


1.14
log
@Remove MAINTAINER.
@
text
@d1 1
a1 1
# $FreeBSD$
d8 1
a8 1
DPADD=	${LIBUTIL} ${LIBREADLINE} ${LIBTERMCAP} ${LIBDEVSTAT}
@


1.13
log
@Fixed a missing library in DPADD.

Fixed some misformattings.
@
text
@d1 1
a1 3
# $FreeBSD: src/sbin/vinum/Makefile,v 1.12 2000/01/03 12:01:26 marcel Exp $

MAINTAINER=	grog@@FreeBSD.org
@


1.12
log
@Remove -g compiler flag.
@
text
@d1 3
a3 1
# $FreeBSD: src/sbin/vinum/Makefile,v 1.11 1999/08/28 00:14:34 peter Exp $
a4 1
MAINTAINER  =  grog@@FreeBSD.org
d10 2
a11 2
DPADD=		${LIBUTIL} ${LIBREADLINE} ${LIBTERMCAP}
LDADD=		-lutil -lreadline -ltermcap -ldevstat
@


1.12.2.1
log
@MFC: MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/sbin/vinum/Makefile,v 1.12 2000/01/03 12:01:26 marcel Exp $
d6 1
a6 1
MAN=	vinum.8
@


1.12.2.2
log
@MFC: revs 1.15,16 (clean up now that setproctitle is in libc)
@
text
@d1 1
a1 1
# $FreeBSD: src/sbin/vinum/Makefile,v 1.12.2.1 2001/04/25 10:58:55 ru Exp $
d9 2
a10 2
DPADD=	${LIBUTIL} ${LIBREADLINE} ${LIBTERMCAP}
LDADD=	-lreadline -ltermcap -ldevstat
@


1.12.2.3
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/sbin/vinum/Makefile 80883 2001-08-01 09:13:24Z obrien $
@


1.11
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
d8 1
a8 1
CFLAGS+=	-I${.CURDIR}/../../sys -g -Wall -DVINUMDEBUG
@


1.10
log
@If the wrong version of vinum(8) has been started (i.e. non-RAID-5
when the kernel module is RAID-5, or the other way round), execve()
the correct one.

Add \n to an error message.
@
text
@d1 1
a1 1
#	$Id: Makefile.sbin,v 1.3 1999/02/11 05:09:49 grog Exp grog $
@


1.9
log
@Include libdevstat in executable, for extended start command.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.5 1999/01/13 23:05:26 grog Exp $
@


1.8
log
@Correct include paths
Remove unnecessary additional CFLAGS
Remove BINGRP and BINMODE
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.7 1999/01/30 00:57:40 grog Exp $
d3 1
a3 1
MAINTAINER=	grog@@FreeBSD.org
d10 1
a10 1
LDADD=		-lutil -lreadline -ltermcap
@


1.7
log
@Add MAINTAINER
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.5 1999/01/13 23:05:26 grog Exp $
d3 1
a3 1
MAINTAINER  =  grog@@FreeBSD.org
a10 2
BINGRP=		kmem
BINMODE=	555
a14 2

CFLAGS += -I ${.CURDIR}/../../sys/dev/vinum
@


1.6
log
@Remove -DRAID5 from CFLAGS
@
text
@d3 1
d17 2
@


1.6.2.1
log
@Add MAINTAINER
@
text
@a2 1
MAINTAINER  =  grog@@FreeBSD.org
a15 2

CFLAGS += -I ${.CURDIR}/../../sys/dev/vinum
@


1.6.2.2
log
@Correct include paths
Remove unnecessary additional CFLAGS
Remove BINGRP and BINMODE
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.6.2.1 1999/01/30 01:00:19 grog Exp $
d3 1
a3 1
MAINTAINER=	grog@@FreeBSD.org
d11 2
d17 2
@


1.6.2.3
log
@Include libdevstat in executable, for extended start command.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.5 1999/01/13 23:05:26 grog Exp $
d3 1
a3 1
MAINTAINER  =  grog@@FreeBSD.org
d10 1
a10 1
LDADD=		-lutil -lreadline -ltermcap -ldevstat
@


1.6.2.4
log
@MFC: Check in -CURRENT version of vinum(8)
@
text
@d1 1
a1 1
#	$Id: Makefile.sbin,v 1.3 1999/02/11 05:09:49 grog Exp grog $
@


1.6.2.5
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.6.4.1
log
@Initial checkin of vinum into -STABLE
@
text
@a15 2

CFLAGS += -I ${.CURDIR}/../../sys/dev/vinum
@


1.6.4.2
log
@$Id$ -> $FreeBSD$
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.5
log
@Don't install vinum(8) sgid.

Reported-by:	Paul Hart <hart@@iserver.com>
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.4 1998/12/28 16:32:39 peter Exp $
d7 1
a7 1
CFLAGS+=	-I${.CURDIR}/../../sys -g -Wall -DVINUMDEBUG -DRAID5
@


1.4
log
@Tweaks as a result of having vinum statically buildable in a kernel.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.3 1998/12/28 11:06:21 sos Exp $
d11 1
a11 1
BINMODE=	2555
@


1.3
log
@Reenable vinum after repository copy.

Forgotten by:	Peter.
@
text
@d1 1
a1 1
#	$Id: Makefile,v 1.2 1998/10/17 13:48:37 bde Exp $
d4 1
a4 1
SRCS=	v.c list.c parser.c util.c vext.h commands.c
d7 1
a7 1
CFLAGS+=	-I${.CURDIR}/../../sys/dev/vinum -g -Wall -DDEBUG -DRAID5
@


1.2
log
@Honour the default CFLAGS.  This fixes a spew of warnings for compiling
unused static inlines in headers without -O.

Fixed missing libraries in DPADD.

Use .PATH instead of a symlink farm.

Removed bogus dependency of util.c on statetext.h (only util.o depends
on it).  Removed rule for building statetext.h.  The dependency was used
to get statetext.h built, but statetext.h is a non-generated source file
so it doesn't need building.  This fixes an annoying message for the null
build and use of `make' instead of ${MAKE} to do the null build.

Fixed some style bugs.
@
text
@d1 1
a1 1
#	$Id$
d7 1
a7 1
CFLAGS+=	-I${.CURDIR}/../../lkm/vinum -g -Wall -DDEBUG -DRAID5
d13 1
a13 1
.PATH: ${.CURDIR}/../../lkm/vinum
@


1.1
log
@Initial revision
@
text
@d1 2
d7 3
a9 4
CFLAGS=	-I${.CURDIR}/../../lkm/vinum -g -Wall -DDEBUG -DRAID5

LDADD+=		-lutil -lreadline -ltermcap
# DPADD+=		${LIBKVM}
d13 1
a13 10
parser.c:
	rm -f $@@
	ln -s ${.CURDIR}/../../lkm/vinum/$@@ .

util.c:	statetexts.h
	rm -f $@@
	ln -s ${.CURDIR}/../../lkm/vinum/$@@ .

statetexts.h:
	(cd ${.CURDIR}/../../lkm/vinum; make $@@)
@


1.1.1.1
log
@Import base vinum userland sources
@
text
@@
