From owner-svn-src-all@FreeBSD.ORG Fri Jan 10 20:29:47 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B894450C; Fri, 10 Jan 2014 20:29:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8A7E61CF0; Fri, 10 Jan 2014 20:29:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0AKTlPK074788; Fri, 10 Jan 2014 20:29:47 GMT (envelope-from loos@svn.freebsd.org) Received: (from loos@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0AKTk7V074783; Fri, 10 Jan 2014 20:29:46 GMT (envelope-from loos@svn.freebsd.org) Message-Id: <201401102029.s0AKTk7V074783@svn.freebsd.org> From: Luiz Otavio O Souza Date: Fri, 10 Jan 2014 20:29:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r260523 - in head/sys: geom/uncompress modules/geom modules/geom/geom_uncompress X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 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: Fri, 10 Jan 2014 20:29:47 -0000 Author: loos Date: Fri Jan 10 20:29:46 2014 New Revision: 260523 URL: http://svnweb.freebsd.org/changeset/base/260523 Log: Build the geom_uncompress(4) module by default. Fix geom_uncompress(4) module loading. Don't link zlib.c (which is a module itself) directly. The built module was verified and used to read a few mkulzma(8) images on amd64 to validate some of the informations on the manual page. While here, don't overwrite CFLAGS. Reviewed by: ray Approved by: adrian (mentor) Modified: head/sys/geom/uncompress/g_uncompress.c head/sys/modules/geom/Makefile head/sys/modules/geom/geom_uncompress/Makefile Modified: head/sys/geom/uncompress/g_uncompress.c ============================================================================== --- head/sys/geom/uncompress/g_uncompress.c Fri Jan 10 19:41:01 2014 (r260522) +++ head/sys/geom/uncompress/g_uncompress.c Fri Jan 10 20:29:46 2014 (r260523) @@ -664,4 +664,4 @@ static struct g_class g_uncompress_class }; DECLARE_GEOM_CLASS(g_uncompress_class, g_uncompress); - +MODULE_DEPEND(g_uncompress, zlib, 1, 1, 1); Modified: head/sys/modules/geom/Makefile ============================================================================== --- head/sys/modules/geom/Makefile Fri Jan 10 19:41:01 2014 (r260522) +++ head/sys/modules/geom/Makefile Fri Jan 10 20:29:46 2014 (r260523) @@ -24,6 +24,7 @@ SUBDIR= geom_bde \ geom_shsec \ geom_stripe \ geom_sunlabel \ + geom_uncompress \ geom_uzip \ geom_vinum \ geom_virstor \ Modified: head/sys/modules/geom/geom_uncompress/Makefile ============================================================================== --- head/sys/modules/geom/geom_uncompress/Makefile Fri Jan 10 19:41:01 2014 (r260522) +++ head/sys/modules/geom/geom_uncompress/Makefile Fri Jan 10 20:29:46 2014 (r260523) @@ -7,11 +7,11 @@ ${.CURDIR}/../../../net KMOD= geom_uncompress -CFLAGS= -I${.CURDIR}/../../../geom/uncompress/ \ +CFLAGS+= -I${.CURDIR}/../../../geom/uncompress/ \ -I${.CURDIR}/../../../contrib/xz-embedded/freebsd \ -I${.CURDIR}/../../../contrib/xz-embedded/linux/lib/xz/ SRCS= g_uncompress.c xz_crc32.c xz_dec_bcj.c xz_dec_lzma2.c xz_dec_stream.c \ - xz_malloc.c zlib.c + xz_malloc.c SRCS+= xz.h xz_config.h xz_lzma2.h xz_malloc.h xz_private.h xz_stream.h zlib.h .include