erofs-utils: introduce exclude dirs and files
PATCH v2 1/1 erofs-utils: introduce exclude dirs and files
From: Li Guifu <[email protected]>
Add excluded file feature "--exclude-path=", which can be used to build EROFS image without some user specific files or dirs. Such multiple files can be seperated by ','.
--- include/erofs/exclude.h | 28 ++++++++ lib/Makefile.am | 2 +- lib/exclude.c | 149 ++++++++++++++++++++++++++++++++++++++++ lib/inode.c | 10 +++ mkfs/main.c | 11 +++ 5 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 include/erofs/exclude.h create mode 100644 lib/exclude.c
include/erofs/exclude.h new file +28 -0
@@ -0,0 +1,28 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* exclude.h +* Created by Li Guifu <[email protected]> +*/ + +#ifndef __EROFS_EXCLUDE_H +#define __EROFS_EXCLUDE_H + +struct exclude_rule { +struct list_head list; +struct list_head hlist; +char *pattern; +}; + +void erofs_init_exclude_rules (void ); +void erofs_free_exclude_rules (void ); +int erofs_parse_exclude_path (const char *args); +struct exclude_rule *erofs_pattern_matched (const char *s); +struct exclude_rule *erofs_entry_matched (struct exclude_rule *e, +const char *s,unsigned int len); + +static inline int erofs_is_pattern_end (struct exclude_rule *e) +{ +return list_empty (&e->hlist); +} +#endif +
lib/Makefile.am +1 -1
@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = liberofs.la liberofs_la_SOURCES = config.c io.c cache.c inode.c xattr.c \ - compress.c compressor.c + compress.c compressor.c exclude.c liberofs_la_CFLAGS = -Wall -Werror -I$(top_srcdir)/include if ENABLE_LZ4 liberofs_la_CFLAGS += ${LZ4_CFLAGS}
lib/exclude.c new file +149 -0
149 lines not on this page · raw message
lib/inode.c +10 -0
@@ -20,6 +20,7 @@#include "erofs/io.h" #include "erofs/compress.h" #include "erofs/xattr.h" +#include "erofs/exclude.h" struct erofs_sb_info sbi;
@@ -825,6 +826,7 @@ struct erofs_inode *erofs_mkfs_build_tree(struct erofs_inode *dir)DIR *_dir;struct dirent *dp;struct erofs_dentry *d; +struct exclude_rule *e; ret =erofs_prepare_xattr_ibody (dir->i_srcpath, &dir->i_xattrs);if (ret <0 )
@@ -863,6 +865,7 @@ struct erofs_inode *erofs_mkfs_build_tree(struct erofs_inode *dir)return ERR_PTR (-errno); } + e =erofs_pattern_matched (dir->i_srcpath +strlen (cfg.c_src_path));while (1 ) {/* * set errno to 0 before calling readdir() in order to
@@ -876,7 +879,14 @@ struct erofs_inode *erofs_mkfs_build_tree(struct erofs_inode *dir)if (is_dot_dotdot (dp->d_name) || !strncmp (dp->d_name,"lost+found" ,strlen ("lost+found" )))continue ; +if (!IS_ERR (e)) { +struct exclude_rule *le; + le =erofs_entry_matched (e, dp->d_name, +strlen (dp->d_name)); +if (!IS_ERR (le) &&erofs_is_pattern_end (le)) +continue ; + } d =erofs_d_alloc (dir, dp->d_name);if (IS_ERR (d)) { ret =PTR_ERR (d);
mkfs/main.c +11 -0
@@ -21,6 +21,7 @@#include "erofs/io.h" #include "erofs/compress.h" #include "erofs/xattr.h" +#include "erofs/exclude.h" #ifdef HAVE_LIBUUID #include <uuid/uuid.h>
@@ -30,6 +31,7 @@static struct option long_options[] = { {"help" , no_argument,0 ,1 }, + {"exclude-path" , required_argument,NULL ,2 }, {0 ,0 ,0 ,0 }, };
@@ -178,6 +180,13 @@ static int mkfs_parse_options_cfg(int argc, char *argv[]) }break ; +case 2 : +if (erofs_parse_exclude_path (optarg)) { +usage (); +exit (0 ); + } +break ; +case 1 :usage ();exit (0 );
@@ -334,6 +343,7 @@ int main(int argc, char **argv)struct timeval t;erofs_init_configure (); +erofs_init_exclude_rules ();fprintf (stderr,"%s %s\n" ,basename (argv[0 ]), cfg.c_version); cfg.c_legacy_compress = false;
@@ -429,6 +439,7 @@ exit:z_erofs_compress_exit ();dev_close ();erofs_exit_configure (); +erofs_free_exclude_rules ();if (err) { erofs_err("\tCould not format the device : %s\n",
Signature · 1 line
2.17.1
Hi Guifu,
I cleanup the whole patch and get rid of all dedupe check in order to make it as simple as possible since I think not too many exclude files in general.
Please take some time helping testing the following patch and hope to get your feedback.
Thanks,
Gao Xiang
From 600fc166cdaaa0e458181729245ce11affa83ac5 Mon Sep 17 00:00:00 2001
From: Li Guifu <[email protected]>
Date: Mon, 3 Feb 2020 23:38:11 +0800
Subject: [PATCH v3] erofs-utils: introduce exclude dirs and files
Add excluded file feature "--exclude-path=", which can be used to build EROFS image without some user specific files or dirs.
Note that you may give multiple `--exclude-path' options.
---
changes since v2:
- cleanup the whole implementation;
- complete usage message;
- complete manual page.
include/erofs/exclude.h | 23 +++++++++++ lib/Makefile.am | 2 +- lib/exclude.c | 89 +++++++++++++++++++++++++++++++++++++++++ lib/inode.c | 5 +++ man/mkfs.erofs.1 | 4 ++ mkfs/main.c | 26 +++++++++--- 6 files changed, 142 insertions(+), 7 deletions(-) create mode 100644 include/erofs/exclude.h create mode 100644 lib/exclude.c
include/erofs/exclude.h new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* erofs-utils/include/erofs/exclude.h +* +* Created by Li Guifu <[email protected]> +*/ +#ifndef __EROFS_EXCLUDE_H +#define __EROFS_EXCLUDE_H + +struct erofs_exclude_rule { +struct list_head list; + +char *pattern; +}; + +void erofs_exclude_set_root (const char *rootdir); +void erofs_cleanup_exclude_rules (void ); + +int erofs_parse_exclude_path (const char *args); +struct erofs_exclude_rule *erofs_is_exclude_path (const char *dir, +const char *name); +#endif +
lib/Makefile.am +1 -1
@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = liberofs.la liberofs_la_SOURCES = config.c io.c cache.c inode.c xattr.c \ - compress.c compressor.c + compress.c compressor.c exclude.c liberofs_la_CFLAGS = -Wall -Werror -I$(top_srcdir)/include if ENABLE_LZ4 liberofs_la_CFLAGS += ${LZ4_CFLAGS}
lib/exclude.c new file +89 -0
89 lines not on this page · raw message
lib/inode.c +5 -0
@@ -20,6 +20,7 @@#include "erofs/io.h" #include "erofs/compress.h" #include "erofs/xattr.h" +#include "erofs/exclude.h" struct erofs_sb_info sbi;
@@ -877,6 +878,10 @@ struct erofs_inode *erofs_mkfs_build_tree(struct erofs_inode *dir) !strncmp(dp->d_name, "lost+found", strlen("lost+found"))) continue; +/* skip if it's a exclude file */ +if (erofs_is_exclude_path (dir->i_srcpath, dp->d_name)) +continue ; + d =erofs_d_alloc (dir, dp->d_name);if (IS_ERR (d)) { ret =PTR_ERR (d);
man/mkfs.erofs.1 +4 -0
@@ -52,6 +52,10 @@ Forcely generate extended inodes (64-byte inodes) to output. Set all files to the given UNIX timestamp. Reproducible builds requires setting all to a specific one. .TP +.BI "\-\-exclude-path=" path +Ignore file that matches the exact literal path. +You may give multiple `--exclude-path' options. +.TP .B \-\-help Display this help and exit. .SH AUTHOR
mkfs/main.c +20 -6
@@ -21,6 +21,7 @@#include "erofs/io.h" #include "erofs/compress.h" #include "erofs/xattr.h" +#include "erofs/exclude.h" #ifdef HAVE_LIBUUID #include <uuid/uuid.h>
@@ -30,6 +31,7 @@static struct option long_options[] = { {"help" , no_argument,0 ,1 }, + {"exclude-path" , required_argument,NULL ,2 }, {0 ,0 ,0 ,0 }, };
@@ -50,12 +52,13 @@ 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" -" --help display this help and exit\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" +" --help display this help and exit\n" "\nAvailable compressors are: " , stderr);print_available_compressors (stderr,", " ); }
@@ -178,6 +181,15 @@ static int mkfs_parse_options_cfg(int argc, char *argv[]) }break ; +case 2 : + opt =erofs_parse_exclude_path (optarg); +if (opt) { +erofs_err ("failed to parse exclude path: %s" , +erofs_strerror (opt)); +return opt; + } +break ; +case 1 :usage ();exit (0 );
@@ -372,6 +384,7 @@ int main(int argc, char **argv) }erofs_show_config (); +erofs_exclude_set_root (cfg.c_src_path); sb_bh =erofs_buffer_init ();if (IS_ERR (sb_bh)) {
@@ -428,6 +441,7 @@ int main(int argc, char **argv) exit:z_erofs_compress_exit ();dev_close (); +erofs_cleanup_exclude_rules ();erofs_exit_configure ();if (err) {
Signature · 1 line
2.20.1
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 2 lines · Li Guifu
Gao Xiang,
It would make a long string match on each path sprintfed from a dir.
It seems that your @foxmail.com email is still broken, because I haven't seen this email on mailing list till now. I'd suggest you could fix your email first.
Quoted 1 line
The parent's path don'y need to compare every times,just loop the sub dirs.
It's a very simple approach to implement this feature (exact match) as the first step. Because for most paths without valid prefix, it will just bail out on the first char and it will have no impact if we don't use this feature.
Laterly, I'd suggest some sorted string array to solve what you mentioned. (You could improve it in the following way.)
Take an example, we could keep such sorted string array in memory.
0 A/B
1 A/B/C
2 A/B/D
3 A/B/E/F
4 A/G
5 H
For each access, we can binary search and narrow down the range dynamicly. e.g. if we open A dir, the search range will be from 0 to 4. and if we open A/B dir, the search range will then be narrowed down to 0~3.
Quoted 2 lines
It also would better to use relate path on image path not the absolute
path in the exclude path.
No, I think it works on relative path. You could test it out first.
Thanks,
Gao Xiang
Quoted 294 lines
What your's opinion ?
Quoted 290 lines · Gao Xiang via Linux-erofs
Hi Guifu,
I cleanup the whole patch and get rid of all dedupe check in order to make it as simple as possible since I think not too many exclude files in general.
Please take some time helping testing the following patch and hope to get your feedback.
Thanks,
Gao XiangQuoted 1 line
From
600fc166cdaaa0e458181729245ce11affa83ac5Mon Sep 17 00:00:00 2001From: Li Guifu <[email protected]>
Date: Mon, 3 Feb 2020 23:38:11 +0800
Subject: [PATCH v3] erofs-utils: introduce exclude dirs and filesAdd excluded file feature "--exclude-path=", which can be used to build EROFS image without some user specific files or dirs.
Note that you may give multiple `--exclude-path' options.
Signed-off-by Li Guifu <[email protected]>Signed-off-by Gao Xiang <[email protected]>---
changes since v2:
- cleanup the whole implementation;
- complete usage message;
- complete manual page.include/erofs/exclude.h | 23 +++++++++++ lib/Makefile.am | 2 +- lib/exclude.c | 89 +++++++++++++++++++++++++++++++++++++++++ lib/inode.c | 5 +++ man/mkfs.erofs.1 | 4 ++ mkfs/main.c | 26 +++++++++--- 6 files changed, 142 insertions(+), 7 deletions(-) create mode 100644 include/erofs/exclude.h create mode 100644 lib/exclude.cinclude/erofs/exclude.h new file +23
-0@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* erofs-utils/include/erofs/exclude.h +* +* Created by Li Guifu <[email protected]> +*/ +#ifndef __EROFS_EXCLUDE_H +#define __EROFS_EXCLUDE_H + +struct erofs_exclude_rule { +struct list_head list; + +char *pattern; +}; + +void erofs_exclude_set_root (const char *rootdir); +void erofs_cleanup_exclude_rules (void ); + +int erofs_parse_exclude_path (const char *args); +struct erofs_exclude_rule *erofs_is_exclude_path (const char *dir, +const char *name); +#endif +lib/Makefile.am +1
-1@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = liberofs.la liberofs_la_SOURCES = config.c io.c cache.c inode.c xattr.c \ - compress.c compressor.c + compress.c compressor.c exclude.c liberofs_la_CFLAGS = -Wall -Werror -I$(top_srcdir)/include if ENABLE_LZ4 liberofs_la_CFLAGS += ${LZ4_CFLAGS}lib/exclude.c new file +89
-0@@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* erofs-utils/lib/exclude.c +* +* Created by Li Guifu <[email protected]> +*/ +#include <string.h> +#include <stdlib.h> +#include "erofs/err.h" +#include "erofs/list.h" +#include "erofs/print.h" +#include "erofs/exclude.h" + +static LIST_HEAD (exclude_head); +static unsigned int rpathlen;/* root directory prefix length */ + +void erofs_exclude_set_root (const char *rootdir) +{ + rpathlen =strlen (rootdir); +} + +static struct erofs_exclude_rule *erofs_insert_exclude (const char *s) +{ +struct erofs_exclude_rule *e; + + e =malloc (sizeof (*e)); +if (!e) +return ERR_PTR (-ENOMEM ); + +/* exact match */ + e->pattern =strdup (s); +if (!e->pattern) { +free (e); +return ERR_PTR (-ENOMEM ); + } + +list_add_tail (&e->list, &exclude_head); +erofs_info ("exclude path %s inserted" , e->pattern); +return e; +} + +void erofs_cleanup_exclude_rules (void ) +{ +struct erofs_exclude_rule *e, *n; + +list_for_each_entry_safe (e, n, &exclude_head, list) { +list_del (&e->list); +free (e->pattern); +free (e); + } +} + +int erofs_parse_exclude_path (const char *args) +{ +struct erofs_exclude_rule *e =erofs_insert_exclude (args); + +if (IS_ERR (e)) { +erofs_cleanup_exclude_rules (); +return PTR_ERR (e); + } +return 0 ; +} + +struct erofs_exclude_rule *erofs_is_exclude_path (const char *dir, +const char *name) +{ +char buf[PATH_MAX ]; +const char *s; +struct erofs_exclude_rule *e; + +if (!dir) { +/* no prefix */ + s = name; + }else { +sprintf (buf,"%s/%s" , dir, name); + s = buf; + } + + s += rpathlen; +while (*s =='/' ) + s++; + +list_for_each_entry (e, &exclude_head, list) { +if (!strcmp (e->pattern, s)) +return e; + } +return NULL ; +} +lib/inode.c +5
-0@@ -20,6 +20,7 @@#include "erofs/io.h" #include "erofs/compress.h" #include "erofs/xattr.h" +#include "erofs/exclude.h" struct erofs_sb_info sbi;@@ -877,6 +878,10 @@ struct erofs_inode *erofs_mkfs_build_tree(struct erofs_inode *dir) !strncmp(dp->d_name, "lost+found", strlen("lost+found"))) continue; +/* skip if it's a exclude file */ +if (erofs_is_exclude_path (dir->i_srcpath, dp->d_name)) +continue ; + d =erofs_d_alloc (dir, dp->d_name);if (IS_ERR (d)) { ret =PTR_ERR (d);man/mkfs.erofs.1 +4
-0@@ -52,6 +52,10 @@ Forcely generate extended inodes (64-byte inodes) to output. Set all files to the given UNIX timestamp. Reproducible builds requires setting all to a specific one. .TP +.BI "\-\-exclude-path=" path +Ignore file that matches the exact literal path. +You may give multiple `--exclude-path' options. +.TP .B \-\-help Display this help and exit. .SH AUTHORmkfs/main.c +20
-6@@ -21,6 +21,7 @@#include "erofs/io.h" #include "erofs/compress.h" #include "erofs/xattr.h" +#include "erofs/exclude.h" #ifdef HAVE_LIBUUID #include <uuid/uuid.h> @@ -30,6 +31,7 @@static struct option long_options[] = { {"help" , no_argument,0 ,1 }, + {"exclude-path" , required_argument,NULL ,2 }, {0 ,0 ,0 ,0 }, };@@ -50,12 +52,13 @@ 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" -" --help display this help and exit\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" +" --help display this help and exit\n" "\nAvailable compressors are: " , stderr);print_available_compressors (stderr,", " ); }@@ -178,6 +181,15 @@ static int mkfs_parse_options_cfg(int argc, char *argv[]) }break ; +case 2 : + opt =erofs_parse_exclude_path (optarg); +if (opt) { +erofs_err ("failed to parse exclude path: %s" , +erofs_strerror (opt)); +return opt; + } +break ; +case 1 :usage ();exit (0 );@@ -372,6 +384,7 @@ int main(int argc, char **argv) }erofs_show_config (); +erofs_exclude_set_root (cfg.c_src_path); sb_bh =erofs_buffer_init ();if (IS_ERR (sb_bh)) {@@ -428,6 +441,7 @@ int main(int argc, char **argv) exit:z_erofs_compress_exit ();dev_close (); +erofs_cleanup_exclude_rules ();erofs_exit_configure ();if (err) {
Hi
My e-mail of foxmail was broken in the mainline, use aliyun instead.
Quoted 290 lines · Gao Xiang via Linux-erofs
Hi Guifu,
I cleanup the whole patch and get rid of all dedupe check in order to make it as simple as possible since I think not too many exclude files in general.
Please take some time helping testing the following patch and hope to get your feedback.
Thanks,
Gao XiangQuoted 1 line
From
600fc166cdaaa0e458181729245ce11affa83ac5Mon Sep 17 00:00:00 2001From: Li Guifu <[email protected]>
Date: Mon, 3 Feb 2020 23:38:11 +0800
Subject: [PATCH v3] erofs-utils: introduce exclude dirs and filesAdd excluded file feature "--exclude-path=", which can be used to build EROFS image without some user specific files or dirs.
Note that you may give multiple `--exclude-path' options.
Signed-off-by Li Guifu <[email protected]>Signed-off-by Gao Xiang <[email protected]>---
changes since v2:
- cleanup the whole implementation;
- complete usage message;
- complete manual page.include/erofs/exclude.h | 23 +++++++++++ lib/Makefile.am | 2 +- lib/exclude.c | 89 +++++++++++++++++++++++++++++++++++++++++ lib/inode.c | 5 +++ man/mkfs.erofs.1 | 4 ++ mkfs/main.c | 26 +++++++++--- 6 files changed, 142 insertions(+), 7 deletions(-) create mode 100644 include/erofs/exclude.h create mode 100644 lib/exclude.cinclude/erofs/exclude.h new file +23
-0@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* erofs-utils/include/erofs/exclude.h +* +* Created by Li Guifu <[email protected]> +*/ +#ifndef __EROFS_EXCLUDE_H +#define __EROFS_EXCLUDE_H + +struct erofs_exclude_rule { +struct list_head list; + +char *pattern; +}; + +void erofs_exclude_set_root (const char *rootdir); +void erofs_cleanup_exclude_rules (void ); + +int erofs_parse_exclude_path (const char *args); +struct erofs_exclude_rule *erofs_is_exclude_path (const char *dir, +const char *name); +#endif +lib/Makefile.am +1
-1@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = liberofs.la liberofs_la_SOURCES = config.c io.c cache.c inode.c xattr.c \ - compress.c compressor.c + compress.c compressor.c exclude.c liberofs_la_CFLAGS = -Wall -Werror -I$(top_srcdir)/include if ENABLE_LZ4 liberofs_la_CFLAGS += ${LZ4_CFLAGS}lib/exclude.c new file +89
-0@@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* erofs-utils/lib/exclude.c +* +* Created by Li Guifu <[email protected]> +*/ +#include <string.h> +#include <stdlib.h> +#include "erofs/err.h" +#include "erofs/list.h" +#include "erofs/print.h" +#include "erofs/exclude.h" + +static LIST_HEAD (exclude_head); +static unsigned int rpathlen;/* root directory prefix length */ + +void erofs_exclude_set_root (const char *rootdir) +{ + rpathlen =strlen (rootdir); +} + +static struct erofs_exclude_rule *erofs_insert_exclude (const char *s) +{ +struct erofs_exclude_rule *e; + + e =malloc (sizeof (*e)); +if (!e) +return ERR_PTR (-ENOMEM ); + +/* exact match */ + e->pattern =strdup (s); +if (!e->pattern) { +free (e); +return ERR_PTR (-ENOMEM ); + } + +list_add_tail (&e->list, &exclude_head); +erofs_info ("exclude path %s inserted" , e->pattern); +return e; +} + +void erofs_cleanup_exclude_rules (void ) +{ +struct erofs_exclude_rule *e, *n; + +list_for_each_entry_safe (e, n, &exclude_head, list) { +list_del (&e->list); +free (e->pattern); +free (e); + } +} + +int erofs_parse_exclude_path (const char *args) +{ +struct erofs_exclude_rule *e =erofs_insert_exclude (args); + +if (IS_ERR (e)) { +erofs_cleanup_exclude_rules (); +return PTR_ERR (e); + } +return 0 ; +} + +struct erofs_exclude_rule *erofs_is_exclude_path (const char *dir, +const char *name) +{ +char buf[PATH_MAX ]; +const char *s; +struct erofs_exclude_rule *e; + +if (!dir) { +/* no prefix */ + s = name; + }else { +sprintf (buf,"%s/%s" , dir, name); + s = buf; + } + + s += rpathlen; +while (*s =='/' ) + s++; + +list_for_each_entry (e, &exclude_head, list) { +if (!strcmp (e->pattern, s)) +return e; + } +return NULL ; +} +lib/inode.c +5
-0@@ -20,6 +20,7 @@#include "erofs/io.h" #include "erofs/compress.h" #include "erofs/xattr.h" +#include "erofs/exclude.h" struct erofs_sb_info sbi;@@ -877,6 +878,10 @@ struct erofs_inode *erofs_mkfs_build_tree(struct erofs_inode *dir) !strncmp(dp->d_name, "lost+found", strlen("lost+found"))) continue; +/* skip if it's a exclude file */ +if (erofs_is_exclude_path (dir->i_srcpath, dp->d_name)) +continue ; + d =erofs_d_alloc (dir, dp->d_name);if (IS_ERR (d)) { ret =PTR_ERR (d);man/mkfs.erofs.1 +4
-0@@ -52,6 +52,10 @@ Forcely generate extended inodes (64-byte inodes) to output. Set all files to the given UNIX timestamp. Reproducible builds requires setting all to a specific one. .TP +.BI "\-\-exclude-path=" path +Ignore file that matches the exact literal path. +You may give multiple `--exclude-path' options. +.TP .B \-\-help Display this help and exit. .SH AUTHORmkfs/main.c +20
-6@@ -21,6 +21,7 @@#include "erofs/io.h" #include "erofs/compress.h" #include "erofs/xattr.h" +#include "erofs/exclude.h" #ifdef HAVE_LIBUUID #include <uuid/uuid.h> @@ -30,6 +31,7 @@static struct option long_options[] = { {"help" , no_argument,0 ,1 }, + {"exclude-path" , required_argument,NULL ,2 }, {0 ,0 ,0 ,0 }, };@@ -50,12 +52,13 @@ 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" -" --help display this help and exit\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" +" --help display this help and exit\n" "\nAvailable compressors are: " , stderr);print_available_compressors (stderr,", " ); }@@ -178,6 +181,15 @@ static int mkfs_parse_options_cfg(int argc, char *argv[]) }break ; +case 2 : + opt =erofs_parse_exclude_path (optarg); +if (opt) { +erofs_err ("failed to parse exclude path: %s" , +erofs_strerror (opt)); +return opt; + } +break ; +case 1 :usage ();exit (0 );@@ -372,6 +384,7 @@ int main(int argc, char **argv) }erofs_show_config (); +erofs_exclude_set_root (cfg.c_src_path); sb_bh =erofs_buffer_init ();if (IS_ERR (sb_bh)) {@@ -428,6 +441,7 @@ int main(int argc, char **argv) exit:z_erofs_compress_exit ();dev_close (); +erofs_cleanup_exclude_rules ();erofs_exit_configure ();if (err) {