[Midnightbsd-cvs] src [10223] trunk/cddl/sbin: el sync o

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Jun 2 11:56:56 EDT 2018 

Revision: 10223
          http://svnweb.midnightbsd.org/src/?rev=10223
Author:   laffer1
Date:     2018-06-02 11:56:55 -0400 (Sat, 02 Jun 2018)
Log Message:
-----------
el sync o

Modified Paths:
--------------
    trunk/cddl/sbin/Makefile
    trunk/cddl/sbin/Makefile.inc
    trunk/cddl/sbin/zfs/Makefile
    trunk/cddl/sbin/zpool/Makefile

Added Paths:
-----------
    trunk/cddl/sbin/tests/
    trunk/cddl/sbin/tests/Makefile

Property Changed:
----------------
    trunk/cddl/sbin/Makefile.inc

Modified: trunk/cddl/sbin/Makefile
===================================================================
--- trunk/cddl/sbin/Makefile	2018-06-02 15:56:50 UTC (rev 10222)
+++ trunk/cddl/sbin/Makefile	2018-06-02 15:56:55 UTC (rev 10223)
@@ -1,13 +1,19 @@
 # $MidnightBSD$
-# $FreeBSD: src/cddl/sbin/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
+# $FreeBSD: stable/10/cddl/sbin/Makefile 283853 2015-05-31 23:00:35Z ngie $
 
 .include <bsd.own.mk>
 
-SUBDIR=	${_zfs} ${_zpool}
+SUBDIR=	${_tests} ${_zfs} ${_zpool}
 
+.if ${MK_TESTS} != "no"
+_tests=	tests
+.endif
+
 .if ${MK_ZFS} != "no"
 _zfs=	zfs
 _zpool=	zpool
 .endif
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>

Modified: trunk/cddl/sbin/Makefile.inc
===================================================================
--- trunk/cddl/sbin/Makefile.inc	2018-06-02 15:56:50 UTC (rev 10222)
+++ trunk/cddl/sbin/Makefile.inc	2018-06-02 15:56:55 UTC (rev 10223)
@@ -1,5 +1,5 @@
 # $MidnightBSD$
-# $FreeBSD: src/cddl/sbin/Makefile.inc,v 1.1 2007/04/06 01:08:57 pjd Exp $
+# $FreeBSD: stable/10/cddl/sbin/Makefile.inc 168404 2007-04-06 01:09:06Z pjd $
 
 BINDIR?=	/sbin
 


Property changes on: trunk/cddl/sbin/Makefile.inc
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: trunk/cddl/sbin/tests/Makefile
===================================================================
--- trunk/cddl/sbin/tests/Makefile	                        (rev 0)
+++ trunk/cddl/sbin/tests/Makefile	2018-06-02 15:56:55 UTC (rev 10223)
@@ -0,0 +1,9 @@
+# $MidnightBSD$
+# $FreeBSD: stable/10/cddl/sbin/tests/Makefile 313488 2017-02-09 22:49:48Z ngie $
+
+.include <bsd.own.mk>
+
+.PATH:		${SRCTOP}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>


Property changes on: trunk/cddl/sbin/tests/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/cddl/sbin/zfs/Makefile
===================================================================
--- trunk/cddl/sbin/zfs/Makefile	2018-06-02 15:56:50 UTC (rev 10222)
+++ trunk/cddl/sbin/zfs/Makefile	2018-06-02 15:56:55 UTC (rev 10223)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
-# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
+# $FreeBSD: stable/10/cddl/sbin/zfs/Makefile 321270 2017-07-20 01:01:16Z ngie $
 
-.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zfs
+.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zfs
 
 PROG=	zfs
 MAN=	zfs.8
@@ -8,20 +8,20 @@
 SRCS=	zfs_main.c zfs_iter.c
 
 WARNS?=	0
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libumem/common
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
 
 DPADD=	${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \
 	${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}

Modified: trunk/cddl/sbin/zpool/Makefile
===================================================================
--- trunk/cddl/sbin/zpool/Makefile	2018-06-02 15:56:50 UTC (rev 10222)
+++ trunk/cddl/sbin/zpool/Makefile	2018-06-02 15:56:55 UTC (rev 10223)
@@ -1,9 +1,9 @@
 # $MidnightBSD$
-# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
+# $FreeBSD: stable/10/cddl/sbin/zpool/Makefile 321270 2017-07-20 01:01:16Z ngie $
 
-.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zpool
-.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
-.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
+.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zpool
+.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/stat/common
+.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
 
 PROG=	zpool
 MAN=	zpool.8 zpool-features.7
@@ -11,21 +11,22 @@
 SRCS+=	timestamp.c
 
 WARNS?=	0
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
+CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libumem/common
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/cmd/stat/common
 
 DPADD=	${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \
 	${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}

More information about the Midnightbsd-cvs mailing list