From owner-svn-src-all@FreeBSD.ORG Wed Dec 15 23:24:35 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22D501065679; Wed, 15 Dec 2010 23:24:35 +0000 (UTC) (envelope-from obrien@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0F4048FC0C; Wed, 15 Dec 2010 23:24:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBFNOYsD099865; Wed, 15 Dec 2010 23:24:34 GMT (envelope-from obrien@svn.freebsd.org) Received: (from obrien@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBFNOYoi099848; Wed, 15 Dec 2010 23:24:34 GMT (envelope-from obrien@svn.freebsd.org) Message-Id: <201012152324.oBFNOYoi099848@svn.freebsd.org> From: "David E. O'Brien" Date: Wed, 15 Dec 2010 23:24:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216468 - in head/sbin/geom/class: . cache concat eli journal label mirror mountver multipath nop part raid3 sched shsec stripe virstor X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Dec 2010 23:24:35 -0000 Author: obrien Date: Wed Dec 15 23:24:34 2010 New Revision: 216468 URL: http://svn.freebsd.org/changeset/base/216468 Log: Rename the generic "CLASS" to the more specific "GEOM_CLASS". While I'm here remove redundancy and inconsistencies. Obtained from: Juniper Networks Modified: head/sbin/geom/class/Makefile.inc head/sbin/geom/class/cache/Makefile head/sbin/geom/class/concat/Makefile head/sbin/geom/class/eli/Makefile head/sbin/geom/class/journal/Makefile head/sbin/geom/class/label/Makefile head/sbin/geom/class/mirror/Makefile head/sbin/geom/class/mountver/Makefile head/sbin/geom/class/multipath/Makefile head/sbin/geom/class/nop/Makefile head/sbin/geom/class/part/Makefile head/sbin/geom/class/raid3/Makefile head/sbin/geom/class/sched/Makefile head/sbin/geom/class/shsec/Makefile head/sbin/geom/class/stripe/Makefile head/sbin/geom/class/virstor/Makefile Modified: head/sbin/geom/class/Makefile.inc ============================================================================== --- head/sbin/geom/class/Makefile.inc Wed Dec 15 22:59:50 2010 (r216467) +++ head/sbin/geom/class/Makefile.inc Wed Dec 15 23:24:34 2010 (r216468) @@ -1,10 +1,10 @@ # $FreeBSD$ -SHLIBDIR?=${CLASS_DIR} -SHLIB_NAME?=geom_${CLASS}.so -LINKS= ${BINDIR}/geom ${BINDIR}/g${CLASS} -MAN= g${CLASS}.8 -SRCS+= geom_${CLASS}.c subr.c +SHLIBDIR?=${GEOM_CLASS_DIR} +SHLIB_NAME?=geom_${GEOM_CLASS}.so +LINKS= ${BINDIR}/geom ${BINDIR}/g${GEOM_CLASS} +MAN= g${GEOM_CLASS}.8 +SRCS+= geom_${GEOM_CLASS}.c subr.c CFLAGS+= -I${.CURDIR}/../.. Modified: head/sbin/geom/class/cache/Makefile ============================================================================== --- head/sbin/geom/class/cache/Makefile Wed Dec 15 22:59:50 2010 (r216467) +++ head/sbin/geom/class/cache/Makefile Wed Dec 15 23:24:34 2010 (r216468) @@ -2,6 +2,6 @@ .PATH: ${.CURDIR}/../../misc -CLASS= cache +GEOM_CLASS= cache .include Modified: head/sbin/geom/class/concat/Makefile ============================================================================== --- head/sbin/geom/class/concat/Makefile Wed Dec 15 22:59:50 2010 (r216467) +++ head/sbin/geom/class/concat/Makefile Wed Dec 15 23:24:34 2010 (r216468) @@ -2,6 +2,6 @@ .PATH: ${.CURDIR}/../../misc -CLASS= concat +GEOM_CLASS= concat .include Modified: head/sbin/geom/class/eli/Makefile ============================================================================== --- head/sbin/geom/class/eli/Makefile Wed Dec 15 22:59:50 2010 (r216467) +++ head/sbin/geom/class/eli/Makefile Wed Dec 15 23:24:34 2010 (r216468) @@ -2,7 +2,7 @@ .PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/eli ${.CURDIR}/../../../../sys/crypto/sha2 -CLASS= eli +GEOM_CLASS= eli SRCS= g_eli_crypto.c SRCS+= g_eli_key.c SRCS+= pkcs5v2.c Modified: head/sbin/geom/class/journal/Makefile ============================================================================== --- head/sbin/geom/class/journal/Makefile Wed Dec 15 22:59:50 2010 (r216467) +++ head/sbin/geom/class/journal/Makefile Wed Dec 15 23:24:34 2010 (r216468) @@ -1,8 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR}/../../misc -CLASS= journal +GEOM_CLASS= journal SRCS+= geom_journal_ufs.c DPADD= ${LIBMD} ${LIBUFS} Modified: head/sbin/geom/class/label/Makefile ============================================================================== --- head/sbin/geom/class/label/Makefile Wed Dec 15 22:59:50 2010 (r216467) +++ head/sbin/geom/class/label/Makefile Wed Dec 15 23:24:34 2010 (r216468) @@ -2,6 +2,6 @@ .PATH: ${.CURDIR}/../../misc -CLASS= label +GEOM_CLASS= label .include Modified: head/sbin/geom/class/mirror/Makefile ============================================================================== --- head/sbin/geom/class/mirror/Makefile Wed Dec 15 22:59:50 2010 (r216467) +++ head/sbin/geom/class/mirror/Makefile Wed Dec 15 23:24:34 2010 (r216468) @@ -1,8 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../misc +.PATH: ${.CURDIR}/../../misc -CLASS= mirror +GEOM_CLASS= mirror DPADD= ${LIBMD} LDADD= -lmd Modified: head/sbin/geom/class/mountver/Makefile ============================================================================== --- head/sbin/geom/class/mountver/Makefile Wed Dec 15 22:59:50 2010 (r216467) +++ head/sbin/geom/class/mountver/Makefile Wed Dec 15 23:24:34 2010 (r216468) @@ -2,6 +2,6 @@ .PATH: ${.CURDIR}/../../misc -CLASS= mountver +GEOM_CLASS= mountver .include Modified: head/sbin/geom/class/multipath/Makefile ============================================================================== --- head/sbin/geom/class/multipath/Makefile Wed Dec 15 22:59:50 2010 (r216467) +++ head/sbin/geom/class/multipath/Makefile Wed Dec 15 23:24:34 2010 (r216468) @@ -1,8 +1,9 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../misc -CLASS= multipath -.include +GEOM_CLASS= multipath CFLAGS+= -I${.CURDIR}/../../../../sys + +.include Modified: head/sbin/geom/class/nop/Makefile ============================================================================== --- head/sbin/geom/class/nop/Makefile Wed Dec 15 22:59:50 2010 (r216467) +++ head/sbin/geom/class/nop/Makefile Wed Dec 15 23:24:34 2010 (r216468) @@ -2,6 +2,6 @@ .PATH: ${.CURDIR}/../../misc -CLASS= nop +GEOM_CLASS= nop .include Modified: head/sbin/geom/class/part/Makefile ============================================================================== --- head/sbin/geom/class/part/Makefile Wed Dec 15 22:59:50 2010 (r216467) +++ head/sbin/geom/class/part/Makefile Wed Dec 15 23:24:34 2010 (r216468) @@ -2,7 +2,7 @@ .PATH: ${.CURDIR}/../../misc -CLASS= part +GEOM_CLASS= part DPADD= ${LIBUTIL} LDADD= -lutil Modified: head/sbin/geom/class/raid3/Makefile ============================================================================== --- head/sbin/geom/class/raid3/Makefile Wed Dec 15 22:59:50 2010 (r216467) +++ head/sbin/geom/class/raid3/Makefile Wed Dec 15 23:24:34 2010 (r216468) @@ -2,7 +2,7 @@ .PATH: ${.CURDIR}/../../misc -CLASS= raid3 +GEOM_CLASS= raid3 DPADD= ${LIBMD} LDADD= -lmd Modified: head/sbin/geom/class/sched/Makefile ============================================================================== --- head/sbin/geom/class/sched/Makefile Wed Dec 15 22:59:50 2010 (r216467) +++ head/sbin/geom/class/sched/Makefile Wed Dec 15 23:24:34 2010 (r216468) @@ -2,17 +2,10 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../misc -#CFLAGS += -I/usr/src/sbin/geom -CLASS=sched +GEOM_CLASS= sched -WARNS?= 6 +WARNS?= 6 CLASS_DIR?=/lib/geom -SHLIBDIR?=${CLASS_DIR} -SHLIB_NAME?=geom_${CLASS}.so -LINKS= ${BINDIR}/geom ${BINDIR}/g${CLASS} -MAN= g${CLASS}.8 -SRCS+= geom_${CLASS}.c subr.c - .include Modified: head/sbin/geom/class/shsec/Makefile ============================================================================== --- head/sbin/geom/class/shsec/Makefile Wed Dec 15 22:59:50 2010 (r216467) +++ head/sbin/geom/class/shsec/Makefile Wed Dec 15 23:24:34 2010 (r216468) @@ -2,6 +2,6 @@ .PATH: ${.CURDIR}/../../misc -CLASS= shsec +GEOM_CLASS= shsec .include Modified: head/sbin/geom/class/stripe/Makefile ============================================================================== --- head/sbin/geom/class/stripe/Makefile Wed Dec 15 22:59:50 2010 (r216467) +++ head/sbin/geom/class/stripe/Makefile Wed Dec 15 23:24:34 2010 (r216468) @@ -2,6 +2,6 @@ .PATH: ${.CURDIR}/../../misc -CLASS= stripe +GEOM_CLASS= stripe .include Modified: head/sbin/geom/class/virstor/Makefile ============================================================================== --- head/sbin/geom/class/virstor/Makefile Wed Dec 15 22:59:50 2010 (r216467) +++ head/sbin/geom/class/virstor/Makefile Wed Dec 15 23:24:34 2010 (r216468) @@ -1,8 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/virstor +.PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/virstor -CLASS= virstor +GEOM_CLASS= virstor SRCS+= binstream.c SRCS+= g_virstor_md.c