From owner-svn-src-head@FreeBSD.ORG Sat May 23 00:47:24 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D60E106564A; Sat, 23 May 2009 00:47:24 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 218808FC13; Sat, 23 May 2009 00:47:24 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4N0lO29024122; Sat, 23 May 2009 00:47:24 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4N0lOxD024121; Sat, 23 May 2009 00:47:24 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200905230047.n4N0lOxD024121@svn.freebsd.org> From: Kip Macy Date: Sat, 23 May 2009 00:47:23 +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: r192617 - head/rescue/rescue X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 May 2009 00:47:24 -0000 Author: kmacy Date: Sat May 23 00:47:23 2009 New Revision: 192617 URL: http://svn.freebsd.org/changeset/base/192617 Log: Add zfs/zpool to rescue programs PR: bin/125878 Submitted by: nork@ MFC after: 3 days Modified: head/rescue/rescue/Makefile Modified: head/rescue/rescue/Makefile ============================================================================== --- head/rescue/rescue/Makefile Sat May 23 00:40:17 2009 (r192616) +++ head/rescue/rescue/Makefile Sat May 23 00:47:23 2009 (r192617) @@ -72,7 +72,7 @@ CRUNCH_SRCDIRS+= bin CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \ ed expr getfacl hostname kenv kill ln ls mkdir mv \ pkill ps pwd realpath rm rmdir setfacl sh stty sync test -CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -lm -ltermcap -lutil +CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -ltermcap -lutil # Additional options for specific programs CRUNCH_ALIAS_test= [ @@ -128,6 +128,10 @@ CRUNCH_PROGS_sbin+= ping6 .if ${MK_IPFILTER} != "no" CRUNCH_PROGS_sbin+= ipf .endif +.if ${MK_ZFS} != "no" +CRUNCH_PROGS_sbin+= zfs +CRUNCH_PROGS_sbin+= zpool +.endif # crunchgen does not like C++ programs; this should be fixed someday # CRUNCH_PROGS+= devd @@ -136,6 +140,9 @@ CRUNCH_LIBS+= -lalias -lcam -lcurses -ld .if ${MK_IPX} != "no" CRUNCH_LIBS+= -lipx .endif +.if ${MK_ZFS} != "no" +CRUNCH_LIBS+= -lzfs -lnvpair -luutil -lavl +.endif CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -lmd -lreadline -lsbuf -lufs -lz .if ${MACHINE_ARCH} == "i386" @@ -173,6 +180,10 @@ CRUNCH_SRCDIR_fore_dnld= $(.CURDIR)/../. CRUNCH_SRCDIR_ilmid= $(.CURDIR)/../../sbin/atm/ilmid CRUNCH_SRCDIR_rtquery= $(.CURDIR)/../../sbin/routed/rtquery CRUNCH_SRCDIR_ipf= $(.CURDIR)/../../sbin/ipf/ipf +.if ${MK_ZFS} != "no" +CRUNCH_SRCDIR_zfs= ${.CURDIR}/../../cddl/sbin/zfs +CRUNCH_SRCDIR_zpool= ${.CURDIR}/../../cddl/sbin/zpool +.endif CRUNCH_ALIAS_reboot= fastboot halt fasthalt CRUNCH_ALIAS_restore= rrestore CRUNCH_ALIAS_dump= rdump @@ -218,6 +229,8 @@ CRUNCH_PROGS_usr.sbin= chroot CRUNCH_PROGS_usr.sbin+= chown CRUNCH_ALIAS_chown= chgrp +################################################################## +CRUNCH_LIBS+= -lm ################################################################## # The following is pretty nearly a generic crunchgen-handling makefile