aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ubifs-utils/Makemodule.am57
-rw-r--r--ubifs-utils/common/README (renamed from ubifs-utils/mkfs.ubifs/README)2
-rw-r--r--ubifs-utils/common/compr.c (renamed from ubifs-utils/mkfs.ubifs/compr.c)0
-rw-r--r--ubifs-utils/common/compr.h (renamed from ubifs-utils/mkfs.ubifs/compr.h)0
-rw-r--r--ubifs-utils/common/crc16.c (renamed from ubifs-utils/mkfs.ubifs/crc16.c)0
-rw-r--r--ubifs-utils/common/crc16.h (renamed from ubifs-utils/mkfs.ubifs/crc16.h)0
-rw-r--r--ubifs-utils/common/crypto.c (renamed from ubifs-utils/mkfs.ubifs/crypto.c)0
-rw-r--r--ubifs-utils/common/crypto.h (renamed from ubifs-utils/mkfs.ubifs/crypto.h)0
-rw-r--r--ubifs-utils/common/defs.h (renamed from ubifs-utils/mkfs.ubifs/defs.h)0
-rw-r--r--ubifs-utils/common/devtable.c (renamed from ubifs-utils/mkfs.ubifs/devtable.c)0
-rw-r--r--ubifs-utils/common/fscrypt.c (renamed from ubifs-utils/mkfs.ubifs/fscrypt.c)0
-rw-r--r--ubifs-utils/common/fscrypt.h (renamed from ubifs-utils/mkfs.ubifs/fscrypt.h)0
-rw-r--r--ubifs-utils/common/hashtable/hashtable.c (renamed from ubifs-utils/mkfs.ubifs/hashtable/hashtable.c)0
-rw-r--r--ubifs-utils/common/hashtable/hashtable.h (renamed from ubifs-utils/mkfs.ubifs/hashtable/hashtable.h)0
-rw-r--r--ubifs-utils/common/hashtable/hashtable_itr.c (renamed from ubifs-utils/mkfs.ubifs/hashtable/hashtable_itr.c)0
-rw-r--r--ubifs-utils/common/hashtable/hashtable_itr.h (renamed from ubifs-utils/mkfs.ubifs/hashtable/hashtable_itr.h)0
-rw-r--r--ubifs-utils/common/hashtable/hashtable_private.h (renamed from ubifs-utils/mkfs.ubifs/hashtable/hashtable_private.h)0
-rw-r--r--ubifs-utils/common/key.h (renamed from ubifs-utils/mkfs.ubifs/key.h)0
-rw-r--r--ubifs-utils/common/lpt.c (renamed from ubifs-utils/mkfs.ubifs/lpt.c)0
-rw-r--r--ubifs-utils/common/lpt.h (renamed from ubifs-utils/mkfs.ubifs/lpt.h)0
-rw-r--r--ubifs-utils/common/sign.c (renamed from ubifs-utils/mkfs.ubifs/sign.c)0
-rw-r--r--ubifs-utils/common/sign.h (renamed from ubifs-utils/mkfs.ubifs/sign.h)0
-rw-r--r--ubifs-utils/common/ubifs.h (renamed from ubifs-utils/mkfs.ubifs/ubifs.h)0
23 files changed, 31 insertions, 28 deletions
diff --git a/ubifs-utils/Makemodule.am b/ubifs-utils/Makemodule.am
index 6814d47..4a617c1 100644
--- a/ubifs-utils/Makemodule.am
+++ b/ubifs-utils/Makemodule.am
@@ -1,37 +1,40 @@
-mkfs_ubifs_SOURCES = \
- ubifs-utils/mkfs.ubifs/mkfs.ubifs.c \
- ubifs-utils/mkfs.ubifs/defs.h \
- ubifs-utils/mkfs.ubifs/lpt.h \
- ubifs-utils/mkfs.ubifs/mkfs.ubifs.h \
- ubifs-utils/mkfs.ubifs/crc16.h \
- ubifs-utils/mkfs.ubifs/key.h \
- ubifs-utils/mkfs.ubifs/compr.h \
- ubifs-utils/mkfs.ubifs/ubifs.h \
- ubifs-utils/mkfs.ubifs/sign.h \
- ubifs-utils/mkfs.ubifs/crc16.c \
- ubifs-utils/mkfs.ubifs/lpt.c \
- ubifs-utils/mkfs.ubifs/compr.c \
- ubifs-utils/mkfs.ubifs/hashtable/hashtable.h \
- ubifs-utils/mkfs.ubifs/hashtable/hashtable_itr.h \
- ubifs-utils/mkfs.ubifs/hashtable/hashtable_private.h \
- ubifs-utils/mkfs.ubifs/hashtable/hashtable.c \
- ubifs-utils/mkfs.ubifs/hashtable/hashtable_itr.c \
- ubifs-utils/mkfs.ubifs/devtable.c \
+common_SOURCES = \
+ ubifs-utils/common/defs.h \
+ ubifs-utils/common/crc16.h \
+ ubifs-utils/common/crc16.c \
+ ubifs-utils/common/compr.h \
+ ubifs-utils/common/compr.c \
+ ubifs-utils/common/hashtable/hashtable.h \
+ ubifs-utils/common/hashtable/hashtable_itr.h \
+ ubifs-utils/common/hashtable/hashtable_private.h \
+ ubifs-utils/common/hashtable/hashtable.c \
+ ubifs-utils/common/hashtable/hashtable_itr.c \
+ ubifs-utils/common/devtable.c \
+ ubifs-utils/common/ubifs.h \
+ ubifs-utils/common/key.h \
+ ubifs-utils/common/lpt.h \
+ ubifs-utils/common/lpt.c \
+ ubifs-utils/common/sign.h \
include/mtd/ubifs-media.h
if WITH_CRYPTO
-mkfs_ubifs_SOURCES += ubifs-utils/mkfs.ubifs/crypto.c \
- ubifs-utils/mkfs.ubifs/crypto.h \
- ubifs-utils/mkfs.ubifs/fscrypt.c \
- ubifs-utils/mkfs.ubifs/fscrypt.h \
- ubifs-utils/mkfs.ubifs/sign.c
+common_SOURCES += ubifs-utils/common/crypto.c \
+ ubifs-utils/common/crypto.h \
+ ubifs-utils/common/fscrypt.c \
+ ubifs-utils/common/fscrypt.h \
+ ubifs-utils/common/sign.c
endif
+mkfs_ubifs_SOURCES = \
+ $(common_SOURCES) \
+ ubifs-utils/mkfs.ubifs/mkfs.ubifs.h \
+ ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
+
mkfs_ubifs_LDADD = libmtd.a libubi.a $(ZLIB_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(UUID_LIBS) $(LIBSELINUX_LIBS) $(OPENSSL_LIBS) -lm
-mkfs_ubifs_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS) $(ZSTD_CFLAGS) $(UUID_CFLAGS) $(LIBSELINUX_CFLAGS)\
- -I$(top_srcdir)/ubi-utils/include -I$(top_srcdir)/ubifs-utils/mkfs.ubifs/
+mkfs_ubifs_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS) $(ZSTD_CFLAGS) $(UUID_CFLAGS) $(LIBSELINUX_CFLAGS) \
+ -I$(top_srcdir)/ubi-utils/include -I$(top_srcdir)/ubifs-utils/mkfs.ubifs/ -I$(top_srcdir)/ubifs-utils/common
-EXTRA_DIST += ubifs-utils/mkfs.ubifs/README
+EXTRA_DIST += ubifs-utils/common/README
dist_sbin_SCRIPTS = ubifs-utils/mount.ubifs
diff --git a/ubifs-utils/mkfs.ubifs/README b/ubifs-utils/common/README
index 7e19939..8c10fd4 100644
--- a/ubifs-utils/mkfs.ubifs/README
+++ b/ubifs-utils/common/README
@@ -1,4 +1,4 @@
-UBIFS File System - Make File System program
+Common Library
* crc16.h and crc16.c were copied from the linux kernel.
* crc32.h and crc32.c were copied from mtd-utils and amended.
diff --git a/ubifs-utils/mkfs.ubifs/compr.c b/ubifs-utils/common/compr.c
index e4324f3..e4324f3 100644
--- a/ubifs-utils/mkfs.ubifs/compr.c
+++ b/ubifs-utils/common/compr.c
diff --git a/ubifs-utils/mkfs.ubifs/compr.h b/ubifs-utils/common/compr.h
index d58c7c7..d58c7c7 100644
--- a/ubifs-utils/mkfs.ubifs/compr.h
+++ b/ubifs-utils/common/compr.h
diff --git a/ubifs-utils/mkfs.ubifs/crc16.c b/ubifs-utils/common/crc16.c
index a19512e..a19512e 100644
--- a/ubifs-utils/mkfs.ubifs/crc16.c
+++ b/ubifs-utils/common/crc16.c
diff --git a/ubifs-utils/mkfs.ubifs/crc16.h b/ubifs-utils/common/crc16.h
index 539d21a..539d21a 100644
--- a/ubifs-utils/mkfs.ubifs/crc16.h
+++ b/ubifs-utils/common/crc16.h
diff --git a/ubifs-utils/mkfs.ubifs/crypto.c b/ubifs-utils/common/crypto.c
index 19c445e..19c445e 100644
--- a/ubifs-utils/mkfs.ubifs/crypto.c
+++ b/ubifs-utils/common/crypto.c
diff --git a/ubifs-utils/mkfs.ubifs/crypto.h b/ubifs-utils/common/crypto.h
index b6ffad1..b6ffad1 100644
--- a/ubifs-utils/mkfs.ubifs/crypto.h
+++ b/ubifs-utils/common/crypto.h
diff --git a/ubifs-utils/mkfs.ubifs/defs.h b/ubifs-utils/common/defs.h
index 8db5277..8db5277 100644
--- a/ubifs-utils/mkfs.ubifs/defs.h
+++ b/ubifs-utils/common/defs.h
diff --git a/ubifs-utils/mkfs.ubifs/devtable.c b/ubifs-utils/common/devtable.c
index aa815fb..aa815fb 100644
--- a/ubifs-utils/mkfs.ubifs/devtable.c
+++ b/ubifs-utils/common/devtable.c
diff --git a/ubifs-utils/mkfs.ubifs/fscrypt.c b/ubifs-utils/common/fscrypt.c
index b75bdf7..b75bdf7 100644
--- a/ubifs-utils/mkfs.ubifs/fscrypt.c
+++ b/ubifs-utils/common/fscrypt.c
diff --git a/ubifs-utils/mkfs.ubifs/fscrypt.h b/ubifs-utils/common/fscrypt.h
index ff3d326..ff3d326 100644
--- a/ubifs-utils/mkfs.ubifs/fscrypt.h
+++ b/ubifs-utils/common/fscrypt.h
diff --git a/ubifs-utils/mkfs.ubifs/hashtable/hashtable.c b/ubifs-utils/common/hashtable/hashtable.c
index c1f99ed..c1f99ed 100644
--- a/ubifs-utils/mkfs.ubifs/hashtable/hashtable.c
+++ b/ubifs-utils/common/hashtable/hashtable.c
diff --git a/ubifs-utils/mkfs.ubifs/hashtable/hashtable.h b/ubifs-utils/common/hashtable/hashtable.h
index c0b0acd..c0b0acd 100644
--- a/ubifs-utils/mkfs.ubifs/hashtable/hashtable.h
+++ b/ubifs-utils/common/hashtable/hashtable.h
diff --git a/ubifs-utils/mkfs.ubifs/hashtable/hashtable_itr.c b/ubifs-utils/common/hashtable/hashtable_itr.c
index d102453..d102453 100644
--- a/ubifs-utils/mkfs.ubifs/hashtable/hashtable_itr.c
+++ b/ubifs-utils/common/hashtable/hashtable_itr.c
diff --git a/ubifs-utils/mkfs.ubifs/hashtable/hashtable_itr.h b/ubifs-utils/common/hashtable/hashtable_itr.h
index 5c94a04..5c94a04 100644
--- a/ubifs-utils/mkfs.ubifs/hashtable/hashtable_itr.h
+++ b/ubifs-utils/common/hashtable/hashtable_itr.h
diff --git a/ubifs-utils/mkfs.ubifs/hashtable/hashtable_private.h b/ubifs-utils/common/hashtable/hashtable_private.h
index 3a558e6..3a558e6 100644
--- a/ubifs-utils/mkfs.ubifs/hashtable/hashtable_private.h
+++ b/ubifs-utils/common/hashtable/hashtable_private.h
diff --git a/ubifs-utils/mkfs.ubifs/key.h b/ubifs-utils/common/key.h
index 2de530b..2de530b 100644
--- a/ubifs-utils/mkfs.ubifs/key.h
+++ b/ubifs-utils/common/key.h
diff --git a/ubifs-utils/mkfs.ubifs/lpt.c b/ubifs-utils/common/lpt.c
index 7ee739a..7ee739a 100644
--- a/ubifs-utils/mkfs.ubifs/lpt.c
+++ b/ubifs-utils/common/lpt.c
diff --git a/ubifs-utils/mkfs.ubifs/lpt.h b/ubifs-utils/common/lpt.h
index 4cde59d..4cde59d 100644
--- a/ubifs-utils/mkfs.ubifs/lpt.h
+++ b/ubifs-utils/common/lpt.h
diff --git a/ubifs-utils/mkfs.ubifs/sign.c b/ubifs-utils/common/sign.c
index 7f284f8..7f284f8 100644
--- a/ubifs-utils/mkfs.ubifs/sign.c
+++ b/ubifs-utils/common/sign.c
diff --git a/ubifs-utils/mkfs.ubifs/sign.h b/ubifs-utils/common/sign.h
index fe9fdd8..fe9fdd8 100644
--- a/ubifs-utils/mkfs.ubifs/sign.h
+++ b/ubifs-utils/common/sign.h
diff --git a/ubifs-utils/mkfs.ubifs/ubifs.h b/ubifs-utils/common/ubifs.h
index 55937ce..55937ce 100644
--- a/ubifs-utils/mkfs.ubifs/ubifs.h
+++ b/ubifs-utils/common/ubifs.h
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-18 18:27:44 +0000