1 files changed, 100 insertions, 0 deletions
diff --git a/meta/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-20060131.patch b/meta/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-20060131.patch
new file mode 100644
index 0000000000..e24f395890
--- /dev/null
+++ b/meta/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-20060131.patch
@@ -0,0 +1,100 @@
+--- mtd/util/mkfs.jffs2.c~add-exclusion-to-mkfs-jffs2.patch
+++ mtd/util/mkfs.jffs2.c
+@@ -92,7 +92,12 @@
+        struct filesystem_entry *files; /* Only relevant to directories */
+ };
+ 
+-
+struct ignorepath_entry {
+       struct ignorepath_entry* next;  /* Points to the next ignorepath element */
+       char name[PATH_MAX];            /* Name of the entry */
+};
+ 
+static struct ignorepath_entry* ignorepath = 0;
+ static int out_fd = -1;
+ static int in_fd = -1;
+ static char default_rootdir[] = ".";
+@@ -367,7 +372,7 @@
+        char *hpath, *tpath;
+        struct dirent *dp, **namelist;
+        struct filesystem_entry *entry;
+-
+       struct ignorepath_entry* element = ignorepath;
+ 
+        if (lstat(hostpath, &sb)) {
+                perror_msg_and_die("%s", hostpath);
+@@ -376,6 +381,15 @@
+        entry = add_host_filesystem_entry(targetpath, hostpath,
+                        sb.st_uid, sb.st_gid, sb.st_mode, 0, parent);
+ 
+       while ( element ) {
+               if ( strcmp( element->name, targetpath ) == 0 ) {
+                       printf( "Note: ignoring directories below '%s'\n", targetpath );
+                       return entry;
+                       break;
+               }
+               element = element->next;
+       }
+
+        n = scandir(hostpath, &namelist, 0, alphasort);
+        if (n < 0) {
+                perror_msg_and_die("opening directory %s", hostpath);
+@@ -1157,6 +1171,7 @@
+        {"root", 1, NULL, 'r'},
+        {"pagesize", 1, NULL, 's'},
+        {"eraseblock", 1, NULL, 'e'},
+       {"ignore", 1, NULL, 'I'},
+        {"output", 1, NULL, 'o'},
+        {"help", 0, NULL, 'h'},
+        {"verbose", 0, NULL, 'v'},
+@@ -1199,6 +1214,7 @@
+         "  -L, --list-compressors  Show the list of the avaiable compressors\n"
+         "  -t, --test-compression  Call decompress and compare with the original (for test)\n"
+        "  -n, --no-eraseblock-headers   Don't add a eraseblock header to every eraseblock\n"
+       "  -I, --ignore=PATH       Ignore sub directory and file tree below PATH when recursing over the file system\n"
+        "  -o, --output=FILE       Output to FILE (default: stdout)\n"
+        "  -l, --little-endian     Create a little-endian filesystem\n"
+        "  -b, --big-endian        Create a big-endian filesystem\n"
+@@ -1368,11 +1384,12 @@
+        struct filesystem_entry *root;
+         char *compr_name = NULL;
+         int compr_prior  = -1;
+       struct ignorepath_entry* element = ignorepath;
+ 
+         jffs2_compressors_init();
+ 
+        while ((opt = getopt_long(argc, argv,
+-                                       "D:d:r:s:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0)
+                                       "D:d:r:s:I:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0)
+        {
+                switch (opt) {
+                        case 'D':
+@@ -1395,6 +1412,28 @@
+                                page_size = strtol(optarg, NULL, 0);
+                                break;
+ 
+                       case 'I':
+                               printf( "Note: Adding '%s' to ignore Path\n", optarg );
+                               element = ignorepath;
+                               if ( !ignorepath ) {
+                                       ignorepath = xmalloc( sizeof( struct ignorepath_entry ) );
+                                       ignorepath->next = 0;
+                                       strcpy( &ignorepath->name[0], optarg );
+                               } else {
+                                       while ( element->next ) element = element->next;
+                                       element->next = xmalloc( sizeof( struct ignorepath_entry ) );
+                                       element->next->next = 0;
+                                       strcpy( &element->next->name[0], optarg );
+                               }
+                               printf( "--------- Dumping ignore path list ----------------\n" );
+                               element = ignorepath;
+                               while ( element ) {
+                                       printf( "  * '%s'\n", &element->name[0] );
+                                       element = element->next;
+                               }
+                               printf( "---------------------------------------------------\n" );
+                               break;
+
+                        case 'o':
+                                if (out_fd != -1) {
+                                        error_msg_and_die("output filename specified more than once");

diff --git a/meta/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-20060131.patch b/meta/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-20060131.patch new file mode 100644 index 0000000000..e24f395890 --- /dev/null +++ b/meta/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-20060131.patch
@@ -0,0 +1,100 @@
	1	--- mtd/util/mkfs.jffs2.c~add-exclusion-to-mkfs-jffs2.patch
	2	+++ mtd/util/mkfs.jffs2.c
	3	@@ -92,7 +92,12 @@
	4	struct filesystem_entry files; / Only relevant to directories */
	5	};
	6
	7	-
	8	+struct ignorepath_entry {
	9	+ struct ignorepath_entry* next; /* Points to the next ignorepath element */
	10	+ char name[PATH_MAX]; /* Name of the entry */
	11	+};
	12	+
	13	+static struct ignorepath_entry* ignorepath = 0;
	14	static int out_fd = -1;
	15	static int in_fd = -1;
	16	static char default_rootdir[] = ".";
	17	@@ -367,7 +372,7 @@
	18	char hpath, tpath;
	19	struct dirent dp, *namelist;
	20	struct filesystem_entry *entry;
	21	-
	22	+ struct ignorepath_entry* element = ignorepath;
	23
	24	if (lstat(hostpath, &sb)) {
	25	perror_msg_and_die("%s", hostpath);
	26	@@ -376,6 +381,15 @@
	27	entry = add_host_filesystem_entry(targetpath, hostpath,
	28	sb.st_uid, sb.st_gid, sb.st_mode, 0, parent);
	29
	30	+ while ( element ) {
	31	+ if ( strcmp( element->name, targetpath ) == 0 ) {
	32	+ printf( "Note: ignoring directories below '%s'\n", targetpath );
	33	+ return entry;
	34	+ break;
	35	+ }
	36	+ element = element->next;
	37	+ }
	38	+
	39	n = scandir(hostpath, &namelist, 0, alphasort);
	40	if (n < 0) {
	41	perror_msg_and_die("opening directory %s", hostpath);
	42	@@ -1157,6 +1171,7 @@
	43	{"root", 1, NULL, 'r'},
	44	{"pagesize", 1, NULL, 's'},
	45	{"eraseblock", 1, NULL, 'e'},
	46	+ {"ignore", 1, NULL, 'I'},
	47	{"output", 1, NULL, 'o'},
	48	{"help", 0, NULL, 'h'},
	49	{"verbose", 0, NULL, 'v'},
	50	@@ -1199,6 +1214,7 @@
	51	" -L, --list-compressors Show the list of the avaiable compressors\n"
	52	" -t, --test-compression Call decompress and compare with the original (for test)\n"
	53	" -n, --no-eraseblock-headers Don't add a eraseblock header to every eraseblock\n"
	54	+ " -I, --ignore=PATH Ignore sub directory and file tree below PATH when recursing over the file system\n"
	55	" -o, --output=FILE Output to FILE (default: stdout)\n"
	56	" -l, --little-endian Create a little-endian filesystem\n"
	57	" -b, --big-endian Create a big-endian filesystem\n"
	58	@@ -1368,11 +1384,12 @@
	59	struct filesystem_entry *root;
	60	char *compr_name = NULL;
	61	int compr_prior = -1;
	62	+ struct ignorepath_entry* element = ignorepath;
	63
	64	jffs2_compressors_init();
	65
	66	while ((opt = getopt_long(argc, argv,
	67	- "D:d:r:s:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0)
	68	+ "D:d:r:s:I:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:", long_options, &c)) >= 0)
	69	{
	70	switch (opt) {
	71	case 'D':
	72	@@ -1395,6 +1412,28 @@
	73	page_size = strtol(optarg, NULL, 0);
	74	break;
	75
	76	+ case 'I':
	77	+ printf( "Note: Adding '%s' to ignore Path\n", optarg );
	78	+ element = ignorepath;
	79	+ if ( !ignorepath ) {
	80	+ ignorepath = xmalloc( sizeof( struct ignorepath_entry ) );
	81	+ ignorepath->next = 0;
	82	+ strcpy( &ignorepath->name[0], optarg );
	83	+ } else {
	84	+ while ( element->next ) element = element->next;
	85	+ element->next = xmalloc( sizeof( struct ignorepath_entry ) );
	86	+ element->next->next = 0;
	87	+ strcpy( &element->next->name[0], optarg );
	88	+ }
	89	+ printf( "--------- Dumping ignore path list ----------------\n" );
	90	+ element = ignorepath;
	91	+ while ( element ) {
	92	+ printf( " * '%s'\n", &element->name[0] );
	93	+ element = element->next;
	94	+ }
	95	+ printf( "---------------------------------------------------\n" );
	96	+ break;
	97	+
	98	case 'o':
	99	if (out_fd != -1) {
	100	error_msg_and_die("output filename specified more than once");