From 79c806cb404c2d85aeec45b40ea6adbeae9f6346 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Thu, 29 Mar 2012 00:35:09 +0800 Subject: genext2fs: support large files and filesystems without using large amounts of memory update_to_1.95.patch was generated by making a diff bewteen the 1.4.1 release and the latest 1.9.5 version in the cvs repo: http://genext2fs.cvs.sourceforge.net/viewvc/genext2fs/genext2fs/genext2fs.c?revision=1.95 The patches 0001-0019 come from mailing list of genext2fs-devel http://sourceforge.net/mailarchive/forum.php?forum_name=genext2fs-devel&max_rows=100&style=flat&viewmonth=201106 (From OE-Core rev: 8f17e499cf91191727c8767e839738cb39c21655) Signed-off-by: Dexuan Cui Signed-off-by: Richard Purdie --- .../0013-Add-volume-id-support.patch | 86 ++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 meta/recipes-devtools/genext2fs/genext2fs-1.4.1/0013-Add-volume-id-support.patch (limited to 'meta/recipes-devtools/genext2fs/genext2fs-1.4.1/0013-Add-volume-id-support.patch') diff --git a/meta/recipes-devtools/genext2fs/genext2fs-1.4.1/0013-Add-volume-id-support.patch b/meta/recipes-devtools/genext2fs/genext2fs-1.4.1/0013-Add-volume-id-support.patch new file mode 100644 index 0000000000..1777dd6b0f --- /dev/null +++ b/meta/recipes-devtools/genext2fs/genext2fs-1.4.1/0013-Add-volume-id-support.patch @@ -0,0 +1,86 @@ +Upstream-Status: inappropriate + +From 3b9edc3e7c809f64dc164d73b64ab4a606ccfea1 Mon Sep 17 00:00:00 2001 +From: Corey Minyard +Date: Fri, 3 Jun 2011 21:24:49 -0500 +Subject: [PATCH 13/19] Add volume id support. + +Add support for setting the volume id of the filesystem. This is +functionally the same as the patch from OpenEmbedded, but is built +on previous changes in this patch set. +--- + genext2fs.8 | 3 +++ + genext2fs.c | 12 ++++++++++-- + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/genext2fs.8 b/genext2fs.8 +index 0f77e7c..8b8db25 100644 +--- a/genext2fs.8 ++++ b/genext2fs.8 +@@ -61,6 +61,9 @@ Size of the image in blocks. + .BI "\-N, \-\-number\-of\-inodes inodes" + Maximum number of inodes. + .TP ++.BI "\-L, \-\-volume\-id name" ++Set the volume id (volume name) for the filesystem. ++.TP + .BI "\-i, \-\-bytes\-per\-inode ratio" + Used to calculate the maximum number of inodes from the available blocks. + .TP +diff --git a/genext2fs.c b/genext2fs.c +index e420bba..4d01bc4 100644 +--- a/genext2fs.c ++++ b/genext2fs.c +@@ -3058,6 +3058,7 @@ main(int argc, char **argv) + int squash_perms = 0; + uint16 endian = 1; + int bigendian = !*(char*)&endian; ++ char *volumelabel = NULL; + filesystem *fs; + int i; + int c; +@@ -3071,6 +3072,7 @@ main(int argc, char **argv) + { "size-in-blocks", required_argument, NULL, 'b' }, + { "bytes-per-inode", required_argument, NULL, 'i' }, + { "number-of-inodes", required_argument, NULL, 'N' }, ++ { "volume-label", required_argument, NULL, 'L' }, + { "reserved-percentage", required_argument, NULL, 'm' }, + { "block-map", required_argument, NULL, 'g' }, + { "fill-value", required_argument, NULL, 'e' }, +@@ -3087,11 +3089,11 @@ main(int argc, char **argv) + + app_name = argv[0]; + +- while((c = getopt_long(argc, argv, "x:d:D:b:i:N:m:g:e:zfqUPhVv", longopts, NULL)) != EOF) { ++ while((c = getopt_long(argc, argv, "x:d:D:b:i:N:L:m:g:e:zfqUPhVv", longopts, NULL)) != EOF) { + #else + app_name = argv[0]; + +- while((c = getopt(argc, argv, "x:d:D:b:i:N:m:g:e:zfqUPhVv")) != EOF) { ++ while((c = getopt(argc, argv, "x:d:D:b:i:N:L:m:g:e:zfqUPhVv")) != EOF) { + #endif /* HAVE_GETOPT_LONG */ + switch(c) + { +@@ -3111,6 +3113,9 @@ main(int argc, char **argv) + case 'N': + nbinodes = SI_atof(optarg); + break; ++ case 'L': ++ volumelabel = optarg; ++ break; + case 'm': + reserved_frac = SI_atof(optarg) / 100; + break; +@@ -3199,6 +3204,9 @@ main(int argc, char **argv) + fs = init_fs(nbblocks, nbinodes, nbresrvd, holes, fs_timestamp, + bigendian, fsout); + } ++ if (volumelabel != NULL) ++ strncpy((char *)fs->sb->s_volume_name, volumelabel, ++ sizeof(fs->sb->s_volume_name)); + + populate_fs(fs, dopt, didx, squash_uids, squash_perms, fs_timestamp, NULL); + +-- +1.7.4.1 + -- cgit v1.2.3-54-g00ecf