diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2005-01-31 20:40:11 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2005-01-31 20:40:11 +0000 |
| commit | 1b237c0bf37ccdf12e24a35968070d567410b24c (patch) | |
| tree | a3c36ac6dcf4233a07c8172d79291610ed6a7398 | |
| parent | 81637ac86fb90de17411768a060d22b94a201cf3 (diff) | |
fix mkfs.jffs2 SIGSEGV when using -I more than once
BKrev: 41fe97abGoNDh0S5ekRVC_piyj2F9w
| -rw-r--r-- | packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch | 7 | ||||
| -rw-r--r-- | packages/mtd/mtd-utils_20050128.bb | 33 |
2 files changed, 37 insertions, 3 deletions
diff --git a/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch b/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch index 05af81e283..e6bb48c9e0 100644 --- a/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch +++ b/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch @@ -3,7 +3,7 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- mtd/util/mkfs.jffs2.c~add-exclusion-to-mkfs-jffs2.patch +--- mtd/util/mkfs.jffs2.c~add-exclusion-to-mkfs-jffs2 +++ mtd/util/mkfs.jffs2.c @@ -92,7 +92,12 @@ struct filesystem_entry *files; /* Only relevant to directories */ @@ -72,12 +72,13 @@ { switch (opt) { case 'D': -@@ -1376,6 +1394,27 @@ +@@ -1376,6 +1394,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; @@ -89,7 +90,7 @@ + strcpy( &element->next->name[0], optarg ); + } + printf( "--------- Dumping ignore path list ----------------\n" ); -+ element=ignorepath; ++ element = ignorepath; + while ( element ) { + printf( " * '%s'\n", &element->name[0] ); + element = element->next; diff --git a/packages/mtd/mtd-utils_20050128.bb b/packages/mtd/mtd-utils_20050128.bb index e69de29bb2..7da1b6f45b 100644 --- a/packages/mtd/mtd-utils_20050128.bb +++ b/packages/mtd/mtd-utils_20050128.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Tools for managing memory technology devices." +SECTION = "base" +DEPENDS = "zlib" +HOMEPAGE = "http://www.linux-mtd.infradead.org/" +LICENSE = "GPLv2" +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" +PR = "r1" + +SRC_URI = "ftp://ftp.uk.linux.org/pub/people/dwmw2/mtd/cvs/mtd-snapshot-${PV}.tar.bz2 \ + file://add-exclusion-to-mkfs-jffs2.patch;patch=1" +S = "${WORKDIR}/mtd/" + +CFLAGS_prepend = "-I${S}/include " + +do_compile () { + oe_runmake -C util ${mtd_utils} +} + +do_stage () { + install -d ${STAGING_INCDIR}/mtd + for f in ${S}/include/mtd/*.h; do + install -m 0644 $f ${STAGING_INCDIR}/mtd/ + done +} + +do_install () { + install -d ${D}${bindir} + for binary in ${mtd_utils}; do + install -m 0755 util/$binary ${D}${bindir} + done +} |