[U-Boot] [PATCH] JFFS2: drop support for LZARI compression mode

Wolfgang Denk wd at denx.de
Sun Jan 17 18:58:46 CET 2010


In message <1263550769-25570-1-git-send-email-wd at denx.de> you wrote:
> Support for LZARI compression mode was added based on a MTD CVS
> snapshot of March 13, 2005. However, fs/jffs2/compr_lzari.c contains
> contradictory licensing terms: the original copyright clause says "All
> rights reserved. Permission granted for non-commercial use.", but
> later reference to the file 'LICENCE' in the jffs2 directory was added
> which says GPL v2 or later.
> 
> As no boards ever used LZARI compression, and this file is also not
> present in recent MTD code, we resolve this conflict by removing the
> conflicting file and references to it.
> 
> Also copy the referenced but missing file 'LICENCE' from the current
> MTD source tree.
> 
> Signed-off-by: Wolfgang Denk <wd at denx.de>
> ---
>  fs/jffs2/LICENCE            |   30 +++++
>  fs/jffs2/Makefile           |    3 +-
>  fs/jffs2/compr_lzari.c      |  259 -------------------------------------------
>  fs/jffs2/jffs2_1pass.c      |    8 +-
>  fs/jffs2/jffs2_nand_1pass.c |    8 +-
>  include/jffs2/jffs2.h       |    9 +-
>  6 files changed, 38 insertions(+), 279 deletions(-)
>  create mode 100644 fs/jffs2/LICENCE
>  delete mode 100644 fs/jffs2/compr_lzari.c

Applied.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Roses are red
Violets are blue
Some poems rhyme


More information about the U-Boot mailing list