mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

mtd-utils: Upgrade 20050801 -> 20060223

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@380 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2006-05-09 16:45:38 +00:00
parent 8e898fe29b
commit 572f07af31
5 changed files with 143 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openembedded/packages/mtd/mtd-utils-native_20050801.bb → openembedded/packages/mtd/mtd-utils-native_20060223.bb
View File
openembedded/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2-20060131.patch
+100
View File
@@ -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");
openembedded/packages/mtd/mtd-utils/fix-ignoreerrors-20060131.patch
+20
View File
@@ -0,0 +1,20 @@
--- mtd/util/nanddump.c.orig 2006-01-30 21:19:22.000000000 +0100
+++ mtd/util/nanddump.c 2006-01-30 21:19:24.000000000 +0100
@@ -224,7 +224,7 @@
}
}
- if (badblock) {
+ if (badblock && !ignoreerrors) {
if (omitbad)
continue;
memset (readbuf, 0xff, bs);
@@ -259,7 +259,7 @@
if (omitoob)
continue;
- if (badblock) {
+ if (badblock && !ignoreerrors) {
memset (readbuf, 0xff, meminfo.oobsize);
} else {
/* Read OOB data and exit on failure */
openembedded/packages/mtd/mtd-utils/fix-ignoreerrors.patch
+20
View File
@@ -0,0 +1,20 @@
--- mtd/util/nanddump.c.orig 2005-12-30 19:07:39.000000000 +0100
+++ mtd/util/nanddump.c 2005-12-30 19:08:53.000000000 +0100
@@ -224,7 +224,7 @@
}
}
- if (badblock) {
+ if (badblock && !ignoreerrors) {
if (omitbad)
continue;
memset (readbuf, 0xff, bs);
@@ -259,7 +259,7 @@
if (omitoob)
continue;
- if (badblock) {
+ if (badblock && !ignoreerrors) {
memset (readbuf, 0xff, meminfo.oobsize);
} else {
/* Read OOB data and exit on failure */
openembedded/packages/mtd/mtd-utils_20050801.bb → openembedded/packages/mtd/mtd-utils_20060223.bb
+3 -3
View File
@@ -7,8 +7,8 @@ PR = "r0"
SRCDATE = "${PV}"
SRC_URI = "cvs://anoncvs:anoncvs@cvs.infradead.org/home/cvs;module=mtd \
file://add-exclusion-to-mkfs-jffs2.patch;patch=1 \
file://more-verbosity.patch;patch=1"
file://add-exclusion-to-mkfs-jffs2-20060131.patch;patch=1 \
file://fix-ignoreerrors-20060131.patch;patch=1"
S = "${WORKDIR}/mtd/"
CFLAGS_prepend = "-I${S}/include "
@@ -26,7 +26,7 @@ do_stage () {
mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \
flashcp nandwrite jffs2dump"
flashcp nandwrite jffs2dump sumtool"
do_install () {
install -d ${D}${bindir}