diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-11-24 00:45:03 +0100 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-11-24 01:03:10 +0100 |
| commit | 0f89517d418ff907fd9cf51f5313974812ceb305 (patch) | |
| tree | b8083226dd401a64fd4369777c474af2a15848f8 /tar | |
| parent | 5971411b6db1a1e0dab92df37f3974643a3d4399 (diff) | |
Fix: Move LZO compressor from libsquashfs to libcommon
The liblzo2 library is licensed under GPLv2, so it is not possible to
distribute binaries of libsquashfs that link against liblzo2 under
LGPL.
This commit moves the LZO compressor implementation to libcommon,
where this isn't a problem, since the tools themselves are licensed
under GPLv3.
It removes the ability of libsquashfs to read or generate LZO compressed
SquashFS images, but the tools still can.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'tar')
| -rw-r--r-- | tar/Makemodule.am | 3 | ||||
| -rw-r--r-- | tar/sqfs2tar.c | 15 | ||||
| -rw-r--r-- | tar/tar2sqfs.c | 5 |
3 files changed, 21 insertions, 2 deletions
diff --git a/tar/Makemodule.am b/tar/Makemodule.am index ec65d3a..4d28bb7 100644 --- a/tar/Makemodule.am +++ b/tar/Makemodule.am @@ -1,8 +1,9 @@ sqfs2tar_SOURCES = tar/sqfs2tar.c sqfs2tar_LDADD = libcommon.a libsquashfs.la libtar.a libcompat.a libutil.la +sqfs2tar_LDADD += $(LZO_LIBS) tar2sqfs_SOURCES = tar/tar2sqfs.c tar2sqfs_LDADD = libcommon.a libsquashfs.la libtar.a -tar2sqfs_LDADD += libfstree.a libcompat.a libutil.la +tar2sqfs_LDADD += libfstree.a libcompat.a libutil.la $(LZO_LIBS) bin_PROGRAMS += sqfs2tar tar2sqfs diff --git a/tar/sqfs2tar.c b/tar/sqfs2tar.c index 77f4843..9a12a96 100644 --- a/tar/sqfs2tar.c +++ b/tar/sqfs2tar.c @@ -420,7 +420,14 @@ int main(int argc, char **argv) goto out_fd; } - if (!sqfs_compressor_exists(super.compression_id)) { + ret = sqfs_compressor_exists(super.compression_id); + +#ifdef WITH_LZO + if (super.compression_id == SQFS_COMP_LZO) + ret = true; +#endif + + if (!ret) { fprintf(stderr, "%s: unknown compressor used.\n", filename); goto out_fd; } @@ -430,6 +437,12 @@ int main(int argc, char **argv) SQFS_COMP_FLAG_UNCOMPRESS); cmp = sqfs_compressor_create(&cfg); + +#ifdef WITH_LZO + if (super.compression_id == SQFS_COMP_LZO && cmp == NULL) + cmp = lzo_compressor_create(&cfg); +#endif + if (cmp == NULL) { fputs("Error creating compressor.\n", stderr); goto out_fd; diff --git a/tar/tar2sqfs.c b/tar/tar2sqfs.c index 10bb091..08bb8b5 100644 --- a/tar/tar2sqfs.c +++ b/tar/tar2sqfs.c @@ -126,6 +126,11 @@ static void process_args(int argc, char **argv) if (!sqfs_compressor_exists(cfg.comp_id)) have_compressor = false; +#ifdef WITH_LZO + if (cfg.comp_id == SQFS_COMP_LZO) + have_compressor = true; +#endif + if (!have_compressor) { fprintf(stderr, "Unsupported compressor '%s'\n", optarg); |