From owner-svn-src-stable-8@FreeBSD.ORG  Thu May 20 09:39:01 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B62BC1065677;
	Thu, 20 May 2010 09:39:01 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A5C388FC08;
	Thu, 20 May 2010 09:39:01 +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 o4K9d1bF055503;
	Thu, 20 May 2010 09:39:01 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4K9d1n4055500;
	Thu, 20 May 2010 09:39:01 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201005200939.o4K9d1n4055500@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Thu, 20 May 2010 09:39:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208345 - in stable/8: . rescue/rescue
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 May 2010 09:39:01 -0000

Author: mm
Date: Thu May 20 09:39:01 2010
New Revision: 208345
URL: http://svn.freebsd.org/changeset/base/208345

Log:
  Add xz to rescue.
  
  Approved by:	delphij (mentor)

Modified:
  stable/8/Makefile.inc1
  stable/8/rescue/rescue/Makefile

Modified: stable/8/Makefile.inc1
==============================================================================
--- stable/8/Makefile.inc1	Thu May 20 09:38:15 2010	(r208344)
+++ stable/8/Makefile.inc1	Thu May 20 09:39:01 2010	(r208345)
@@ -1094,7 +1094,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		lib/libbz2 lib/libcom_err lib/libcrypt \
 		lib/libexpat \
 		${_lib_libgssapi} ${_lib_libipx} \
-		lib/libkiconv lib/libkvm lib/libmd \
+		lib/libkiconv lib/libkvm lib/liblzma lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
 		lib/libopie lib/libpam ${_lib_libthr} \
 		lib/libradius lib/libsbuf lib/libtacplus \

Modified: stable/8/rescue/rescue/Makefile
==============================================================================
--- stable/8/rescue/rescue/Makefile	Thu May 20 09:38:15 2010	(r208344)
+++ stable/8/rescue/rescue/Makefile	Thu May 20 09:39:01 2010	(r208345)
@@ -208,6 +208,10 @@ CRUNCH_PROGS_usr.bin+= bzip2
 CRUNCH_ALIAS_bzip2= bunzip2 bzcat
 CRUNCH_LIBS+= -lbz2
 
+CRUNCH_PROGS_usr.bin+= xz
+CRUNCH_ALIAS_xz= unxz lzma unlzma xzcat lzcat
+CRUNCH_LIBS+= -llzma
+
 CRUNCH_PROGS_usr.bin+= tar
 CRUNCH_LIBS+= -larchive -lmd
 .if ${MK_OPENSSL} != "no"