diff options
| author | KaiGai Kohei <kaigai@ak.jp.nec.com> | 2006-11-15 07:16:13 -0600 |
|---|---|---|
| committer | Josh Boyer <jwboyer@gmail.com> | 2006-11-15 07:16:13 -0600 |
| commit | 7256ce0a316f532650c8a0e1b27a8512d4474c00 (patch) | |
| tree | f64c4cde862dcdf2e07a8ae107b81e5a97e707a3 | |
| parent | 37f40f5574e04ae050507133ade8fe0e6bae2f0d (diff) | |
Patch from KaiGai Kohei to enable building without xattr support
Signed-off-by: Josh Boyer <jwboyer@gmail.com>
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | mkfs.jffs2.c | 13 |
2 files changed, 17 insertions, 0 deletions
@@ -17,6 +17,10 @@ else BUILDDIR := $(CROSS:-=) endif +ifeq ($(WITHOUT_XATTR), 1) + CFLAGS += -DWITHOUT_XATTR +endif + RAWTARGETS = ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info \ flash_otp_info flash_otp_dump mtd_debug flashcp nandwrite \ diff --git a/mkfs.jffs2.c b/mkfs.jffs2.c index 468f89e..bc9901e 100644 --- a/mkfs.jffs2.c +++ b/mkfs.jffs2.c @@ -64,8 +64,10 @@ #include <ctype.h> #include <time.h> #include <getopt.h> +#ifndef WITHOUT_XATTR #include <sys/xattr.h> #include <sys/acl.h> +#endif #include <byteswap.h> #define crc32 __complete_crap #include <zlib.h> @@ -1030,6 +1032,7 @@ static void write_special_file(struct filesystem_entry *e) padword(); } +#ifndef WITHOUT_XATTR typedef struct xattr_entry { struct xattr_entry *next; uint32_t xid; @@ -1259,6 +1262,10 @@ static void write_xattr_entry(struct filesystem_entry *e) } } +#else /* WITHOUT_XATTR */ +#define write_xattr_entry(x) +#endif + static void recursive_populate_directory(struct filesystem_entry *dir) { struct filesystem_entry *e; @@ -1416,9 +1423,11 @@ static struct option long_options[] = { {"test-compression", 0, NULL, 't'}, {"compressor-priority", 1, NULL, 'y'}, {"incremental", 1, NULL, 'i'}, +#ifndef WITHOUT_XATTR {"with-xattr", 0, NULL, 1000 }, {"with-selinux", 0, NULL, 1001 }, {"with-posix-acl", 0, NULL, 1002 }, +#endif {NULL, 0, NULL, 0} }; @@ -1451,9 +1460,11 @@ static char *helptext = " -q, --squash Squash permissions and owners making all files be owned by root\n" " -U, --squash-uids Squash owners making all files be owned by root\n" " -P, --squash-perms Squash permissions on all files\n" +#ifndef WITHOUT_XATTR " --with-xattr stuff all xattr entries into image\n" " --with-selinux stuff only SELinux Labels into jffs2 image\n" " --with-posix-acl stuff only POSIX ACL entries into jffs2 image\n" +#endif " -h, --help Display this help text\n" " -v, --verbose Verbose operation\n" " -V, --version Display version information\n" @@ -1772,6 +1783,7 @@ int main(int argc, char **argv) perror_msg_and_die("cannot open (incremental) file"); } break; +#ifndef WITHOUT_XATTR case 1000: /* --with-xattr */ enable_xattr |= (1 << JFFS2_XPREFIX_USER) | (1 << JFFS2_XPREFIX_SECURITY) @@ -1786,6 +1798,7 @@ int main(int argc, char **argv) enable_xattr |= (1 << JFFS2_XPREFIX_ACL_ACCESS) | (1 << JFFS2_XPREFIX_ACL_DEFAULT); break; +#endif } } if (out_fd == -1) { |