hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tools/mtd-utils: update mkfs.ubifs XZ support

Browse Source 
SVN-Revision: 30796
master
Gabor Juhos 13 years ago
parent c503f44f9c
commit 087747cd43
1 changed files with 148 additions and 30 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 178
      tools/mtd-utils/patches/136-mkfs.ubifs-xz-support.patch

178
tools/mtd-utils/patches/136-mkfs.ubifs-xz-support.patch
Unescape View File

@ -217,51 +217,169 @@
rm -f $(BUILDDIR)/hashtable/*.o cscope.* rm -f $(BUILDDIR)/hashtable/*.o cscope.*
--- a/mkfs.ubifs/mkfs.ubifs.c --- a/mkfs.ubifs/mkfs.ubifs.c
+++ b/mkfs.ubifs/mkfs.ubifs.c +++ b/mkfs.ubifs/mkfs.ubifs.c
@@ -178,8 +178,8 @@ static const char *helptext = @@ -98,6 +98,9 @@ struct ubifs_info info_;
static struct ubifs_info *c = &info_;
static libubi_t ubi;
+static int force_compr_set;
+static int force_compr;
+
/* Debug levels are: 0 (none), 1 (statistics), 2 (files) ,3 (more details) */
int debug_level;
int verbose;
@@ -132,7 +135,7 @@ static struct inum_mapping **hash_table;
/* Inode creation sequence number */
static unsigned long long creat_sqnum;
-static const char *optstring = "d:r:m:o:D:h?vVe:c:g:f:Fp:k:x:X:j:R:l:j:UQq";
+static const char *optstring = "d:r:m:o:D:h?vVe:c:g:f:Fp:k:x:X:y:j:R:l:j:UQq";
static const struct option longopts[] = {
{"root", 1, NULL, 'r'},
@@ -149,6 +152,7 @@ static const struct option longopts[] =
{"reserved", 1, NULL, 'R'},
{"compr", 1, NULL, 'x'},
{"favor-percent", 1, NULL, 'X'},
+ {"force-compr", 1, NULL, 'y'},
{"fanout", 1, NULL, 'f'},
{"space-fixup", 0, NULL, 'F'},
{"keyhash", 1, NULL, 'k'},
@@ -178,11 +182,13 @@ static const char *helptext =
"-o, --output=FILE output to FILE\n" "-o, --output=FILE output to FILE\n"
"-j, --jrn-size=SIZE journal size\n" "-j, --jrn-size=SIZE journal size\n"
"-R, --reserved=SIZE how much space should be reserved for the super-user\n" "-R, --reserved=SIZE how much space should be reserved for the super-user\n"
-"-x, --compr=TYPE compression type - \"lzo\", \"favor_lzo\", \"zlib\" or\n" -"-x, --compr=TYPE compression type - \"lzo\", \"favor_lzo\", \"zlib\" or\n"
-" \"none\" (default: \"lzo\")\n" -" \"none\" (default: \"lzo\")\n"
+"-x, --compr=TYPE compression type - \"lzo\", \"favor_lzo\", \"zlib\",\n" +"-x, --compr=TYPE default compression type - \"lzo\", \"favor_lzo\",\n"
+" \"xz\" or \"none\" (default: \"lzo\")\n" +" \"zlib\" or \"none\" (default: \"lzo\")\n"
"-X, --favor-percent may only be used with favor LZO compression and defines\n" "-X, --favor-percent may only be used with favor LZO compression and defines\n"
" how many percent better zlib should compress to make\n" " how many percent better zlib should compress to make\n"
" mkfs.ubifs use zlib instead of LZO (default 20%)\n" " mkfs.ubifs use zlib instead of LZO (default 20%)\n"
@@ -208,7 +208,7 @@ static const char *helptext = +"-y, --force-compr=TYPE force to build the fs with different compression -\n"
"-h, --help display this help text\n\n" +" \"lzo\", \"zlib\" or \"none\"\n"
"Note, SIZE is specified in bytes, but it may also be specified in Kilobytes,\n" "-f, --fanout=NUM fanout NUM (default: 8)\n"
"Megabytes, and Gigabytes if a KiB, MiB, or GiB suffix is used.\n\n" "-F, --space-fixup file-system free space has to be fixed up on first mount\n"
-"If you specify \"lzo\" or \"zlib\" compressors, mkfs.ubifs will use this compressor\n" " (requires kernel version 3.0 or greater)\n"
+"If you specify \"lzo\", \"xz\" or \"zlib\" compressors, mkfs.ubifs will use this compressor\n" @@ -530,6 +536,43 @@ static int open_ubi(const char *node)
"for all data. The \"none\" disables any data compression. The \"favor_lzo\" is not\n" return 0;
"really a separate compressor. It is just a method of combining \"lzo\" and \"zlib\"\n" }
"compressors. Namely, mkfs.ubifs tries to compress data with both \"lzo\" and \"zlib\"\n"
@@ -653,10 +653,13 @@ static int get_options(int argc, char**a +static const char *get_compr_str(int compr)
c->favor_lzo = 1; +{
else if (strcmp(optarg, "zlib") == 0) + switch (compr) {
c->default_compr = UBIFS_COMPR_ZLIB; + case UBIFS_COMPR_LZO:
+ else if (strcmp(optarg, "xz") == 0) + return "lzo";
+ c->default_compr = UBIFS_COMPR_XZ; + case UBIFS_COMPR_ZLIB:
else if (strcmp(optarg, "none") == 0) + return "zlib";
c->default_compr = UBIFS_COMPR_NONE; + case UBIFS_COMPR_XZ:
else if (strcmp(optarg, "lzo") != 0) + return "xz";
+ case UBIFS_COMPR_NONE:
+ return "none";
+ }
+
+ return "unknown";
+}
+
+static int get_compr_option(char *opt, int *compr_type, int *favor_lzo)
+{
+ *compr_type = UBIFS_COMPR_LZO;
+
+ if (favor_lzo)
+ *favor_lzo = 0;
+
+ if (favor_lzo && strcmp(optarg, "favor_lzo") == 0)
+ *favor_lzo = 1;
+ else if (strcmp(optarg, "zlib") == 0)
+ *compr_type = UBIFS_COMPR_ZLIB;
+ else if (strcmp(optarg, "xz") == 0)
+ *compr_type = UBIFS_COMPR_XZ;
+ else if (strcmp(optarg, "none") == 0)
+ *compr_type = UBIFS_COMPR_NONE;
+ else if (strcmp(optarg, "lzo") != 0)
+ return -1;
+
+ return 0;
+}
+
static int get_options(int argc, char**argv)
{
int opt, i;
@@ -649,14 +692,13 @@ static int get_options(int argc, char**a
return err_msg("bad key hash");
break;
case 'x':
- if (strcmp(optarg, "favor_lzo") == 0)
- c->favor_lzo = 1;
- else if (strcmp(optarg, "zlib") == 0)
- c->default_compr = UBIFS_COMPR_ZLIB;
- else if (strcmp(optarg, "none") == 0)
- c->default_compr = UBIFS_COMPR_NONE;
- else if (strcmp(optarg, "lzo") != 0)
- return err_msg("bad compressor name"); - return err_msg("bad compressor name");
+ if (get_compr_option(optarg, &c->default_compr,
+ &c->favor_lzo))
+ return err_msg("bad compressor name '%s'", + return err_msg("bad compressor name '%s'",
+ optarg); + optarg);
+ if (c->default_compr == UBIFS_COMPR_XZ)
+ return err_msg("'%s' can't be used as default compressor",
+ optarg);
break; break;
case 'X': case 'X':
c->favor_percent = strtol(optarg, &endp, 0); c->favor_percent = strtol(optarg, &endp, 0);
@@ -765,6 +768,9 @@ static int get_options(int argc, char**a @@ -665,6 +707,12 @@ static int get_options(int argc, char**a
case UBIFS_COMPR_ZLIB: return err_msg("bad favor LZO percent '%s'",
printf("\tcompr: zlib\n"); optarg);
break; break;
+ case UBIFS_COMPR_XZ: + case 'y':
+ printf("\tcompr: xz\n"); + if (get_compr_option(optarg, &force_compr, NULL))
+ return err_msg("bad forced compressor name '%s'",
+ optarg);
+ force_compr_set = 1;
+ break; + break;
case UBIFS_COMPR_NONE: case 'j':
printf("\tcompr: none\n"); c->max_bud_bytes = get_bytes(optarg);
break; if (c->max_bud_bytes <= 0)
@@ -749,6 +797,9 @@ static int get_options(int argc, char**a
c->min_io_size = 8;
c->rp_size = add_space_overhead(c->rp_size);
+ if (force_compr_set == 0)
+ force_compr = c->default_compr;
+
if (verbose) {
printf("mkfs.ubifs\n");
printf("\troot: %s\n", root);
@@ -758,17 +809,10 @@ static int get_options(int argc, char**a
printf("\toutput: %s\n", output);
printf("\tjrn_size: %llu\n", c->max_bud_bytes);
printf("\treserved: %llu\n", c->rp_size);
- switch (c->default_compr) {
- case UBIFS_COMPR_LZO:
- printf("\tcompr: lzo\n");
- break;
- case UBIFS_COMPR_ZLIB:
- printf("\tcompr: zlib\n");
- break;
- case UBIFS_COMPR_NONE:
- printf("\tcompr: none\n");
- break;
- }
+ printf("\tcompr: %s\n", get_compr_str(c->default_compr));
+ if (forced_compr_set)
+ printf("\tforced compr: %s\n",
+ get_compr_str(force_compr));
printf("\tkeyhash: %s\n", (c->key_hash == key_r5_hash) ?
"r5" : "test");
printf("\tfanout: %d\n", c->fanout);
@@ -1353,7 +1397,7 @@ static int add_file(const char *path_nam
use_compr = UBIFS_COMPR_LZO;
else
#endif
- use_compr = c->default_compr;
+ use_compr = force_compr;
compr_type = compress_data(buf, bytes_read, &dn->data,
&out_len, use_compr);
dn->compr_type = cpu_to_le16(compr_type);
--- a/mkfs.ubifs/mkfs.ubifs.h --- a/mkfs.ubifs/mkfs.ubifs.h
+++ b/mkfs.ubifs/mkfs.ubifs.h +++ b/mkfs.ubifs/mkfs.ubifs.h
@@ -77,6 +77,9 @@ @@ -77,6 +77,9 @@

Write Preview
Loading…
Cancel
Save