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>

1 files changed, 14 insertions, 1 deletions

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;