diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-05-04 21:02:09 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2019-05-04 22:22:48 +0200 |
| commit | 04aa1d971efb44eefa2290ed981c61842b7f62b7 (patch) | |
| tree | a9059276e9b58ccc54a0eaa206e6d1ca53c7b125 /mkfs | |
| parent | 7070857b47373dafc1ab93fadec79243da589a1a (diff) | |
Rename tools to not collide with squashfs-tools
This commit changes the names of the tools to gensquashfs and rdsquashfs
so they don't collide with the names used by the squashfs-tools package
and the two can be installed side by side.
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'mkfs')
| -rw-r--r-- | mkfs/Makemodule.am | 12 | ||||
| -rw-r--r-- | mkfs/block.c | 2 | ||||
| -rw-r--r-- | mkfs/meta.c | 2 | ||||
| -rw-r--r-- | mkfs/mkfs.c (renamed from mkfs/mksquashfs.c) | 2 | ||||
| -rw-r--r-- | mkfs/mkfs.h (renamed from mkfs/mksquashfs.h) | 6 | ||||
| -rw-r--r-- | mkfs/options.c | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/mkfs/Makemodule.am b/mkfs/Makemodule.am index 3914e71..5af5ad5 100644 --- a/mkfs/Makemodule.am +++ b/mkfs/Makemodule.am @@ -1,13 +1,13 @@ -mksquashfs_SOURCES = mkfs/mksquashfs.c mkfs/mksquashfs.h mkfs/block.c -mksquashfs_SOURCES += mkfs/options.c mkfs/meta.c -mksquashfs_LDADD = libsquashfs.a libfstree.a libcompress.a libutil.a +gensquashfs_SOURCES = mkfs/mkfs.c mkfs/mkfs.h mkfs/block.c +gensquashfs_SOURCES += mkfs/options.c mkfs/meta.c +gensquashfs_LDADD = libsquashfs.a libfstree.a libcompress.a libutil.a if WITH_XZ -mksquashfs_LDADD += $(XZ_LIBS) +gensquashfs_LDADD += $(XZ_LIBS) endif if WITH_GZIP -mksquashfs_LDADD += $(ZLIB_LIBS) +gensquashfs_LDADD += $(ZLIB_LIBS) endif -bin_PROGRAMS += mksquashfs +bin_PROGRAMS += gensquashfs diff --git a/mkfs/block.c b/mkfs/block.c index 3472346..76b261d 100644 --- a/mkfs/block.c +++ b/mkfs/block.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-3.0-or-later */ -#include "mksquashfs.h" +#include "mkfs.h" #include "util.h" static int write_block(file_info_t *fi, sqfs_info_t *info) diff --git a/mkfs/meta.c b/mkfs/meta.c index c48aec3..f7de5c6 100644 --- a/mkfs/meta.c +++ b/mkfs/meta.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-3.0-or-later */ #include "meta_writer.h" -#include "mksquashfs.h" +#include "mkfs.h" #include "util.h" #include <assert.h> diff --git a/mkfs/mksquashfs.c b/mkfs/mkfs.c index 2f2e508..d708d37 100644 --- a/mkfs/mksquashfs.c +++ b/mkfs/mkfs.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-3.0-or-later */ -#include "mksquashfs.h" +#include "mkfs.h" #include "util.h" static int padd_file(sqfs_info_t *info) diff --git a/mkfs/mksquashfs.h b/mkfs/mkfs.h index 106822c..8a867f2 100644 --- a/mkfs/mksquashfs.h +++ b/mkfs/mkfs.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-3.0-or-later */ -#ifndef MKSQUASHFS_H -#define MKSQUASHFS_H +#ifndef MKFS_H +#define MKFS_H #include "squashfs.h" #include "compress.h" @@ -58,4 +58,4 @@ int write_data_to_image(sqfs_info_t *info); int sqfs_write_inodes(sqfs_info_t *info); -#endif /* MKSQUASHFS_H */ +#endif /* MKFS_H */ diff --git a/mkfs/options.c b/mkfs/options.c index f1fe192..4d49a9b 100644 --- a/mkfs/options.c +++ b/mkfs/options.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: GPL-3.0-or-later */ -#include "mksquashfs.h" +#include "mkfs.h" #include "util.h" #include <stdlib.h> |