diff options
| author | Bruno Thomsen <bruno.thomsen@gmail.com> | 2020-07-24 17:51:03 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-07-30 12:10:35 +0200 |
| commit | 69b9062765aa71af6828e2db7a810bdd9571bd06 (patch) | |
| tree | e1aac639d6a5af432941e6479e367f2ba85caa1c | |
| parent | c6aae0220ea911420adc14bd6feb406e69790f5c (diff) | |
| download | ptxdist-69b9062765aa71af6828e2db7a810bdd9571bd06.tar.gz ptxdist-69b9062765aa71af6828e2db7a810bdd9571bd06.tar.xz | |
host-squashfs-tools: fix lz4 compression option
Conditional select host-lz4 package if lz4 compressions is
used by image-root-squashfs and enable support in package.
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
Message-Id: <20200724155103.6374-5-bruno.thomsen@gmail.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | platforms/image-root-squashfs.in | 1 | ||||
| -rw-r--r-- | rules/host-squashfs-tools.in | 4 | ||||
| -rw-r--r-- | rules/host-squashfs-tools.make | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/platforms/image-root-squashfs.in b/platforms/image-root-squashfs.in index a6d1d1b44..4e5a75701 100644 --- a/platforms/image-root-squashfs.in +++ b/platforms/image-root-squashfs.in @@ -5,6 +5,7 @@ menuconfig IMAGE_ROOT_SQUASHFS select HOST_GENIMAGE select HOST_SQUASHFS_TOOLS select HOST_SQUASHFS_TOOLS_LZO_SUPPORT if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_LZO + select HOST_SQUASHFS_TOOLS_LZ4_SUPPORT if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_LZ4 select HOST_SQUASHFS_TOOLS_XZ_SUPPORT if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_XZ select HOST_SQUASHFS_TOOLS_ZSTD_SUPPORT if IMAGE_ROOT_SQUASHFS_COMPRESSION_MODE_ZSTD select IMAGE_ROOT_TGZ diff --git a/rules/host-squashfs-tools.in b/rules/host-squashfs-tools.in index 3ba693aaf..b6f3e8f4f 100644 --- a/rules/host-squashfs-tools.in +++ b/rules/host-squashfs-tools.in @@ -4,6 +4,7 @@ config HOST_SQUASHFS_TOOLS tristate select HOST_ZLIB select HOST_LIBLZO if HOST_SQUASHFS_TOOLS_LZO_SUPPORT + select HOST_LZ4 if HOST_SQUASHFS_TOOLS_LZ4_SUPPORT select HOST_XZ if HOST_SQUASHFS_TOOLS_XZ_SUPPORT select HOST_ZSTD if HOST_SQUASHFS_TOOLS_ZSTD_SUPPORT default y if ALLYES @@ -13,6 +14,9 @@ if HOST_SQUASHFS_TOOLS config HOST_SQUASHFS_TOOLS_LZO_SUPPORT bool +config HOST_SQUASHFS_TOOLS_LZ4_SUPPORT + bool + config HOST_SQUASHFS_TOOLS_XZ_SUPPORT bool diff --git a/rules/host-squashfs-tools.make b/rules/host-squashfs-tools.make index f34efb50f..ec04f713c 100644 --- a/rules/host-squashfs-tools.make +++ b/rules/host-squashfs-tools.make @@ -23,6 +23,7 @@ HOST_SQUASHFS_TOOLS_SUBDIR := squashfs-tools HOST_SQUASHFS_TOOLS_MAKE_OPT := \ LZO_SUPPORT=$(call ptx/ifdef, PTXCONF_HOST_SQUASHFS_TOOLS_LZO_SUPPORT,1,0) \ + LZ4_SUPPORT=$(call ptx/ifdef, PTXCONF_HOST_SQUASHFS_TOOLS_LZ4_SUPPORT,1,0) \ XZ_SUPPORT=$(call ptx/ifdef, PTXCONF_HOST_SQUASHFS_TOOLS_XZ_SUPPORT,1,0) \ ZSTD_SUPPORT=$(call ptx/ifdef, PTXCONF_HOST_SQUASHFS_TOOLS_ZSTD_SUPPORT,1,0) |