* [PATCH] AOSP: erofs-utils: update usage due to fs_config [not found] <20201012002227.1882-1-hsiangkao.ref@aol.com> @ 2020-10-12 0:22 ` Gao Xiang via Linux-erofs 2020-10-12 0:38 ` Gao Xiang via Linux-erofs 0 siblings, 1 reply; 3+ messages in thread From: Gao Xiang via Linux-erofs @ 2020-10-12 0:22 UTC (permalink / raw) To: linux-erofs After fs_config support is added, usage() is also needed to be updated as well. Fixes: 8a9e8046f170 ("AOSP: erofs-utils: add fs_config support") Cc: Li Guifu <bluce.lee@aliyun.com> Signed-off-by: Gao Xiang <hsiangkao@aol.com> --- mkfs/main.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/mkfs/main.c b/mkfs/main.c index 191003409b2f..6dda9e399ad5 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -61,17 +61,23 @@ static void usage(void) { fputs("usage: [options] FILE DIRECTORY\n\n" "Generate erofs image from DIRECTORY to FILE, and [options] are:\n" - " -zX[,Y] X=compressor (Y=compression level, optional)\n" - " -d# set output message level to # (maximum 9)\n" - " -x# set xattr tolerance to # (< 0, disable xattrs; default 2)\n" - " -EX[,...] X=extended options\n" - " -T# set a fixed UNIX timestamp # to all files\n" - " --exclude-path=X avoid including file X (X = exact literal path)\n" - " --exclude-regex=X avoid including files that match X (X = regular expression)\n" + " -zX[,Y] X=compressor (Y=compression level, optional)\n" + " -d# set output message level to # (maximum 9)\n" + " -x# set xattr tolerance to # (< 0, disable xattrs; default 2)\n" + " -EX[,...] X=extended options\n" + " -T# set a fixed UNIX timestamp # to all files\n" + " --exclude-path=X avoid including file X (X = exact literal path)\n" + " --exclude-regex=X avoid including files that match X (X = regular expression)\n" #ifdef HAVE_LIBSELINUX - " --file-contexts=X specify a file contexts file to setup selinux labels\n" + " --file-contexts=X specify a file contexts file to setup selinux labels\n" +#endif + " --help display this help and exit\n" +#ifdef WITH_ANDROID + "\nwith following android-specific options:\n" + " --mount-point=X X=prefix of target fs path (default: /)\n" + " --product-out=X X=product_out directory\n" + " --fs-config-file=X X=fs_config file\n" #endif - " --help display this help and exit\n" "\nAvailable compressors are: ", stderr); print_available_compressors(stderr, ", "); } -- 2.24.0 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] AOSP: erofs-utils: update usage due to fs_config 2020-10-12 0:22 ` [PATCH] AOSP: erofs-utils: update usage due to fs_config Gao Xiang via Linux-erofs @ 2020-10-12 0:38 ` Gao Xiang via Linux-erofs 2020-10-12 15:20 ` Li GuiFu via Linux-erofs 0 siblings, 1 reply; 3+ messages in thread From: Gao Xiang via Linux-erofs @ 2020-10-12 0:38 UTC (permalink / raw) To: linux-erofs After fs_config support is added, usage() should be updated together as well. Fixes: 8a9e8046f170 ("AOSP: erofs-utils: add fs_config support") Cc: Li Guifu <bluce.lee@aliyun.com> Signed-off-by: Gao Xiang <hsiangkao@aol.com> --- v2: fix commit message expression. mkfs/main.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/mkfs/main.c b/mkfs/main.c index 191003409b2f..6dda9e399ad5 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -61,17 +61,23 @@ static void usage(void) { fputs("usage: [options] FILE DIRECTORY\n\n" "Generate erofs image from DIRECTORY to FILE, and [options] are:\n" - " -zX[,Y] X=compressor (Y=compression level, optional)\n" - " -d# set output message level to # (maximum 9)\n" - " -x# set xattr tolerance to # (< 0, disable xattrs; default 2)\n" - " -EX[,...] X=extended options\n" - " -T# set a fixed UNIX timestamp # to all files\n" - " --exclude-path=X avoid including file X (X = exact literal path)\n" - " --exclude-regex=X avoid including files that match X (X = regular expression)\n" + " -zX[,Y] X=compressor (Y=compression level, optional)\n" + " -d# set output message level to # (maximum 9)\n" + " -x# set xattr tolerance to # (< 0, disable xattrs; default 2)\n" + " -EX[,...] X=extended options\n" + " -T# set a fixed UNIX timestamp # to all files\n" + " --exclude-path=X avoid including file X (X = exact literal path)\n" + " --exclude-regex=X avoid including files that match X (X = regular expression)\n" #ifdef HAVE_LIBSELINUX - " --file-contexts=X specify a file contexts file to setup selinux labels\n" + " --file-contexts=X specify a file contexts file to setup selinux labels\n" +#endif + " --help display this help and exit\n" +#ifdef WITH_ANDROID + "\nwith following android-specific options:\n" + " --mount-point=X X=prefix of target fs path (default: /)\n" + " --product-out=X X=product_out directory\n" + " --fs-config-file=X X=fs_config file\n" #endif - " --help display this help and exit\n" "\nAvailable compressors are: ", stderr); print_available_compressors(stderr, ", "); } -- 2.24.0 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] AOSP: erofs-utils: update usage due to fs_config 2020-10-12 0:38 ` Gao Xiang via Linux-erofs @ 2020-10-12 15:20 ` Li GuiFu via Linux-erofs 0 siblings, 0 replies; 3+ messages in thread From: Li GuiFu via Linux-erofs @ 2020-10-12 15:20 UTC (permalink / raw) To: Gao Xiang, linux-erofs On 2020/10/12 8:38, Gao Xiang wrote: > After fs_config support is added, usage() should > be updated together as well. > > Fixes: 8a9e8046f170 ("AOSP: erofs-utils: add fs_config support") > Cc: Li Guifu <bluce.lee@aliyun.com> > Signed-off-by: Gao Xiang <hsiangkao@aol.com> Reviewed-by: Li Guifu <bluce.lee@aliyun.com> ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-12 15:21 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <20201012002227.1882-1-hsiangkao.ref@aol.com> 2020-10-12 0:22 ` [PATCH] AOSP: erofs-utils: update usage due to fs_config Gao Xiang via Linux-erofs 2020-10-12 0:38 ` Gao Xiang via Linux-erofs 2020-10-12 15:20 ` Li GuiFu via Linux-erofs
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).