From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from mediacenter.hi.pengutronix.de ([2001:6f8:1178:2::65])
	by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <mol@pengutronix.de>) id 1SBNhw-0000st-JO
	for ptxdist@pengutronix.de; Sat, 24 Mar 2012 10:56:24 +0100
Received: from mol by mediacenter.hi.pengutronix.de with local (Exim 4.72)
	(envelope-from <mol@pengutronix.de>) id 1SBNhw-0006j1-Hk
	for ptxdist@pengutronix.de; Sat, 24 Mar 2012 10:56:24 +0100
Date: Sat, 24 Mar 2012 10:56:24 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
Message-ID: <20120324095624.GE24724@pengutronix.de>
References: <1332512330-20101-1-git-send-email-bernhard@bwalle.de>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <1332512330-20101-1-git-send-email-bernhard@bwalle.de>
Subject: Re: [ptxdist] [PATCH] mtd-utils: Fix build without lzo support
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de

On Fri, Mar 23, 2012 at 03:18:50PM +0100, bernhard@bwalle.de wrote:
> From: Bernhard Walle <bernhard@bwalle.de>
> 
> Fix the build when target mtd-utils are built with ubi tools but without
> LZO.

Thanks. Applied.

Michael

> Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
> ---
>  ...0002-Make-liblzo-optional-for-ubifs-tools.patch |   16 +++++++++++++++-
>  1 file changed, 15 insertions(+), 1 deletion(-)
> 
> diff --git a/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch b/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch
> index 81c63a9..eacff21 100644
> --- a/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch
> +++ b/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch
> @@ -6,9 +6,23 @@ Based on patch from Marc Kleine-Budde <mkl@pengutronix.de>.
>  
>  Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
>  ---
> + Makefile           |    2 +-
>   mkfs.ubifs/compr.c |   17 +++++++++++++++++
> - 1 files changed, 17 insertions(+), 0 deletions(-)
> + 2 files changed, 18 insertions(+), 1 deletion(-)
>  
> +diff --git a/Makefile b/Makefile
> +index 000dc86..83eb9ce 100644
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -103,7 +103,7 @@ $(call _mkdep,lib/,libmtd.a)
> + #
> + obj-mkfs.ubifs = crc16.o lpt.o compr.o devtable.o \
> + 	hashtable/hashtable.o hashtable/hashtable_itr.o
> +-LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid
> ++LDLIBS_mkfs.ubifs = -lz $(LZOLDLIBS) -lm -luuid
> + $(call mkdep,mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a)
> + 
> + #
>  diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c
>  index 4152b6a..244d450 100644
>  --- a/mkfs.ubifs/compr.c
> -- 
> 1.7.9.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de